IPFire-SCM August 2011

ipfire-scm@lists.ipfire.org

1 participants
59 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d1bd615e9f10000bcf307e984a78a1ba384231cd
by git＠ipfire.org 22 Aug '11

22 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via d1bd615e9f10000bcf307e984a78a1ba384231cd (commit) via 6e2ba31bff62dc8eda9450139961cfb3c668240f (commit) from 86525dfc52009003a0976fb8df135ba0808ae121 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d1bd615e9f10000bcf307e984a78a1ba384231cd Merge: 6e2ba31 86525df Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 22 20:53:02 2011 +0200 Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next commit 6e2ba31bff62dc8eda9450139961cfb3c668240f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 22 20:47:35 2011 +0200 ipsec: change ipsecctrl and vpn-watch to restart a single tunnel. ----------------------------------------------------------------------- Summary of changes: src/misc-progs/ipsecctrl.c | 39 ++++++++++++++++++++++++++++++++++++--- src/scripts/vpn-watch | 11 +++-------- 2 files changed, 39 insertions(+), 11 deletions(-) Difference in files: diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index a018289..0b05177 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -142,10 +142,42 @@ int decode_line (char *s, */ void turn_connection_on (char *name, char *type) { /* - if you find a way to start a single connection without changing all add it - here. Change also vpn-watch. + Rename the connection and run ipsec update and rename it back to readd + a deleted connection. Because ipsec update ignores connection that have + not changed since last load. */ - safe_system("/etc/rc.d/init.d/ipsec restart >/dev/null"); + char command[STRING_SIZE]; + memset(command, 0, STRING_SIZE); + snprintf(command, STRING_SIZE - 1, + "sed -i -e 's|^conn %s$|conn %s-renamed|g' /var/ipfire/vpn/ipsec.conf >/dev/null", name, name); + safe_system(command); + + // Down and delete IKEv2 Tunnel before ipsec update + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec stroke down %s >/dev/null", name); + safe_system(command); + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec stroke delete %s >/dev/null", name); + safe_system(command); + + safe_system("/etc/rc.d/init.d/ipsec update >/dev/null"); + + sleep(1); + + // Back to original name + snprintf(command, STRING_SIZE - 1, + "sed -i -e 's|^conn %s-renamed$|conn %s|g' /var/ipfire/vpn/ipsec.conf >/dev/null", name, name); + safe_system(command); + + // Down and delete IKEv2 Tunnel before ipsec update + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec stroke down %s-renamed >/dev/null", name); + safe_system(command); + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec stroke delete %s-renamed >/dev/null", name); + safe_system(command); + + safe_system("/etc/rc.d/init.d/ipsec update >/dev/null"); } /* issue ipsec commmands to turn off connection 'name' @@ -162,6 +194,7 @@ void turn_connection_off (char *name) { snprintf(command, STRING_SIZE - 1, "/usr/sbin/ipsec stroke delete %s >/dev/null", name); safe_system(command); + safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null"); safe_system("/usr/sbin/ipsec stroke rereadall >/dev/null"); diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch index 63b2442..563c14c 100755 --- a/src/scripts/vpn-watch +++ b/src/scripts/vpn-watch @@ -1,6 +1,6 @@ #!/usr/bin/perl ################################################## -##### VPN-Watch.pl Version 0.6a ##### +##### VPN-Watch.pl Version 0.7 ##### ################################################## # # # VPN-Watch is part of the IPFire Firewall # @@ -39,12 +39,11 @@ while ( $i == 0){ unless(@vpnsettings) {exit 1;} } -my $status = `ipsec whack --status`; +my $status = `ipsec status`; foreach (@vpnsettings){ my @settings = split(/,/,$_); chomp($settings[30]); - if ($settings[30] eq 'ikev2'){next;} if ($settings[27] ne 'RED'){next;} if ($settings[4] ne 'net'){next;} if ($settings[1] ne 'on'){next;}chomp($settings[29]); @@ -57,15 +56,13 @@ foreach (@vpnsettings){ my $remoteip = `/usr/bin/ping -c 1 $remotehostname 2>/dev/null | head -n1 | awk '{print \$3}' | tr -d '()' | tr -d ':'`;chomp($remoteip); if ($remoteip eq ""){next;if ($debug){logger("Unable to resolve $remotehostname.");}} my $ipmatch= `echo "$status" | grep '$remoteip' | grep '$settings[2]'`; - my $established= `echo "$status" | grep '$settings[2]' | grep 'erouted;'`; + my $established= `echo "$status" | grep '$settings[2]' | grep -e 'erouted;' -e 'INSTALLED'`; my $known= `echo "$status" | grep '$settings[2]'`; if ( $ipmatch eq '' && $known ne '' ){ logger("Remote IP for host $remotehostname($remoteip) has changed, restarting ipsec."); system("/usr/local/bin/ipsecctrl S $settings[0]"); $round=0; - last; #all connections will reloaded - #remove this if ipsecctrl can restart single con again } if ($debug){logger("Round=".$round." and established=".$established);} @@ -74,8 +71,6 @@ foreach (@vpnsettings){ logger("Connection to $remotehostname($remoteip) not erouted, restarting ipsec."); system("/usr/local/bin/ipsecctrl S $settings[0]"); $round=0; - last; #all connections will reloaded - #remove this if ipsecctrl can restart single con again } } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2ee0ab2d89eeeb33e609d9a19c11308273281cc2
by git＠ipfire.org 19 Aug '11

19 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 2ee0ab2d89eeeb33e609d9a19c11308273281cc2 (commit) from c059901fd6de70f682f53ad3398305a5e00853b6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2ee0ab2d89eeeb33e609d9a19c11308273281cc2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Aug 19 18:50:54 2011 +0200 ipfiredeeder: update to seed core51. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/ipfireseeder | 2 +- lfs/ipfireseeder | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index 4a6ca2a..322b3c3 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.9.i586-full-core50.iso.torrent +var/ipfire/seeder/ipfire-2.9.i586-full-core51.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index a4e120b..0fd2f3c 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.9.i586-full-core50.iso.torrent +DL_FILE = ipfire-2.9.i586-full-core51.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 26 +PAK_VER = 27 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 07d3b03c3042f67464a33319207d2795 +$(DL_FILE)_MD5 = fa40cd03e4b0a11f8f703595a5c01a76 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 86525dfc52009003a0976fb8df135ba0808ae121
by git＠ipfire.org 18 Aug '11

18 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 86525dfc52009003a0976fb8df135ba0808ae121 (commit) from 5861450ef888402d3258f38861ce8f9a7a14c8e7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 86525dfc52009003a0976fb8df135ba0808ae121 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 18 14:07:55 2011 +0200 IKEv2: Add roadwarrior configuration to file. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/vpnmain.cgi | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 888372e..e1a8200 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -439,6 +439,7 @@ sub writeipsecfiles { # Automatically start only if a net-to-net connection if ($lconfighash{$key}[3] eq 'host') { print CONF "\tauto=add\n"; + print CONF "\trightsourceip=$lvpnsettings{'RW_NET'}\n"; } else { print CONF "\tauto=start\n"; } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5861450ef888402d3258f38861ce8f9a7a14c8e7
by git＠ipfire.org 17 Aug '11

17 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 5861450ef888402d3258f38861ce8f9a7a14c8e7 (commit) via ea452c11ebe45e586031835591175926889322dd (commit) via c059901fd6de70f682f53ad3398305a5e00853b6 (commit) via b01a112688ccbcdb30fb1388978a7a68dd79842c (commit) via 4cc53b4ddc92ca2d644498dd6b9cd1662252b5af (commit) via d648e9f3dc1283e08b8266753a2726cbe4d2ff55 (commit) via 5127cfcf2df8246b5b86eb78c898341d404b9235 (commit) via 061d33e4b63834473db59fca5d10033df3d71cdc (commit) via 31e4219e7b0a7685f985722aa2060ad052ab9a3f (commit) via 2c46d7e299add461055a4af2dd03f25d88dd3221 (commit) from c7a2cfc817ff9f8524048bffacacded2a24b970b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5861450ef888402d3258f38861ce8f9a7a14c8e7 Merge: ea452c1 c059901 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 17 16:54:10 2011 +0200 Merge commit 'origin/master' into next commit ea452c11ebe45e586031835591175926889322dd Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 17 16:46:41 2011 +0200 kvm-kmod: update to 3.0b. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/useragents | 1 + config/rootfiles/core/51/filelists/dhcp | 1 + config/rootfiles/core/51/filelists/files | 1 + config/rootfiles/core/51/update.sh | 15 +- lfs/dhcp | 5 +- lfs/kvm-kmod | 6 +- lfs/linux | 12 +- src/patches/dhcp-3.0.4-iproute2-1.patch | 230 -------------------- ...b_remove_pvclock_scale_delta_redefinition.patch | 12 + 9 files changed, 34 insertions(+), 249 deletions(-) create mode 120000 config/rootfiles/core/51/filelists/dhcp delete mode 100644 src/patches/dhcp-3.0.4-iproute2-1.patch create mode 100644 src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch Difference in files: diff --git a/config/cfgroot/useragents b/config/cfgroot/useragents index 9ddd6d8..5fe3446 100644 --- a/config/cfgroot/useragents +++ b/config/cfgroot/useragents @@ -11,6 +11,7 @@ GOZILLA,Go!Zilla,(Go!Zilla) GOOGLE,Google Toolbar,(Google\sToolbar) JAVA,Java,(Java) KONQUEROR,Konqueror,(Konqueror) +LIBWWWPERL,libwww-perl,(libww-perl) LYNX,Lynx,(Lynx) MSIE,Internet Explorer,(MSIE.*[)]$) NETSCAPE,Netscape,(^Mozilla\/4.[7|8])|(Netscape) diff --git a/config/rootfiles/core/51/filelists/dhcp b/config/rootfiles/core/51/filelists/dhcp new file mode 120000 index 0000000..32d8da4 --- /dev/null +++ b/config/rootfiles/core/51/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/51/filelists/files b/config/rootfiles/core/51/filelists/files index ea5e6b1..ec37489 100644 --- a/config/rootfiles/core/51/filelists/files +++ b/config/rootfiles/core/51/filelists/files @@ -1,3 +1,4 @@ etc/system-release etc/sysctl.conf var/ipfire/langs/ +var/ipfire/proxy/advanced/useragents diff --git a/config/rootfiles/core/51/update.sh b/config/rootfiles/core/51/update.sh index 19fe898..201c2db 100644 --- a/config/rootfiles/core/51/update.sh +++ b/config/rootfiles/core/51/update.sh @@ -44,12 +44,11 @@ fi # -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ - /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 -fi +# erase old backups to prefent disk-full on small installations +rm -f /var/ipfire/backup/core-upgrade_*.tar.bz2 + +# +# backup echo First we made a backup of all files that was inside of the echo update archive. This may take a while ... # Add some files that are not in the package to backup @@ -80,7 +79,7 @@ cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org /etc/init.d/snort stop /etc/init.d/squid stop /etc/init.d/ipsec stop - +/etc/init.d/dhcp stop # # Unpack the updated files # @@ -97,12 +96,14 @@ rm -f /etc/modprobe.d/ralink_wireless # # Start services # +/etc/init.d/dhcp start /etc/init.d/squid start /etc/init.d/snort start if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then /etc/init.d/ipsec start fi + # # Modify grub.conf # diff --git a/lfs/dhcp b/lfs/dhcp index 01cd9d5..845813c 100644 --- a/lfs/dhcp +++ b/lfs/dhcp @@ -24,7 +24,7 @@ include Config -VER = 3.1.0 +VER = 3.1-ESV-R3 THISAPP = dhcp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 27d179a3c3fbef576566b456a1168246 +$(DL_FILE)_MD5 = af3d8db60f62664f1d5538b81e406459 install : $(TARGET) @@ -70,7 +70,6 @@ $(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/dhcp-3.0.4-iproute2-1.patch cd $(DIR_APP) && ./configure cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make LIBDIR=/usr/lib INCDIR=/usr/include install diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod index b6418ac..7cb846e 100644 --- a/lfs/kvm-kmod +++ b/lfs/kvm-kmod @@ -34,7 +34,7 @@ else endif endif -VER = 2.6.38.6 +VER = 3.0b THISAPP = kvm-kmod-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b631ba6ba7b0d3c07de870c6104ffbd5 +$(DL_FILE)_MD5 = 19792041adc25779b31ea5c5fdca7d8c install : $(TARGET) @@ -83,7 +83,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_pvclock_scale_delta_redifinition.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_pvclock_scale_delta_redefinition.patch cd $(DIR_APP) && ./configure --kerneldir=/usr/src/linux cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && install -m 644 x86/*.ko \ diff --git a/lfs/linux b/lfs/linux index 0da4313..cb36d5f 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,18 +24,18 @@ include Config -PATCHLEVEL = .44 -VER = 2.6.32.44 +PATCHLEVEL = .45 +VER = 2.6.32.45 THISAPP = linux-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = PROG = linux-xen -PAK_VER = 18 +PAK_VER = 19 DEPS = "" # Normal build or XEN build. @@ -68,7 +68,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2 -$(DL_FILE)_MD5 = 38d43bb91fff88783f57ada146415029 +$(DL_FILE)_MD5 = d41f1c7e704cc95fdfc3374367b6fd64 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 @@ -103,7 +103,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) ln -s linux-$(VER) /usr/src/linux diff --git a/src/patches/dhcp-3.0.4-iproute2-1.patch b/src/patches/dhcp-3.0.4-iproute2-1.patch deleted file mode 100644 index 40a6aad..0000000 --- a/src/patches/dhcp-3.0.4-iproute2-1.patch +++ /dev/null @@ -1,230 +0,0 @@ -Submitted By: DJ Lucas (dj at linuxfromscratch dot org) -Date: 2005-06-18 -Initial Package Version: 3.0.2 -Origin: Jim Gifford, Bruce Dubbs, DJ Lucas -Description: Fixes client script to use iproute2 (added flush to previous - unversioned patches) -Upstream Status: Not submitted - ---- dhcp-3.0.2-orig/client/scripts/linux 2002-11-14 19:09:09.000000000 -0600 -+++ dhcp-3.0.2/client/scripts/linux 2005-06-18 22:54:59.000000000 -0500 -@@ -1,26 +1,15 @@ - #!/bin/bash - # dhclient-script for Linux. Dan Halbert, March, 1997. - # Updated for Linux 2.[12] by Brian J. Murrell, January 1999. --# No guarantees about this. I'm a novice at the details of Linux --# networking. -+ -+# Updated to iproute2 by Jim Gifford (scripts(a)jg555.com) - - # Notes: - - # 0. This script is based on the netbsd script supplied with dhcp-970306. -- --# 1. ifconfig down apparently deletes all relevant routes and flushes --# the arp cache, so this doesn't need to be done explicitly. -- --# 2. The alias address handling here has not been tested AT ALL. --# I'm just going by the doc of modern Linux ip aliasing, which uses --# notations like eth0:0, eth0:1, for each alias. -- --# 3. I have to calculate the network address, and calculate the broadcast --# address if it is not supplied. This might be much more easily done --# by the dhclient C code, and passed on. -- --# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious --# of the $1 in its args. -+# 1. This script was modified to work with iproute2 -+# 2. cidr_convert based on a script by Kevin Fleming (kpfleming(a)linuxfromscratch.org) -+# 3. Updated to delete addresses when taking an interface down (bdubbs(a)linuxfromscratch.org) - - make_resolv_conf() { - if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then -@@ -32,6 +21,30 @@ - fi - } - -+dec2binary() -+{ -+ local n=$1 -+ local ret="" -+ while [ $n != 0 ]; do -+ ret=$[$n%2]$ret -+ n=$[$n>>1] -+ done -+ echo $ret -+} -+ -+mask_to_binary() -+{ -+ echo `dec2binary $1``dec2binary $2``dec2binary $3``dec2binary $4` -+} -+ -+cidr_convert() -+{ -+ netmask=$1 -+ local mask=`mask_to_binary ${netmask//./ }` -+ mask=${mask%%0*} -+ cidr=${#mask} -+} -+ - # Must be used on exit. Invokes the local dhcp client exit hooks, if any. - exit_with_hooks() { - exit_status=$1 -@@ -53,11 +66,6 @@ - fi - fi - --release=`uname -r` --release=`expr $release : '$.*$\..*'` --relminor=`echo $release |sed -e 's/[0-9]*\.$[0-9][0-9]*$$\..*$*$/\1/'` --relmajor=`echo $release |sed -e 's/$[0-9][0-9]*$\..*$/\1/'` -- - if [ x$new_broadcast_address != x ]; then - new_broadcast_arg="broadcast $new_broadcast_address" - fi -@@ -65,13 +73,12 @@ - old_broadcast_arg="broadcast $old_broadcast_address" - fi - if [ x$new_subnet_mask != x ]; then -- new_subnet_arg="netmask $new_subnet_mask" -+ cidr_convert $new_subnet_mask -+ new_subnet_arg="$cidr" - fi - if [ x$old_subnet_mask != x ]; then -- old_subnet_arg="netmask $old_subnet_mask" --fi --if [ x$alias_subnet_mask != x ]; then -- alias_subnet_arg="netmask $alias_subnet_mask" -+ cidr_convert $old_subnet_mask -+ old_subnet_arg="$cidr" - fi - - if [ x$reason = xMEDIUM ]; then -@@ -82,17 +89,10 @@ - if [ x$reason = xPREINIT ]; then - if [ x$alias_ip_address != x ]; then - # Bring down alias interface. Its routes will disappear too. -- ifconfig $interface:0- inet 0 -- fi -- if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ) -- then -- ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \ -- broadcast 255.255.255.255 up -- # Add route to make broadcast work. Do not omit netmask. -- route add default dev $interface netmask 0.0.0.0 -- else -- ifconfig $interface 0 up -+ ip link set $interface down -+ ip addr del $alias_ip_address dev $interface - fi -+ ip link set $interface up - - # We need to give the kernel some time to get the interface up. - sleep 1 -@@ -115,83 +115,51 @@ - fi - fi - -- if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ -- [ x$alias_ip_address != x$old_ip_address ]; then -- # Possible new alias. Remove old alias. -- ifconfig $interface:0- inet 0 -- fi - if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then -- # IP address changed. Bringing down the interface will delete all routes, -+ # IP address changed. Bring down the interface, delete all routes, - # and clear the ARP cache. -- ifconfig $interface inet 0 down -- -+ ip link set $interface down -+ ip addr flush dev $interface - fi - if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ - [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then - -- ifconfig $interface inet $new_ip_address $new_subnet_arg \ -- $new_broadcast_arg -+ ip link set $interface up -+ ip addr add $new_ip_address/$new_subnet_arg $new_broadcast_arg \ -+ label $interface dev $interface - # Add a network route to the computed network address. -- if [ $relmajor -lt 2 ] || \ -- ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then -- route add -net $new_network_number $new_subnet_arg dev $interface -- fi - for router in $new_routers; do -- route add default gw $router -+ ip route add default via $router - done - fi -- if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; -- then -- ifconfig $interface:0- inet 0 -- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -- route add -host $alias_ip_address $interface:0 -- fi - make_resolv_conf - exit_with_hooks 0 - fi - - if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \ - || [ x$reason = xSTOP ]; then -- if [ x$alias_ip_address != x ]; then -- # Turn off alias interface. -- ifconfig $interface:0- inet 0 -- fi - if [ x$old_ip_address != x ]; then -- # Shut down interface, which will delete routes and clear arp cache. -- ifconfig $interface inet 0 down -- fi -- if [ x$alias_ip_address != x ]; then -- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -- route add -host $alias_ip_address $interface:0 -+ # Shut down interface, delete routes, and clear arp cache. -+ ip link set $interface down -+ ip addr flush dev $interface - fi - exit_with_hooks 0 - fi - - if [ x$reason = xTIMEOUT ]; then -- if [ x$alias_ip_address != x ]; then -- ifconfig $interface:0- inet 0 -- fi -- ifconfig $interface inet $new_ip_address $new_subnet_arg \ -- $new_broadcast_arg -+ ip link set $interface up -+ ip addr set $new_ip_address/$new_subnet_arg $new_broadcast_arg \ -+ label $interface dev $interface - set $new_routers -- ############## what is -w in ping? -- if ping -q -c 1 $1; then -- if [ x$new_ip_address != x$alias_ip_address ] && \ -- [ x$alias_ip_address != x ]; then -- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -- route add -host $alias_ip_address dev $interface:0 -- fi -- if [ $relmajor -lt 2 ] || \ -- ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then -- route add -net $new_network_number -- fi -- for router in $new_routers; do -- route add default gw $router -- done -- make_resolv_conf -- exit_with_hooks 0 -- fi -- ifconfig $interface inet 0 down -+ -+ for router in $new_routers; do -+ ip route add default via $router -+ done -+ -+ make_resolv_conf -+ exit_with_hooks 0 -+ ip link set $interface down -+ ip addr flush dev $interface - exit_with_hooks 1 - fi - diff --git a/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch b/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch new file mode 100644 index 0000000..87effb3 --- /dev/null +++ b/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch @@ -0,0 +1,12 @@ +diff -Naur kvm-kmod-3.0b.org/x86/external-module-compat.h kvm-kmod-3.0b/x86/external-module-compat.h +--- kvm-kmod-3.0b.org/x86/external-module-compat.h 2011-07-23 16:39:10.000000000 +0200 ++++ kvm-kmod-3.0b/x86/external-module-compat.h 2011-08-13 21:37:56.046677541 +0200 +@@ -1095,7 +1095,7 @@ + + #endif /* >= 2.6.36 */ + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) || \ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) && \ + (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,32) && KERNEL_EXTRAVERSION < 40) + static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift) + { hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c059901fd6de70f682f53ad3398305a5e00853b6
by git＠ipfire.org 17 Aug '11

17 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via c059901fd6de70f682f53ad3398305a5e00853b6 (commit) via b01a112688ccbcdb30fb1388978a7a68dd79842c (commit) via 4cc53b4ddc92ca2d644498dd6b9cd1662252b5af (commit) via d648e9f3dc1283e08b8266753a2726cbe4d2ff55 (commit) via 5127cfcf2df8246b5b86eb78c898341d404b9235 (commit) via 061d33e4b63834473db59fca5d10033df3d71cdc (commit) via 31e4219e7b0a7685f985722aa2060ad052ab9a3f (commit) via 2c46d7e299add461055a4af2dd03f25d88dd3221 (commit) from a4ae66837056553ad2dbdcc14ba165892ce16085 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c059901fd6de70f682f53ad3398305a5e00853b6 Merge: a4ae668 b01a112 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 17 16:32:16 2011 +0200 Merge branch 'core51' ----------------------------------------------------------------------- Summary of changes: config/cfgroot/useragents | 1 + config/rootfiles/core/51/filelists/dhcp | 1 + config/rootfiles/core/51/filelists/files | 1 + config/rootfiles/core/51/update.sh | 15 +- lfs/dhcp | 5 +- lfs/linux | 12 +- src/patches/dhcp-3.0.4-iproute2-1.patch | 230 ------------------------------ 7 files changed, 19 insertions(+), 246 deletions(-) create mode 120000 config/rootfiles/core/51/filelists/dhcp delete mode 100644 src/patches/dhcp-3.0.4-iproute2-1.patch Difference in files: diff --git a/config/cfgroot/useragents b/config/cfgroot/useragents index 9ddd6d8..5fe3446 100644 --- a/config/cfgroot/useragents +++ b/config/cfgroot/useragents @@ -11,6 +11,7 @@ GOZILLA,Go!Zilla,(Go!Zilla) GOOGLE,Google Toolbar,(Google\sToolbar) JAVA,Java,(Java) KONQUEROR,Konqueror,(Konqueror) +LIBWWWPERL,libwww-perl,(libww-perl) LYNX,Lynx,(Lynx) MSIE,Internet Explorer,(MSIE.*[)]$) NETSCAPE,Netscape,(^Mozilla\/4.[7|8])|(Netscape) diff --git a/config/rootfiles/core/51/filelists/dhcp b/config/rootfiles/core/51/filelists/dhcp new file mode 120000 index 0000000..32d8da4 --- /dev/null +++ b/config/rootfiles/core/51/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/51/filelists/files b/config/rootfiles/core/51/filelists/files index ea5e6b1..ec37489 100644 --- a/config/rootfiles/core/51/filelists/files +++ b/config/rootfiles/core/51/filelists/files @@ -1,3 +1,4 @@ etc/system-release etc/sysctl.conf var/ipfire/langs/ +var/ipfire/proxy/advanced/useragents diff --git a/config/rootfiles/core/51/update.sh b/config/rootfiles/core/51/update.sh index 19fe898..201c2db 100644 --- a/config/rootfiles/core/51/update.sh +++ b/config/rootfiles/core/51/update.sh @@ -44,12 +44,11 @@ fi # -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ - /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 -fi +# erase old backups to prefent disk-full on small installations +rm -f /var/ipfire/backup/core-upgrade_*.tar.bz2 + +# +# backup echo First we made a backup of all files that was inside of the echo update archive. This may take a while ... # Add some files that are not in the package to backup @@ -80,7 +79,7 @@ cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org /etc/init.d/snort stop /etc/init.d/squid stop /etc/init.d/ipsec stop - +/etc/init.d/dhcp stop # # Unpack the updated files # @@ -97,12 +96,14 @@ rm -f /etc/modprobe.d/ralink_wireless # # Start services # +/etc/init.d/dhcp start /etc/init.d/squid start /etc/init.d/snort start if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then /etc/init.d/ipsec start fi + # # Modify grub.conf # diff --git a/lfs/dhcp b/lfs/dhcp index 01cd9d5..845813c 100644 --- a/lfs/dhcp +++ b/lfs/dhcp @@ -24,7 +24,7 @@ include Config -VER = 3.1.0 +VER = 3.1-ESV-R3 THISAPP = dhcp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 27d179a3c3fbef576566b456a1168246 +$(DL_FILE)_MD5 = af3d8db60f62664f1d5538b81e406459 install : $(TARGET) @@ -70,7 +70,6 @@ $(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/dhcp-3.0.4-iproute2-1.patch cd $(DIR_APP) && ./configure cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make LIBDIR=/usr/lib INCDIR=/usr/include install diff --git a/lfs/linux b/lfs/linux index 0da4313..cb36d5f 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,18 +24,18 @@ include Config -PATCHLEVEL = .44 -VER = 2.6.32.44 +PATCHLEVEL = .45 +VER = 2.6.32.45 THISAPP = linux-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = PROG = linux-xen -PAK_VER = 18 +PAK_VER = 19 DEPS = "" # Normal build or XEN build. @@ -68,7 +68,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2 -$(DL_FILE)_MD5 = 38d43bb91fff88783f57ada146415029 +$(DL_FILE)_MD5 = d41f1c7e704cc95fdfc3374367b6fd64 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 @@ -103,7 +103,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) ln -s linux-$(VER) /usr/src/linux diff --git a/src/patches/dhcp-3.0.4-iproute2-1.patch b/src/patches/dhcp-3.0.4-iproute2-1.patch deleted file mode 100644 index 40a6aad..0000000 --- a/src/patches/dhcp-3.0.4-iproute2-1.patch +++ /dev/null @@ -1,230 +0,0 @@ -Submitted By: DJ Lucas (dj at linuxfromscratch dot org) -Date: 2005-06-18 -Initial Package Version: 3.0.2 -Origin: Jim Gifford, Bruce Dubbs, DJ Lucas -Description: Fixes client script to use iproute2 (added flush to previous - unversioned patches) -Upstream Status: Not submitted - ---- dhcp-3.0.2-orig/client/scripts/linux 2002-11-14 19:09:09.000000000 -0600 -+++ dhcp-3.0.2/client/scripts/linux 2005-06-18 22:54:59.000000000 -0500 -@@ -1,26 +1,15 @@ - #!/bin/bash - # dhclient-script for Linux. Dan Halbert, March, 1997. - # Updated for Linux 2.[12] by Brian J. Murrell, January 1999. --# No guarantees about this. I'm a novice at the details of Linux --# networking. -+ -+# Updated to iproute2 by Jim Gifford (scripts(a)jg555.com) - - # Notes: - - # 0. This script is based on the netbsd script supplied with dhcp-970306. -- --# 1. ifconfig down apparently deletes all relevant routes and flushes --# the arp cache, so this doesn't need to be done explicitly. -- --# 2. The alias address handling here has not been tested AT ALL. --# I'm just going by the doc of modern Linux ip aliasing, which uses --# notations like eth0:0, eth0:1, for each alias. -- --# 3. I have to calculate the network address, and calculate the broadcast --# address if it is not supplied. This might be much more easily done --# by the dhclient C code, and passed on. -- --# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious --# of the $1 in its args. -+# 1. This script was modified to work with iproute2 -+# 2. cidr_convert based on a script by Kevin Fleming (kpfleming(a)linuxfromscratch.org) -+# 3. Updated to delete addresses when taking an interface down (bdubbs(a)linuxfromscratch.org) - - make_resolv_conf() { - if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then -@@ -32,6 +21,30 @@ - fi - } - -+dec2binary() -+{ -+ local n=$1 -+ local ret="" -+ while [ $n != 0 ]; do -+ ret=$[$n%2]$ret -+ n=$[$n>>1] -+ done -+ echo $ret -+} -+ -+mask_to_binary() -+{ -+ echo `dec2binary $1``dec2binary $2``dec2binary $3``dec2binary $4` -+} -+ -+cidr_convert() -+{ -+ netmask=$1 -+ local mask=`mask_to_binary ${netmask//./ }` -+ mask=${mask%%0*} -+ cidr=${#mask} -+} -+ - # Must be used on exit. Invokes the local dhcp client exit hooks, if any. - exit_with_hooks() { - exit_status=$1 -@@ -53,11 +66,6 @@ - fi - fi - --release=`uname -r` --release=`expr $release : '$.*$\..*'` --relminor=`echo $release |sed -e 's/[0-9]*\.$[0-9][0-9]*$$\..*$*$/\1/'` --relmajor=`echo $release |sed -e 's/$[0-9][0-9]*$\..*$/\1/'` -- - if [ x$new_broadcast_address != x ]; then - new_broadcast_arg="broadcast $new_broadcast_address" - fi -@@ -65,13 +73,12 @@ - old_broadcast_arg="broadcast $old_broadcast_address" - fi - if [ x$new_subnet_mask != x ]; then -- new_subnet_arg="netmask $new_subnet_mask" -+ cidr_convert $new_subnet_mask -+ new_subnet_arg="$cidr" - fi - if [ x$old_subnet_mask != x ]; then -- old_subnet_arg="netmask $old_subnet_mask" --fi --if [ x$alias_subnet_mask != x ]; then -- alias_subnet_arg="netmask $alias_subnet_mask" -+ cidr_convert $old_subnet_mask -+ old_subnet_arg="$cidr" - fi - - if [ x$reason = xMEDIUM ]; then -@@ -82,17 +89,10 @@ - if [ x$reason = xPREINIT ]; then - if [ x$alias_ip_address != x ]; then - # Bring down alias interface. Its routes will disappear too. -- ifconfig $interface:0- inet 0 -- fi -- if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ) -- then -- ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \ -- broadcast 255.255.255.255 up -- # Add route to make broadcast work. Do not omit netmask. -- route add default dev $interface netmask 0.0.0.0 -- else -- ifconfig $interface 0 up -+ ip link set $interface down -+ ip addr del $alias_ip_address dev $interface - fi -+ ip link set $interface up - - # We need to give the kernel some time to get the interface up. - sleep 1 -@@ -115,83 +115,51 @@ - fi - fi - -- if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ -- [ x$alias_ip_address != x$old_ip_address ]; then -- # Possible new alias. Remove old alias. -- ifconfig $interface:0- inet 0 -- fi - if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then -- # IP address changed. Bringing down the interface will delete all routes, -+ # IP address changed. Bring down the interface, delete all routes, - # and clear the ARP cache. -- ifconfig $interface inet 0 down -- -+ ip link set $interface down -+ ip addr flush dev $interface - fi - if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ - [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then - -- ifconfig $interface inet $new_ip_address $new_subnet_arg \ -- $new_broadcast_arg -+ ip link set $interface up -+ ip addr add $new_ip_address/$new_subnet_arg $new_broadcast_arg \ -+ label $interface dev $interface - # Add a network route to the computed network address. -- if [ $relmajor -lt 2 ] || \ -- ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then -- route add -net $new_network_number $new_subnet_arg dev $interface -- fi - for router in $new_routers; do -- route add default gw $router -+ ip route add default via $router - done - fi -- if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; -- then -- ifconfig $interface:0- inet 0 -- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -- route add -host $alias_ip_address $interface:0 -- fi - make_resolv_conf - exit_with_hooks 0 - fi - - if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \ - || [ x$reason = xSTOP ]; then -- if [ x$alias_ip_address != x ]; then -- # Turn off alias interface. -- ifconfig $interface:0- inet 0 -- fi - if [ x$old_ip_address != x ]; then -- # Shut down interface, which will delete routes and clear arp cache. -- ifconfig $interface inet 0 down -- fi -- if [ x$alias_ip_address != x ]; then -- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -- route add -host $alias_ip_address $interface:0 -+ # Shut down interface, delete routes, and clear arp cache. -+ ip link set $interface down -+ ip addr flush dev $interface - fi - exit_with_hooks 0 - fi - - if [ x$reason = xTIMEOUT ]; then -- if [ x$alias_ip_address != x ]; then -- ifconfig $interface:0- inet 0 -- fi -- ifconfig $interface inet $new_ip_address $new_subnet_arg \ -- $new_broadcast_arg -+ ip link set $interface up -+ ip addr set $new_ip_address/$new_subnet_arg $new_broadcast_arg \ -+ label $interface dev $interface - set $new_routers -- ############## what is -w in ping? -- if ping -q -c 1 $1; then -- if [ x$new_ip_address != x$alias_ip_address ] && \ -- [ x$alias_ip_address != x ]; then -- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -- route add -host $alias_ip_address dev $interface:0 -- fi -- if [ $relmajor -lt 2 ] || \ -- ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then -- route add -net $new_network_number -- fi -- for router in $new_routers; do -- route add default gw $router -- done -- make_resolv_conf -- exit_with_hooks 0 -- fi -- ifconfig $interface inet 0 down -+ -+ for router in $new_routers; do -+ ip route add default via $router -+ done -+ -+ make_resolv_conf -+ exit_with_hooks 0 -+ ip link set $interface down -+ ip addr flush dev $interface - exit_with_hooks 1 - fi - hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core51, updated. b01a112688ccbcdb30fb1388978a7a68dd79842c
by git＠ipfire.org 17 Aug '11

17 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core51 has been updated via b01a112688ccbcdb30fb1388978a7a68dd79842c (commit) via 4cc53b4ddc92ca2d644498dd6b9cd1662252b5af (commit) via d648e9f3dc1283e08b8266753a2726cbe4d2ff55 (commit) via 5127cfcf2df8246b5b86eb78c898341d404b9235 (commit) via 061d33e4b63834473db59fca5d10033df3d71cdc (commit) via 31e4219e7b0a7685f985722aa2060ad052ab9a3f (commit) from 2c46d7e299add461055a4af2dd03f25d88dd3221 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b01a112688ccbcdb30fb1388978a7a68dd79842c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 17 07:09:21 2011 +0200 core51: stop/start dhcp server at update. commit 4cc53b4ddc92ca2d644498dd6b9cd1662252b5af Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Aug 16 22:23:49 2011 +0200 kernel: update to 2.6.32.45. commit d648e9f3dc1283e08b8266753a2726cbe4d2ff55 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Aug 16 22:08:41 2011 +0200 core51: add useragents to updater. commit 5127cfcf2df8246b5b86eb78c898341d404b9235 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 14 11:18:27 2011 +0200 Add libwww-perl to useragent list of proxy. http://forum.ipfire.org/index.php?topic=5003.0 commit 061d33e4b63834473db59fca5d10033df3d71cdc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Aug 16 21:00:48 2011 +0200 core51: add dhcpd to updater. commit 31e4219e7b0a7685f985722aa2060ad052ab9a3f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 12 16:16:11 2011 +0200 dhcp: Security update. https://www.isc.org/software/dhcp/advisories/cve-2011-2748 ----------------------------------------------------------------------- Summary of changes: config/cfgroot/useragents | 1 + config/rootfiles/core/51/filelists/dhcp | 1 + config/rootfiles/core/51/filelists/files | 1 + config/rootfiles/core/51/update.sh | 4 +- lfs/dhcp | 5 +- lfs/linux | 12 +- src/patches/dhcp-3.0.4-iproute2-1.patch | 230 ------------------------------ 7 files changed, 14 insertions(+), 240 deletions(-) create mode 120000 config/rootfiles/core/51/filelists/dhcp delete mode 100644 src/patches/dhcp-3.0.4-iproute2-1.patch Difference in files: diff --git a/config/cfgroot/useragents b/config/cfgroot/useragents index 9ddd6d8..5fe3446 100644 --- a/config/cfgroot/useragents +++ b/config/cfgroot/useragents @@ -11,6 +11,7 @@ GOZILLA,Go!Zilla,(Go!Zilla) GOOGLE,Google Toolbar,(Google\sToolbar) JAVA,Java,(Java) KONQUEROR,Konqueror,(Konqueror) +LIBWWWPERL,libwww-perl,(libww-perl) LYNX,Lynx,(Lynx) MSIE,Internet Explorer,(MSIE.*[)]$) NETSCAPE,Netscape,(^Mozilla\/4.[7|8])|(Netscape) diff --git a/config/rootfiles/core/51/filelists/dhcp b/config/rootfiles/core/51/filelists/dhcp new file mode 120000 index 0000000..32d8da4 --- /dev/null +++ b/config/rootfiles/core/51/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/51/filelists/files b/config/rootfiles/core/51/filelists/files index ea5e6b1..ec37489 100644 --- a/config/rootfiles/core/51/filelists/files +++ b/config/rootfiles/core/51/filelists/files @@ -1,3 +1,4 @@ etc/system-release etc/sysctl.conf var/ipfire/langs/ +var/ipfire/proxy/advanced/useragents diff --git a/config/rootfiles/core/51/update.sh b/config/rootfiles/core/51/update.sh index 0e9e454..201c2db 100644 --- a/config/rootfiles/core/51/update.sh +++ b/config/rootfiles/core/51/update.sh @@ -79,7 +79,7 @@ cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org /etc/init.d/snort stop /etc/init.d/squid stop /etc/init.d/ipsec stop - +/etc/init.d/dhcp stop # # Unpack the updated files # @@ -96,12 +96,14 @@ rm -f /etc/modprobe.d/ralink_wireless # # Start services # +/etc/init.d/dhcp start /etc/init.d/squid start /etc/init.d/snort start if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then /etc/init.d/ipsec start fi + # # Modify grub.conf # diff --git a/lfs/dhcp b/lfs/dhcp index 01cd9d5..845813c 100644 --- a/lfs/dhcp +++ b/lfs/dhcp @@ -24,7 +24,7 @@ include Config -VER = 3.1.0 +VER = 3.1-ESV-R3 THISAPP = dhcp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 27d179a3c3fbef576566b456a1168246 +$(DL_FILE)_MD5 = af3d8db60f62664f1d5538b81e406459 install : $(TARGET) @@ -70,7 +70,6 @@ $(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/dhcp-3.0.4-iproute2-1.patch cd $(DIR_APP) && ./configure cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make LIBDIR=/usr/lib INCDIR=/usr/include install diff --git a/lfs/linux b/lfs/linux index 0da4313..cb36d5f 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,18 +24,18 @@ include Config -PATCHLEVEL = .44 -VER = 2.6.32.44 +PATCHLEVEL = .45 +VER = 2.6.32.45 THISAPP = linux-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = PROG = linux-xen -PAK_VER = 18 +PAK_VER = 19 DEPS = "" # Normal build or XEN build. @@ -68,7 +68,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2 -$(DL_FILE)_MD5 = 38d43bb91fff88783f57ada146415029 +$(DL_FILE)_MD5 = d41f1c7e704cc95fdfc3374367b6fd64 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 @@ -103,7 +103,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) ln -s linux-$(VER) /usr/src/linux diff --git a/src/patches/dhcp-3.0.4-iproute2-1.patch b/src/patches/dhcp-3.0.4-iproute2-1.patch deleted file mode 100644 index 40a6aad..0000000 --- a/src/patches/dhcp-3.0.4-iproute2-1.patch +++ /dev/null @@ -1,230 +0,0 @@ -Submitted By: DJ Lucas (dj at linuxfromscratch dot org) -Date: 2005-06-18 -Initial Package Version: 3.0.2 -Origin: Jim Gifford, Bruce Dubbs, DJ Lucas -Description: Fixes client script to use iproute2 (added flush to previous - unversioned patches) -Upstream Status: Not submitted - ---- dhcp-3.0.2-orig/client/scripts/linux 2002-11-14 19:09:09.000000000 -0600 -+++ dhcp-3.0.2/client/scripts/linux 2005-06-18 22:54:59.000000000 -0500 -@@ -1,26 +1,15 @@ - #!/bin/bash - # dhclient-script for Linux. Dan Halbert, March, 1997. - # Updated for Linux 2.[12] by Brian J. Murrell, January 1999. --# No guarantees about this. I'm a novice at the details of Linux --# networking. -+ -+# Updated to iproute2 by Jim Gifford (scripts(a)jg555.com) - - # Notes: - - # 0. This script is based on the netbsd script supplied with dhcp-970306. -- --# 1. ifconfig down apparently deletes all relevant routes and flushes --# the arp cache, so this doesn't need to be done explicitly. -- --# 2. The alias address handling here has not been tested AT ALL. --# I'm just going by the doc of modern Linux ip aliasing, which uses --# notations like eth0:0, eth0:1, for each alias. -- --# 3. I have to calculate the network address, and calculate the broadcast --# address if it is not supplied. This might be much more easily done --# by the dhclient C code, and passed on. -- --# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious --# of the $1 in its args. -+# 1. This script was modified to work with iproute2 -+# 2. cidr_convert based on a script by Kevin Fleming (kpfleming(a)linuxfromscratch.org) -+# 3. Updated to delete addresses when taking an interface down (bdubbs(a)linuxfromscratch.org) - - make_resolv_conf() { - if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then -@@ -32,6 +21,30 @@ - fi - } - -+dec2binary() -+{ -+ local n=$1 -+ local ret="" -+ while [ $n != 0 ]; do -+ ret=$[$n%2]$ret -+ n=$[$n>>1] -+ done -+ echo $ret -+} -+ -+mask_to_binary() -+{ -+ echo `dec2binary $1``dec2binary $2``dec2binary $3``dec2binary $4` -+} -+ -+cidr_convert() -+{ -+ netmask=$1 -+ local mask=`mask_to_binary ${netmask//./ }` -+ mask=${mask%%0*} -+ cidr=${#mask} -+} -+ - # Must be used on exit. Invokes the local dhcp client exit hooks, if any. - exit_with_hooks() { - exit_status=$1 -@@ -53,11 +66,6 @@ - fi - fi - --release=`uname -r` --release=`expr $release : '$.*$\..*'` --relminor=`echo $release |sed -e 's/[0-9]*\.$[0-9][0-9]*$$\..*$*$/\1/'` --relmajor=`echo $release |sed -e 's/$[0-9][0-9]*$\..*$/\1/'` -- - if [ x$new_broadcast_address != x ]; then - new_broadcast_arg="broadcast $new_broadcast_address" - fi -@@ -65,13 +73,12 @@ - old_broadcast_arg="broadcast $old_broadcast_address" - fi - if [ x$new_subnet_mask != x ]; then -- new_subnet_arg="netmask $new_subnet_mask" -+ cidr_convert $new_subnet_mask -+ new_subnet_arg="$cidr" - fi - if [ x$old_subnet_mask != x ]; then -- old_subnet_arg="netmask $old_subnet_mask" --fi --if [ x$alias_subnet_mask != x ]; then -- alias_subnet_arg="netmask $alias_subnet_mask" -+ cidr_convert $old_subnet_mask -+ old_subnet_arg="$cidr" - fi - - if [ x$reason = xMEDIUM ]; then -@@ -82,17 +89,10 @@ - if [ x$reason = xPREINIT ]; then - if [ x$alias_ip_address != x ]; then - # Bring down alias interface. Its routes will disappear too. -- ifconfig $interface:0- inet 0 -- fi -- if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ) -- then -- ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \ -- broadcast 255.255.255.255 up -- # Add route to make broadcast work. Do not omit netmask. -- route add default dev $interface netmask 0.0.0.0 -- else -- ifconfig $interface 0 up -+ ip link set $interface down -+ ip addr del $alias_ip_address dev $interface - fi -+ ip link set $interface up - - # We need to give the kernel some time to get the interface up. - sleep 1 -@@ -115,83 +115,51 @@ - fi - fi - -- if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ -- [ x$alias_ip_address != x$old_ip_address ]; then -- # Possible new alias. Remove old alias. -- ifconfig $interface:0- inet 0 -- fi - if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then -- # IP address changed. Bringing down the interface will delete all routes, -+ # IP address changed. Bring down the interface, delete all routes, - # and clear the ARP cache. -- ifconfig $interface inet 0 down -- -+ ip link set $interface down -+ ip addr flush dev $interface - fi - if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ - [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then - -- ifconfig $interface inet $new_ip_address $new_subnet_arg \ -- $new_broadcast_arg -+ ip link set $interface up -+ ip addr add $new_ip_address/$new_subnet_arg $new_broadcast_arg \ -+ label $interface dev $interface - # Add a network route to the computed network address. -- if [ $relmajor -lt 2 ] || \ -- ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then -- route add -net $new_network_number $new_subnet_arg dev $interface -- fi - for router in $new_routers; do -- route add default gw $router -+ ip route add default via $router - done - fi -- if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; -- then -- ifconfig $interface:0- inet 0 -- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -- route add -host $alias_ip_address $interface:0 -- fi - make_resolv_conf - exit_with_hooks 0 - fi - - if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \ - || [ x$reason = xSTOP ]; then -- if [ x$alias_ip_address != x ]; then -- # Turn off alias interface. -- ifconfig $interface:0- inet 0 -- fi - if [ x$old_ip_address != x ]; then -- # Shut down interface, which will delete routes and clear arp cache. -- ifconfig $interface inet 0 down -- fi -- if [ x$alias_ip_address != x ]; then -- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -- route add -host $alias_ip_address $interface:0 -+ # Shut down interface, delete routes, and clear arp cache. -+ ip link set $interface down -+ ip addr flush dev $interface - fi - exit_with_hooks 0 - fi - - if [ x$reason = xTIMEOUT ]; then -- if [ x$alias_ip_address != x ]; then -- ifconfig $interface:0- inet 0 -- fi -- ifconfig $interface inet $new_ip_address $new_subnet_arg \ -- $new_broadcast_arg -+ ip link set $interface up -+ ip addr set $new_ip_address/$new_subnet_arg $new_broadcast_arg \ -+ label $interface dev $interface - set $new_routers -- ############## what is -w in ping? -- if ping -q -c 1 $1; then -- if [ x$new_ip_address != x$alias_ip_address ] && \ -- [ x$alias_ip_address != x ]; then -- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -- route add -host $alias_ip_address dev $interface:0 -- fi -- if [ $relmajor -lt 2 ] || \ -- ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then -- route add -net $new_network_number -- fi -- for router in $new_routers; do -- route add default gw $router -- done -- make_resolv_conf -- exit_with_hooks 0 -- fi -- ifconfig $interface inet 0 down -+ -+ for router in $new_routers; do -+ ip route add default via $router -+ done -+ -+ make_resolv_conf -+ exit_with_hooks 0 -+ ip link set $interface down -+ ip addr flush dev $interface - exit_with_hooks 1 - fi - hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.9-core51, created. b01a112688ccbcdb30fb1388978a7a68dd79842c
by git＠ipfire.org 17 Aug '11

17 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The tag, v2.9-core51 has been created at b01a112688ccbcdb30fb1388978a7a68dd79842c (commit) - Log ----------------------------------------------------------------- commit b01a112688ccbcdb30fb1388978a7a68dd79842c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 17 07:09:21 2011 +0200 core51: stop/start dhcp server at update. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core51, updated. 2c46d7e299add461055a4af2dd03f25d88dd3221
by git＠ipfire.org 12 Aug '11

12 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core51 has been updated via 2c46d7e299add461055a4af2dd03f25d88dd3221 (commit) from f47388c4d30cd3794536eb6cafb5cc22fba3be2c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2c46d7e299add461055a4af2dd03f25d88dd3221 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Aug 12 10:27:55 2011 +0200 core51: erase backups of previous core updates. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/51/update.sh | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/core/51/update.sh b/config/rootfiles/core/51/update.sh index 19fe898..0e9e454 100644 --- a/config/rootfiles/core/51/update.sh +++ b/config/rootfiles/core/51/update.sh @@ -44,12 +44,11 @@ fi # -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ - /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 -fi +# erase old backups to prefent disk-full on small installations +rm -f /var/ipfire/backup/core-upgrade_*.tar.bz2 + +# +# backup echo First we made a backup of all files that was inside of the echo update archive. This may take a while ... # Add some files that are not in the package to backup hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core44, updated. c02c8de996cc92660fb4292ab5069fe4dedecd06
by git＠ipfire.org 11 Aug '11

11 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core44 has been updated via c02c8de996cc92660fb4292ab5069fe4dedecd06 (commit) from 05abd7ba2501dad59e367c2e1b7423ce2ecff1ff (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c02c8de996cc92660fb4292ab5069fe4dedecd06 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 11 18:50:00 2011 +0200 core44: remove also the xen modules. if old modules are not removed the ct-server root run out of space. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/44/update.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh index 2141b3a..fadb327 100644 --- a/config/rootfiles/core/44/update.sh +++ b/config/rootfiles/core/44/update.sh @@ -68,7 +68,7 @@ rm -rf /boot/System.map-* rm -rf /boot/config-* rm -rf /boot/ipfirerd-* rm -rf /boot/vmlinuz-* -rm -rf /lib/modules/*-ipfire +rm -rf /lib/modules/* # Remove mkinitcpio rm -rf /etc/mkinitcpio.* rm -rf /lib/initcpio hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f0b55c28746b56de89d7a10a4ad0ad2a4939baac
by git＠ipfire.org 10 Aug '11

10 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via f0b55c28746b56de89d7a10a4ad0ad2a4939baac (commit) via 02229e7318fa6d008b25e5daa63117b6ee744a71 (commit) via 14d367dea8f528461b22c9eba199d006d434af48 (commit) via 2c2b49f5d8e1ca51303267c01e13fe1c3f42a080 (commit) via 7737398fa1093eae254aaeb7549584be51b37f07 (commit) from 167d2f5c4db1919e611655996abb37200937de1b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f0b55c28746b56de89d7a10a4ad0ad2a4939baac Author: Robert Möker <robertm(a)ipfire.org> Date: Wed Aug 10 13:25:16 2011 +0200 avahi: Update to 0.6.30. commit 02229e7318fa6d008b25e5daa63117b6ee744a71 Author: Robert Möker <robertm(a)ipfire.org> Date: Wed Aug 10 13:13:29 2011 +0200 libdaemon: Update to 0.14. commit 14d367dea8f528461b22c9eba199d006d434af48 Author: Robert Möker <robertm(a)ipfire.org> Date: Sat Aug 6 20:52:55 2011 +0200 usb-modswitch: Update to usb-modswitch 1.1.9 commit 2c2b49f5d8e1ca51303267c01e13fe1c3f42a080 Author: Robert Möker <robertm(a)ipfire.org> Date: Mon Aug 8 23:27:00 2011 +0200 sg3-utils: Update to sg3-utils 1.32 commit 7737398fa1093eae254aaeb7549584be51b37f07 Author: Robert Möker <robertm(a)ipfire.org> Date: Wed Aug 10 13:05:21 2011 +0200 iw: Update to iw 3.0 ----------------------------------------------------------------------- Summary of changes: pkgs/avahi/avahi.nm | 10 +++-- pkgs/iw/iw.nm | 7 +-- .../iw-0.9.17-default-install-to-PREFIX-sbin.patch | 42 -------------------- pkgs/libdaemon/libdaemon.nm | 4 +- pkgs/sg3-utils/sg3-utils.nm | 2 +- pkgs/usb-modemswitch/usb-modeswitch.nm | 4 +- 6 files changed, 14 insertions(+), 55 deletions(-) delete mode 100644 pkgs/iw/patches/iw-0.9.17-default-install-to-PREFIX-sbin.patch Difference in files: diff --git a/pkgs/avahi/avahi.nm b/pkgs/avahi/avahi.nm index e062d88..ae2d277 100644 --- a/pkgs/avahi/avahi.nm +++ b/pkgs/avahi/avahi.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = avahi -PKG_VER = 0.6.25 -PKG_REL = 0 +PKG_VER = 0.6.30 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = Networking/Zeroconf @@ -41,12 +41,13 @@ define PKG_DESCRIPTION you can chat with, find printers to print to or find files being \ shared. This kind of technology is already found in MacOS X (branded \ 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very \ - convenient + convenient. endef PKG_BUILD_DEPS+= dbus-devel dbus-glib-devel expat-devel gcc-c++ gettext \ - libdaemon-devel intltool perl perl-XML-Parser pkg-config python-devel \ + libdaemon-devel>=0.14 intltool perl perl-XML-Parser pkg-config python-devel \ python-dbus +PKG_DEPS-avahi+= libdaemon>=0.14 PKG_TARBALL = $(THISAPP).tar.gz @@ -62,5 +63,6 @@ CONFIGURE_OPTIONS += \ --disable-qt3 \ --disable-qt4 \ --disable-gtk \ + --disable-gtk3 \ --disable-pygtk \ --disable-mono diff --git a/pkgs/iw/iw.nm b/pkgs/iw/iw.nm index 9202180..9861b48 100644 --- a/pkgs/iw/iw.nm +++ b/pkgs/iw/iw.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = iw -PKG_VER = 0.9.17 +PKG_VER = 3.0 PKG_REL = 1 PKG_MAINTAINER = @@ -38,9 +38,8 @@ PKG_BUILD_DEPS+= libnl-devel pkg-config define PKG_DESCRIPTION iw is a new nl80211 based CLI configuration utility for wireless \ - devices. Currently you can only use this utility to configure devices \ - which use a mac80211 driver as these are the new drivers being written \ - - only because most new wireless devices being sold are now SoftMAC. + devices. It supports almost all new drivers that have been added \ + to the kernel recently. endef PKG_TARBALL = $(THISAPP).tar.bz2 diff --git a/pkgs/iw/patches/iw-0.9.17-default-install-to-PREFIX-sbin.patch b/pkgs/iw/patches/iw-0.9.17-default-install-to-PREFIX-sbin.patch deleted file mode 100644 index 74c8e33..0000000 --- a/pkgs/iw/patches/iw-0.9.17-default-install-to-PREFIX-sbin.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f8a9dbbbde041fca098b579c3669819e8282577a Mon Sep 17 00:00:00 2001 -From: John W. Linville <linville(a)tuxdriver.com> -Date: Wed, 30 Sep 2009 09:17:39 -0400 -Subject: [iw PATCH] default install to $(PREFIX)/sbin - -The iw utility isn't generally useful to normal users, so move it to -$(PREFIX)/sbin with other system management executables. - -Signed-off-by: John W. Linville <linville(a)tuxdriver.com> ---- -As "suggested" by Johannes... :-) - - Makefile | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index cb5fcc1..68bef4d 100644 ---- a/Makefile -+++ b/Makefile -@@ -3,7 +3,7 @@ - MAKEFLAGS += --no-print-directory - - PREFIX ?= /usr --BINDIR ?= $(PREFIX)/bin -+SBINDIR ?= $(PREFIX)/sbin - MANDIR ?= $(PREFIX)/share/man - PKG_CONFIG ?= pkg-config - -@@ -85,8 +85,8 @@ check: - - install: iw iw.8.gz - @$(NQ) ' INST iw' -- $(Q)$(MKDIR) $(DESTDIR)$(BINDIR) -- $(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(BINDIR) iw -+ $(Q)$(MKDIR) $(DESTDIR)$(SBINDIR) -+ $(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) iw - @$(NQ) ' INST iw.8' - $(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/ - $(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man8/ iw.8.gz --- -1.6.2.5 - diff --git a/pkgs/libdaemon/libdaemon.nm b/pkgs/libdaemon/libdaemon.nm index 7230632..b5186e4 100644 --- a/pkgs/libdaemon/libdaemon.nm +++ b/pkgs/libdaemon/libdaemon.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = libdaemon -PKG_VER = 0.13 -PKG_REL = 0 +PKG_VER = 0.14 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = System/Libraries diff --git a/pkgs/sg3-utils/sg3-utils.nm b/pkgs/sg3-utils/sg3-utils.nm index 6d4e379..3b4b252 100644 --- a/pkgs/sg3-utils/sg3-utils.nm +++ b/pkgs/sg3-utils/sg3-utils.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = sg3_utils -PKG_VER = 1.29 +PKG_VER = 1.32 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/usb-modemswitch/usb-modeswitch.nm b/pkgs/usb-modemswitch/usb-modeswitch.nm index 62551ad..1c40fdd 100644 --- a/pkgs/usb-modemswitch/usb-modeswitch.nm +++ b/pkgs/usb-modemswitch/usb-modeswitch.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = usb-modeswitch -PKG_VER = 1.1.7 -PKG_REL = 2 +PKG_VER = 1.1.9 +PKG_REL = 0 PKG_MAINTAINER = PKG_GROUPS = Applications/System hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM August 2011