Zwischencommit fuer LFS.

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

diff --git a/lfs/dhcp b/lfs/dhcp
index 94b255e8a2b5fe6d0d6d6628eb04d41dfb5c194e..478a7ab5b150629c488981f5e9c86f80d45479c4 100644 (file)
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 3.0.2
+VER        = 3.0.4
 
 THISAPP    = dhcp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 04800a111521e7442749b2ce883f962b
+$(DL_FILE)_MD5 = 004ef935fd54b8046b16bdde31a9e151
 
 install : $(TARGET)
 
@@ -72,9 +72,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-iproute2-1.patch
        cd $(DIR_APP) && ./configure
-       cd $(DIR_APP) && make
-       cd $(DIR_APP) && make install
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make LIBDIR=/usr/lib INCDIR=/usr/include install
        touch /var/state/dhcp/dhcpd.leases
        ln -sf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcpd.conf
        @rm -rf $(DIR_APP)

diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index 969f7bb3a294eb347f586c979605d78eda9e31fb..b3ddbbd91e6b96026bac0d9c814e9a3d4a9a8054 100644 (file)
--- a/lfs/dhcpcd
+++ b/lfs/dhcpcd
@@ -26,10 +26,10 @@
 
 include Config
 
-VER        = 1.3.22-pl4
+VER        = 2.0.8
 
 THISAPP    = dhcpcd-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = dd627a121e43835bead3ffef5b1a72fd
+$(DL_FILE)_MD5 = ec91c33b6d9cb46a42f9564e573fd249
 
 install : $(TARGET)
 
@@ -71,10 +71,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/$(THISAPP)_corrupt-packet.patch
-       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls
-       cd $(DIR_APP) && make
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix="" --mandir=/usr/share/man --disable-nls
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/libpcap b/lfs/libpcap
index f32fe41ed20b9ae6624ad5927fd9f885c2b54ee2..f18d2d60323fc7c9f258d2495f3af599239a68a4 100644 (file)
--- a/lfs/libpcap
+++ b/lfs/libpcap
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: libpcap,v 1.5.2.5 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 0.8.3
+VER        = 0.9.4
 
 THISAPP    = libpcap-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.tcpdump.org/release
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 56a9d4615d8354fcfe8cff8c8443c77b
+$(DL_FILE)_MD5 = 79025766e8027df154cb1f32de8a7974
 
 install : $(TARGET)
 
@@ -78,11 +72,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpcap-0.8.3-shared.patch
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/libpcap-0.8.3-ppp.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-       cd $(DIR_APP) && make 
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       cd $(DIR_APP) && cp -f pcap-int.h /usr/include
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/libusb b/lfs/libusb
index 24ed28ac9d1a74467b624581d288e6adce6bb884..e3ac0e53df6cbc74b01ddc4e517c64bba7490b8a 100644 (file)
--- a/lfs/libusb
+++ b/lfs/libusb
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: libusb,v 1.4.2.2 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 0.1.7
+VER        = 0.1.12
 
 THISAPP    = libusb-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/libusb
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4c7abee86d8715bccb43428a500d2170
+$(DL_FILE)_MD5 = caf182cbc7565dac0fd72155919672e6
 
 install : $(TARGET)
 
@@ -78,9 +72,10 @@ $(subst %,%_MD5,$(objects)) :
 $(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 --disable-nls \
-           --with-linux-headers=/usr/src/linux --target=$(MACHINE)
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && ./configure --prefix=/usr --disable-build-docs --disable-nls
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+       echo "# Set group ownership for raw USB devices" > /etc/udev/rules.d/23-usb.rules
+       echo "SUBSYSTEM==\"usb_device\", GROUP=\"usb\"" >> /etc/udev/rules.d/23-usb.rules
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/linux-atm b/lfs/linux-atm
index dfd0c46faf74142d841adaa1d06bfb6a45a63244..2b99550432259cd0ad0fefbdf78a899b7cc5bbf8 100644 (file)
--- a/lfs/linux-atm
+++ b/lfs/linux-atm
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: linux-atm,v 1.4.2.2 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################

diff --git a/lfs/ppp b/lfs/ppp
index 48c0ec4dccddea68285426167952a76f47acf036..fe3cde1cad462d478e546fa3a96b4a4fc39938b9 100644 (file)
--- a/lfs/ppp
+++ b/lfs/ppp
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ppp,v 1.20.2.8 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 2.4.2
+VER        = 2.4.4
 
 THISAPP    = ppp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.samba.org/pub/ppp
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 362bcf218fba8afbb9afbee7471e5dac
+$(DL_FILE)_MD5 = 183800762e266132218b204dfb428d29
 
 install : $(TARGET)
 
@@ -79,19 +73,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && rm -f include/pcap-int.h
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-pppoatm.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-pppoatm-persist.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.1-oedod.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-pppoatm-modprobe.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-signal.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-printstats.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-close.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-pppoatm.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-pppoatm-persist.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.1-oedod.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-pppoatm-modprobe.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-signal.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-printstats.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-close.patch
        cd $(DIR_APP) && sed -i -e "s+/etc/ppp/connect-errors+/var/log/connect-errors+" pppd/pathnames.h
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-       cd $(DIR_APP)/pppd && sed -i -e 's/#include <net\/bpf.h>/#include <pcap.h>/' sys-linux.c
-       cd $(DIR_APP)/pppd && sed -i -e 's/#include <net\/bpf.h>/#include <pcap.h>/' demand.c
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+       cd $(DIR_APP) && make install-etcppp
        touch /var/log/connect-errors
        -mkdir -p /etc/ppp
        for i in $(DIR_SRC)/src/ppp/* ; do \

diff --git a/lfs/rp-pppoe b/lfs/rp-pppoe
index af7cdbc852f327ac23106affe1edb97eddefcb4e..9b9aba98f2df05d5d5057b1ab083e0c12270cea5 100644 (file)
--- a/lfs/rp-pppoe
+++ b/lfs/rp-pppoe
@@ -32,11 +32,11 @@
 
 include Config
 
-VER        = 3.5
+VER        = 3.8
 
 THISAPP    = rp-pppoe-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.roaringpenguin.com/penguin/pppoe
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 97972f8f8f6a3ab9b7070333a6a29c4b
+$(DL_FILE)_MD5 = 0e32760f498f9cde44081ee6aafc823b
 
 install : $(TARGET)
 
@@ -78,8 +78,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP)/src && ./configure --prefix=/usr --disable-nls
-       cd $(DIR_APP)/src && make
+       cd $(DIR_APP) && sed -i s%/usr/bin/logger%/bin/logger% scripts/pppoe-{connect,setup,stop}.in
+       cd $(DIR_APP)/src && ./configure --disable-nls
+       cd $(DIR_APP)/src && make $(MAKETUNING)
        cd $(DIR_APP)/src && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/unzip b/lfs/unzip
index 3236074deb0267d39bb85901163e5c07013561b3..a7961630aecebfdd7209be5faf7c792733c66c5e 100644 (file)
--- a/lfs/unzip
+++ b/lfs/unzip
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: unzip,v 1.5.2.8 2005/10/03 22:49:44 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,8 +30,7 @@ VER        = 552
 
 THISAPP    = unzip$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-#DL_FROM    = ftp://ftp.info-zip.org/pub/infozip/src
-DL_FROM    = http://fresh.t-systems-sfr.com/unix/src/misc
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/unzip-5.52
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -79,11 +72,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       if [ "$(MACHINE)" = "i386" ]; then \
-               cd $(DIR_APP) && make -f unix/Makefile linux; \
-       else \
-               cd $(DIR_APP) && make -f unix/Makefile linux_noasm; \
-       fi
-       cd $(DIR_APP) && make -f unix/Makefile prefix=/usr install
+       cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux
+       cd $(DIR_APP) && make prefix=/usr install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index d920f172bf234a2ac42896a3110613a2e6cde8ea..e1fbab229a643f2d633cc71d90ce870bca77488a 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -313,7 +313,8 @@ buildipfire() {
   ipfiremake dhcpcd
   ipfiremake libusb
   ipfiremake libpcap
-  ipfiremake linux-atm
+# Temporary disabled.
+#  ipfiremake linux-atm
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip