Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

2026-04-27 19:23:24 +02:00 · 2008-09-08 19:38:52 +00:00
parent 4e464f98f0 3b6f5eb13e
commit 52948e87b1
120 changed files with 2346 additions and 3449 deletions
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -40,7 +40,7 @@ else
 TARGET     = $(DIR_INFO)/$(THISAPP)
 endif
 PROG       = alsa
-PAK_VER    = 3
+PAK_VER    = 4

 DEPS       = ""

--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@

 include Config

-VER        = 0.93.3
+VER        = 0.94

 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 5
+PAK_VER    = 6

 DEPS       = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 06d87fbece062e5c0661ee07703208c9
+$(DL_FILE)_MD5 = d3f6d5fff2db81950491749166ab0ffa

 install : $(TARGET)

--- a/lfs/collectd
+++ b/lfs/collectd
@@ -25,7 +25,7 @@
 include Config

 PKG_NAME   = collectd
-VER        = 4.4.1
+VER        = 4.4.2

 THISAPP    = collectd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 176880c32a06bee9d5e6e2e7c76751a3
+$(DL_FILE)_MD5 = faee2bb6e38da1051fdd31762bdf3ab7

 install : $(TARGET)

@@ -85,7 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
 		--enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
 		--enable-{tcpconns,unixsock,users,wireless} \
-		--with-rrdtool=/usr/share/rrdtool-1.2.15 --enable-debug
+		--with-rrdtool=/usr/share/rrdtool-1.2.15
 	cd $(DIR_APP) && make install
 	cp -vf $(DIR_SRC)/config/collectd/collectd.conf /etc/
 	ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd 
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 3
+PAK_VER    = 4

 DEPS       = ""

--- a/lfs/initrd
+++ b/lfs/initrd
@@ -70,7 +70,7 @@ $(TARGET) :
 	cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/

 	cd /install/initrd/lib/ && ln -sf libgcc_s.so.1 libgcc_s.so
-	
+
 	-mkdir -p /install/{images,mnt}
 	rm -rf /install/mnt/*

--- a/lfs/madwifi
+++ b/lfs/madwifi
@@ -24,7 +24,7 @@

 include Config

-VER        = hal-0.10.5.6-r3835-20080801
+VER        = hal-2008-08-15-r3862-20080903

 THISAPP    = madwifi-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 23018ff3366b427eb9cbe5ac653bc1ab
+$(DL_FILE)_MD5 = 3c9726acd5ffa180fa7b274b625a6082

 install : $(TARGET)

@@ -81,4 +81,7 @@ ifeq "$(SMP)" ""
 	cp $(DIR_SRC)/config/madwifi/madwifi.conf /etc/
 	ln -s $(DIR_APP) $(DIR_SRC)/madwifi 
 endif
+	# Set Countrycode to germany because some cards
+	# are not detected without cc
+	echo options ath_pci countrycode=276 > /etc/modprobe.d/madwifi
 	@$(POSTBUILD)
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -24,7 +24,7 @@

 include Config

-VER        = 0.13.1
+VER        = 0.13.2

 THISAPP    = mpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 2
+PAK_VER    = 3

 DEPS       = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = dbd219c8ba773bc9270e27bfafc798b5
+$(DL_FILE)_MD5 = b461896369949ff3cff955692ead9f8b

 install : $(TARGET)

--- a/lfs/ntfs-3g
+++ b/lfs/ntfs-3g
@@ -24,7 +24,7 @@

 include Config

-VER        = 1.2712
+VER        = 1.2812

 THISAPP    = ntfs-3g-$(VER)
 DL_FILE    = $(THISAPP).tgz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 9e50dac71261dbb401511be4e9020def
+$(DL_FILE)_MD5 = b250a8d6603dc8c5411ee50bea444ccb

 install : $(TARGET)

--- a/lfs/openswan
+++ b/lfs/openswan
@@ -24,7 +24,7 @@

 include Config

-VER        = 2.4.12
+VER        = 2.6.16

 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 0bca0cc205d2d83eff64a7cea825ce7a
+$(DL_FILE)_MD5 = ef0ea8f9082df70c993a035904d538c7

 install : $(TARGET)

@@ -86,9 +86,18 @@ else
 		-e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
 		-e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
 		-e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc
+
+	cd $(DIR_APP) && sed -i 's/-Werror//' lib/libdns/Makefile
+	cd $(DIR_APP) && sed -i 's/-Werror//' lib/libisc/Makefile
+	cd $(DIR_APP) && sed -i 's/-Werror//' lib/liblwres/Makefile
+	cd $(DIR_APP) && sed -i 's/-Werror//' programs/Makefile.program
+	
 	cd $(DIR_APP) && make programs
 	cd $(DIR_APP) && make install
 	
+	# don't know why make this doesnt made
+	cd $(DIR_APP) && cp -a programs/_confread/_confread.in /usr/lib/ipsec/_confread
+	
 	-rm -rfv /etc/rc*.d/*ipsec
 	cd $(DIR_SRC) && cp src/initscripts/init.d/ipsec /etc/rc.d/init.d/ipsec
 	rm -f /etc/ipsec.conf /etc/ipsec.secrets
@@ -100,10 +109,10 @@ else
 	ln -sf $(CONFIG_ROOT)/certs /etc/ipsec.d/certs
 	ln -sf $(CONFIG_ROOT)/crls  /etc/ipsec.d/crls
 	
-	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.12-startklips-1.patch
-	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown-1.patch
-	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown_x509-1.patch
-	cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-clear-1.patch
+	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.16-startklips-1.patch
+	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.16-updown.klips-1.patch
+	# cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown_x509-1.patch
+	cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.16-clear-1.patch
 endif	
 	#@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@

 include Config

-VER        = 3.0.30
+VER        = 3.0.32

 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 7
+PAK_VER    = 8

 DEPS       = "cups cyrus-sasl"

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = d647ec1f34414fa8691f74536dcccfb5
+$(DL_FILE)_MD5 = be13b8dbe2785212dba49e7ced352f30

 install : $(TARGET)

--- a/lfs/squid
+++ b/lfs/squid
@@ -103,10 +103,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cp -f $(DIR_SRC)/config/updxlrator/updxlrator /usr/sbin/updxlrator
 	cp -f $(DIR_SRC)/config/updxlrator/checkup /var/ipfire/updatexlrator/bin/checkup
 	cp -f $(DIR_SRC)/config/updxlrator/download /var/ipfire/updatexlrator/bin/download
+	cp -f $(DIR_SRC)/config/updxlrator/convert /var/ipfire/updatexlrator/bin/convert
+	cp -f $(DIR_SRC)/config/updxlrator/lscache /var/ipfire/updatexlrator/bin/lscache
+
+#	this binary is incompatible with 
+#	cp -f $(DIR_SRC)/config/updxlrator/setperms /var/ipfire/updatexlrator/bin/setperms
+
 	-mkdir -p /usr/lib/squid/errors.ipfire
 	cp -fr $(DIR_SRC)/config/proxy/errors.ipfire/* /usr/lib/squid/errors.ipfire/
 	chmod 755 /usr/sbin/updxlrator /var/ipfire/updatexlrator/bin/checkup \
-		/var/ipfire/updatexlrator/bin/download
+		/var/ipfire/updatexlrator/bin/download \
+		/var/ipfire/updatexlrator/bin/convert \
+		/var/ipfire/updatexlrator/bin/lscache

 	ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.daily
 	ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.monthly
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -99,6 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))

 	/bin/tar --no-same-owner -xzf $(DIR_CONF)/urlfilter/blacklists.tar.gz -C /var/ipfire/urlfilter
 	/usr/bin/perl $(DIR_CONF)/urlfilter/makeconf.pl
+	touch /var/ipfire/urlfilter/settings
 	chown -R nobody:nobody /var/ipfire/urlfilter
 	chmod 755 /srv/web/ipfire/html/images/urlfilter
 	chmod 644 /srv/web/ipfire/html/images/urlfilter/*
--- a/lfs/updater
+++ b/lfs/updater
@@ -54,7 +54,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	mkdir -p /install/updater
 	mkdir -p /install/packages

-	find $(DIR_SRC)/config/rootfiles/updater/filelists -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
+	find $(DIR_SRC)/config/rootfiles/updater/filelists/* -maxdepth 1 | xargs cat >> /tmp/ROOTFILES
 	sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
 	tar -c -C / --files-from=/tmp/ROOTFILES \
 		-f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
--- a/lfs/videolan
+++ b/lfs/videolan
@@ -24,15 +24,16 @@

 include Config

-VER        = 0.8.6h
-
+VER        = 0.8.6i
 THISAPP    = vlc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE1   = $(THISAPP)-bugfix-080903.patch.bz2
+
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = videolan
-PAK_VER    = 3
+PAK_VER    = 4

 DEPS       = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg"

@@ -40,11 +41,13 @@ DEPS       = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg"
 # Top-level Rules
 ###############################################################################

-objects = $(DL_FILE)
+objects = $(DL_FILE) $(DL_FILE1)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE1) = $(DL_FROM)/$(DL_FILE1)

-$(DL_FILE)_MD5 = 4a6eece2f56d4ad5dfa786e934d2b4a8
+$(DL_FILE)_MD5 = 3c90520c9f22a68d287458d5a8af989e
+$(DL_FILE1)_MD5 = 36ea293b5ebb604778b321b5e3e3cdc4

 install : $(TARGET)

@@ -77,6 +80,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	#Apply some patched from videolan 8.6-bugfix branch,
+	#ignore the error because one patch is already applied
+	-cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/$(DL_FILE1) | patch -p1
 	cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared --with-ffmpeg-tree=/usr/src/ffmpeg \
 								   --with-ffmpeg-config=/usr/src/ffmpeg \
 								--disable-wxwidgets --disable-skins2 \