[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5861450ef888402d3258f38861ce8f9a7a14c8e7 - IPFire-SCM

17 Aug 2011

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@ipfire.org
Date:   Wed Aug 17 16:54:10 2011 +0200
Merge commit 'origin/master' into next
commit ea452c11ebe45e586031835591175926889322dd
Author: Arne Fitzenreiter arne_f@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@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@linuxfromscratch.org)
-+# 3. Updated to delete addresses when taking an interface down (bdubbs@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

    