Quellen-Update

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

diff --git a/lfs/Config b/lfs/Config
index ab299403eb89180f4002444dc4b0c3a78f7f22b2..eb4e7eb647f2ba7997c4eccc2765620a65b7a0ff 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -118,7 +118,7 @@ endef
 
 define LOAD
        @echo -e "$(MESSAGE)Download: $($(notdir $@))"
-       wget -T 120 -t 1 -c -nv $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@)
+       wget -T 60 -t 1 -c -nv $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@)
        [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ] # detect page not found answer
        mv $(DIR_TMP)/$(notdir $@) $(DIR_DL)
 endef

diff --git a/lfs/ccache b/lfs/ccache
index a986fa189514ae2205aa2d1b9a2127efa6e41c5f..b02612e8f7a203c708063a3844e92c9e77f6f2eb 100644 (file)
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -36,7 +36,7 @@ VER        = 2.3
 
 THISAPP    = ccache-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://ccache.samba.org/ftp/ccache
+DL_FROM    = http://samba.org/ftp/ccache/
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/libsafe b/lfs/libsafe
index e21104407263c4b0601f069738e78748e13b04f0..4da72fca7366024d7bc603bd7a23fa1ea5599361 100644 (file)
--- a/lfs/libsafe
+++ b/lfs/libsafe
@@ -34,14 +34,14 @@ include Config
 
 VER        = 2.0-16
 
-#THISAPP    = libsafe-$(VER)
-THISAPP    = libsafe_$(VER)
-#DL_FILE    = $(THISAPP).tgz
-DL_FILE    = $(THISAPP).orig.tar.gz
-#DL_FROM    = http://www.research.avayalabs.com/project/libsafe/src
-DL_FROM    = $(URL_DEBIAN)/libs/libsafe
-#DIR_APP    = $(DIR_SRC)/$(THISAPP)
-DIR_APP    = $(DIR_SRC)/libsafe-$(VER)
+THISAPP    = libsafe-$(VER)
+#THISAPP    = libsafe_$(VER)
+DL_FILE    = $(THISAPP).tgz
+#DL_FILE    = $(THISAPP).orig.tar.gz
+DL_FROM    = http://www.research.avayalabs.com/project/libsafe/src
+#DL_FROM    = $(URL_DEBIAN)/libs/libsafe
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+#DIR_APP    = $(DIR_SRC)/libsafe-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################

diff --git a/lfs/uClibc b/lfs/uClibc
index 7bc9d1727526b3b72701dc031cab70b74f121962..8ada9e5b3fbd9fbafbbc14ab89bcce883579092a 100644 (file)
--- a/lfs/uClibc
+++ b/lfs/uClibc
@@ -35,8 +35,8 @@ include Config
 VER        = 0.9.26
 
 THISAPP    = uClibc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_KERNEL)/linux/libs/uclibc
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = http://uclibc.org/downloads
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -49,7 +49,7 @@ objects = $(DL_FILE) gcc-3.3.1.tar.gz
 $(DL_FILE)           = $(DL_FROM)/$(DL_FILE)
 gcc-3.3.1.tar.gz     = $(URL_GNU)/gcc/gcc-3.3.1.tar.gz
 
-$(DL_FILE)_MD5       = b63183651a1b13456c20387ea88b018f
+$(DL_FILE)_MD5       = 7212713c432dd0de6ec2140c2a6212e4
 gcc-3.3.1.tar.gz_MD5 = 46d58197212818b5f7c403267ff24e4e
 
 install : $(TARGET)

diff --git a/make.sh b/make.sh
index bc61fa3a1a0fc862aded6bc95e113368cc9aede0..71cbd2d69d6badf6055b5acfe4420ebacddcf8da 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -30,7 +30,7 @@
 
   NAME="IPFire"                                        # Software name
   SNAME="ipfire"                                       # Short name
-  VERSION="1.4.11"                             # Version number
+  VERSION="1.4"                                # Version number
   PREVIOUSTAG=IPCOP_v1_4_10_FINAL
   SLOGAN="We save your network"                # Software slogan
   CONFIG_ROOT=/var/ipfire                      # Configuration rootdir