[arch-commits] Commit in dhcp/repos (3 files)
Daniel Isenmann
daniel at archlinux.org
Sat Jan 30 10:18:55 UTC 2010
Date: Saturday, January 30, 2010 @ 05:18:55
Author: daniel
Revision: 65480
Merged revisions 63454,65479 via svnmerge from
svn+ssh://daniel@gerolde.archlinux.org/srv/svn-packages/dhcp/trunk
........
r63454 | daniel | 2010-01-17 15:54:36 +0100 (Sun, 17 Jan 2010) | 1 line
needed patch
........
r65479 | daniel | 2010-01-30 11:18:12 +0100 (Sat, 30 Jan 2010) | 2 lines
upgpkg: dhcp 4.1.0.p1-3
fix FS#17885 and FS#17904
........
Added:
dhcp/repos/extra-x86_64/dhclient-script-pathFixes.patch
(from rev 65479, dhcp/trunk/dhclient-script-pathFixes.patch)
Modified:
dhcp/repos/extra-x86_64/ (properties)
dhcp/repos/extra-x86_64/PKGBUILD
---------------------------------+
PKGBUILD | 8 +-
dhclient-script-pathFixes.patch | 139 ++++++++++++++++++++++++++++++++++++++
2 files changed, 145 insertions(+), 2 deletions(-)
Property changes on: dhcp/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /dhcp/trunk:1-63447
+ /dhcp/trunk:1-65479
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2010-01-30 10:18:12 UTC (rev 65479)
+++ extra-x86_64/PKGBUILD 2010-01-30 10:18:55 UTC (rev 65480)
@@ -6,7 +6,7 @@
# separate patch levels with a period to maintain proper versioning.
pkgver=4.1.0.p1
_pkgver=4.1.0p1
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('custom:isc-dhcp')
url="https://www.isc.org/software/dhcp"
@@ -64,9 +64,13 @@
#not needed after fresh install
rm -f ${pkgdir}/var/lib/dhclient/dhcpd.leases
+ #move dhclient.conf to dhclient.conf.example
+ mv ${pkgdir}/etc/dhclient.conf ${pkgdir}/etc/dhclient.conf.example
+
# install dhclient linux script
+ mkdir ${pkgdir}/sbin
install -m755 -D ${srcdir}/${pkgname}-${_pkgver}/client/scripts/linux \
- ${pkgdir}/etc/dhclient-script
+ ${pkgdir}/sbin/dhclient-script
# install licenses
install -m644 -D ${srcdir}/${pkgname}-${_pkgver}/LICENSE \
${pkgdir}/usr/share/licenses/dhclient/LICENSE
Copied: dhcp/repos/extra-x86_64/dhclient-script-pathFixes.patch (from rev 65479, dhcp/trunk/dhclient-script-pathFixes.patch)
===================================================================
--- extra-x86_64/dhclient-script-pathFixes.patch (rev 0)
+++ extra-x86_64/dhclient-script-pathFixes.patch 2010-01-30 10:18:55 UTC (rev 65480)
@@ -0,0 +1,139 @@
+--- linux 2008-05-23 15:56:07.000000000 +0200
++++ linux_new 2010-01-17 15:40:45.000000000 +0100
+@@ -8,7 +8,7 @@
+
+ # 0. This script is based on the netbsd script supplied with dhcp-970306.
+
+-# 1. ifconfig down apparently deletes all relevant routes and flushes
++# 1. /sbin/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.
+@@ -111,16 +111,16 @@
+ 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
++ /sbin/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 \
++ /sbin/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
++ # Add /sbin/route to make broadcast work. Do not omit netmask.
++ /sbin/route add default dev $interface netmask 0.0.0.0
+ else
+- ifconfig $interface 0 up
++ /sbin/ifconfig $interface 0 up
+ fi
+
+ # We need to give the kernel some time to get the interface up.
+@@ -147,36 +147,36 @@
+ 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
++ /sbin/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,
+ # and clear the ARP cache.
+- ifconfig $interface inet 0 down
++ /sbin/ifconfig $interface inet 0 down
+
+ 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 \
++ /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ $new_broadcast_arg
+- # Add a network route to the computed network address.
++ # Add a network /sbin/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
++ /sbin/route add -net $new_network_number $new_subnet_arg dev $interface
+ fi
+ for router in $new_routers; do
+ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+- route add -host $router dev $interface
++ /sbin/route add -host $router dev $interface
+ fi
+- route add default gw $router
++ /sbin/route add default gw $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
++ /sbin/ifconfig $interface:0- inet 0
++ /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
++ /sbin/route add -host $alias_ip_address $interface:0
+ fi
+ make_resolv_conf
+ exit_with_hooks 0
+@@ -186,46 +186,46 @@
+ || [ x$reason = xSTOP ]; then
+ if [ x$alias_ip_address != x ]; then
+ # Turn off alias interface.
+- ifconfig $interface:0- inet 0
++ /sbin/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
++ /sbin/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
++ /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
++ /sbin/route add -host $alias_ip_address $interface:0
+ fi
+ exit_with_hooks 0
+ fi
+
+ if [ x$reason = xTIMEOUT ]; then
+ if [ x$alias_ip_address != x ]; then
+- ifconfig $interface:0- inet 0
++ /sbin/ifconfig $interface:0- inet 0
+ fi
+- ifconfig $interface inet $new_ip_address $new_subnet_arg \
++ /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ $new_broadcast_arg
+ set $new_routers
+ 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
++ /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
++ /sbin/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
++ /sbin/route add -net $new_network_number
+ fi
+ for router in $new_routers; do
+ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+- route add -host $router dev $interface
++ /sbin/route add -host $router dev $interface
+ fi
+- route add default gw $router
++ /sbin/route add default gw $router
+ done
+ make_resolv_conf
+ exit_with_hooks 0
+ fi
+- ifconfig $interface inet 0 down
++ /sbin/ifconfig $interface inet 0 down
+ exit_with_hooks 1
+ fi
+
More information about the arch-commits
mailing list