* Clamav, Samba und MC Update.

* Kleine Funktion zur Zeitanzeige
  der Stages und des gesamten Builds gebastelt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@371 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index dc1f0ef83846b3628bbe4acd10ab8e5e15570099..80a4a5ef9db6af44e556321b4bd66258eeb9003e 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -143,6 +143,7 @@
 * man-db-2.4.3
 * man-pages-2.34
 * mc-4.6.0
+* mc-4.6.1
 * memtest86+-1.65
 * mingetty_1.07
 * misc-progs
@@ -195,6 +196,7 @@
 * rrdtool-1.2.15
 * rsync-2.6.8
 * samba-3.0.23b
+* samba-3.0.23d
 * screen-4.0.2
 * sed-4.1.5
 * setserial-2.17

diff --git a/lfs/clamav b/lfs/clamav
index d19a1c83a028979685d6087963754571b2892c9e..5a1d72ec7c93021e168d5cbedd3ce9ecdad5f977 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 0.88.6
+VER        = 0.88.7
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = db7f8b947bc21023f36e04bfdd555dd0
+$(DL_FILE)_MD5 = 34a9d58cf5bcb04dbe3eb32b5367a3f8
 
 install : $(TARGET)
 

diff --git a/lfs/mc b/lfs/mc
index 0623c8c1211ede3bb7ae39c77c20dfbdb59a66cb..4d511a23c3bfd1d6b261ffa615d040dbd8c0d9cb 100644 (file)
--- a/lfs/mc
+++ b/lfs/mc
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 4.6.0
+VER        = 4.6.1
 
 THISAPP    = mc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 70804dc9e2049e24f294ff7090a82a12
+$(DL_FILE)_MD5 = 18b20db6e40480a53bac2870c56fc3c4
 
 install : $(TARGET)
 
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --without-x --disable-nls \
-                               --with-screen=mcslang # --with-samba
+                               --with-screen=mcslang --with-samba
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/samba b/lfs/samba
index 6104dcb50bba97894d5797d8f8ee7dd40fefa99a..33cdc418eecfc84c8587211623b2a9b8dcba5079 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 3.0.23b
+VER        = 3.0.23d
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f2d1a513fd7138fd1515d3bdf702f7c7
+$(DL_FILE)_MD5 = afe6923d05fed5b5ccab593c7a407cd1
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index 384a225a9b1b52eea08f768aa83ebbf5707f1f94..eed5af188e345bfbe5b70366df97fc9ac61f35bf 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -705,11 +705,14 @@ build)
                prepareenv
        fi
 
-       beautify build_stage "Building base"
+       beautify build_start
+       beautify build_stage_start "Building base"
        buildbase
+       beautify build_stage_end
 
-       beautify build_stage "Building IPFire"
+       beautify build_stage_start "Building IPFire"
        buildipfire
+       beautify build_stage_end
 
        # Setzen des IPFire Builds
        if [ "$FIREBUILD" ]; then
@@ -718,11 +721,14 @@ build)
                echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild
        fi
 
-       beautify build_stage "Building installer"
+       beautify build_stage_start "Building installer"
        buildinstaller
+       beautify build_stage_end
 
-       beautify build_stage "Building packages"
+       beautify build_stage_start "Building packages"
        buildpackages
+       beautify build_stage_end
+       beautify build_end
        ;;
 shell)
        # enter a shell inside LFS chroot

diff --git a/tools/make-functions b/tools/make-functions
index 48b5df696996aaee5a80d3ed9ca0ffce3f7c411f..96c2bb62be7259cd0fb20c2fce5194d1102e6550 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -106,11 +106,23 @@ beautify()
                                        ;;
                        esac
                        ;;
-               build_stage)
+               build_stage_start)
                        MESSAGE=$2
+                       STAGE_TIME_START=`date +%s`
                        echo -ne "${BOLD}*** ${MESSAGE}${SET_VER_COL}      version${SET_OPT_COL} options"
                        echo -ne "${SET_TIME_COL} time (sec)${SET_RESULT_COL} status${NORMAL}\n"
                        ;;
+               build_stage_end)
+                       STAGE_TIME_END=`date +%s`
+                       echo -ne "${BOLD}***This stage took:\t\t $[ $STAGE_TIME_END - $STAGE_TIME_START ] (secs)${NORMAL}\n"
+                       ;;
+               build_start)
+                       BUILD_TIME_START=`date +%s`
+                       ;;
+               build_end)
+                       BUILD_TIME_END=`date +%s`
+                       echo -ne "${BOLD}***Build is finished now!\nThis took:\t\t\t $[ $BUILD_TIME_END - $BUILD_TIME_START ] (secs)${NORMAL}\n"
+                       ;;
                make_pkg)
                        echo "$2" | while read PKG_VER PROGRAM OPTIONS
                        do