[arch-commits] Commit in dhcp/trunk (5 files)
Jan de Groot
jgc at nymeria.archlinux.org
Tue Mar 19 15:21:05 UTC 2013
Date: Tuesday, March 19, 2013 @ 16:21:04
Author: jgc
Revision: 180278
upgpkg: dhcp 4.2.5-1
Update to 4.2.5
Exchange ipv6 patch with 4.2.5 patch from LFS
Patch dhclient-script with patch from LFS, with some modifications, removes need for net-tools (FS#31289)
Move dhclient.conf.example to /usr/share/dhclient (FS#34366)
Provide dhcp-client (FS#33119)
Remove openssl dependency, not used
Added:
dhcp/trunk/dhcp-4.2.5-client_script-1.patch
dhcp/trunk/dhcp-4.2.5-missing_ipv6-1.patch
Modified:
dhcp/trunk/PKGBUILD
Deleted:
dhcp/trunk/dhclient-script-pathFixes.patch
dhcp/trunk/dhcp-4.1.1-missing-ipv6-not-fatal.patch
-----------------------------------------+
PKGBUILD | 36 -
dhclient-script-pathFixes.patch | 136 ------
dhcp-4.1.1-missing-ipv6-not-fatal.patch | 39 -
dhcp-4.2.5-client_script-1.patch | 648 ++++++++++++++++++++++++++++++
dhcp-4.2.5-missing_ipv6-1.patch | 48 ++
5 files changed, 715 insertions(+), 192 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-19 14:25:54 UTC (rev 180277)
+++ PKGBUILD 2013-03-19 15:21:04 UTC (rev 180278)
@@ -5,27 +5,26 @@
pkgname=('dhcp' 'dhclient')
# separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.4.2
-_pkgver=4.2.4-P2
-
+pkgver=4.2.5
+_pkgver=4.2.5
pkgrel=1
arch=('i686' 'x86_64')
license=('custom:isc-dhcp')
url="https://www.isc.org/software/dhcp"
-makedepends=('bash' 'iproute2' 'net-tools')
+makedepends=('bash' 'iproute2')
source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
- dhcp-4.1.1-missing-ipv6-not-fatal.patch
- dhclient-script-pathFixes.patch)
-md5sums=('fe36056f2d274fa4b82a5422f192e65f'
- '1f20126efd33c34d52a4148db780921f'
+ dhcp-4.2.5-client_script-1.patch
+ dhcp-4.2.5-missing_ipv6-1.patch)
+md5sums=('6489e919ac093d17249270ee9be1020e'
+ '022bc7038b3061cfb31da4736e7ab8a8'
'c49b1497837ba56c54e401a66e1bab9b'
'12c2f3ae47ed23eb698eb7f1bfd80f20'
'8f357e46e1efcbb746f38737a3f977a2'
'439ee2f145a1e86dd644cb94a854f8e7'
'588aa85b6fe228c45623185a58d11992'
- 'fd64aeb4f399dcc41ea43089a3811094'
- '541b415a25a169eaf64b681405f79a80')
+ '9e4dcf90beec15bfcb6631809cdcc780'
+ 'da655f02f1cf4d95b4708e84e69edbc8')
build() {
cd "${srcdir}/${pkgbase}-${_pkgver}"
@@ -34,7 +33,9 @@
sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure
# Make not having ipv6 non-fatal.
- patch -Np0 -i "${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch"
+ patch -Np1 -i ../dhcp-4.2.5-missing_ipv6-1.patch
+ # Make dhcp client script suck less.
+ patch -Np1 -i ../dhcp-4.2.5-client_script-1.patch
./configure --prefix=/usr --sysconfdir=/etc \
--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
@@ -43,13 +44,10 @@
--with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases
make
-
- patch -i "${srcdir}/dhclient-script-pathFixes.patch" client/scripts/linux
}
package_dhcp(){
pkgdesc="A DHCP server, client, and relay agent"
- depends=('openssl>=0.9.8a')
backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
install=dhcp.install
@@ -64,6 +62,9 @@
install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service"
install -D -m644 "${srcdir}/dhcpd6.service" "${pkgdir}/usr/lib/systemd/system/dhcpd6.service"
+ # move back to config. This file is in backup array, so pacman will not overwrite a changed config.
+ mv "${pkgdir}/etc/dhcpd.conf.example" "${pkgdir}/etc/dhcpd.conf"
+
# Remove dhclient
make -C client DESTDIR="${pkgdir}" uninstall
@@ -73,13 +74,14 @@
package_dhclient(){
pkgdesc="A standalone DHCP client from the dhcp package"
- depends=('bash' 'iproute2' 'net-tools')
+ depends=('bash' 'iproute2')
+ provides=('dhcp-client')
cd "${srcdir}/${pkgbase}-${_pkgver}"
make -C client DESTDIR="${pkgdir}" install
- # move dhclient.conf to dhclient.conf.example
- mv "${pkgdir}"/etc/dhclient.conf{,.example}
+ install -m755 -d "${pkgdir}/usr/share/dhclient"
+ mv "${pkgdir}/etc/dhclient.conf.example" "${pkgdir}/usr/share/dhclient/"
install -d "${pkgdir}/var/lib/dhclient"
Deleted: dhclient-script-pathFixes.patch
===================================================================
--- dhclient-script-pathFixes.patch 2013-03-19 14:25:54 UTC (rev 180277)
+++ dhclient-script-pathFixes.patch 2013-03-19 15:21:04 UTC (rev 180278)
@@ -1,136 +0,0 @@
---- linux 2011-05-18 20:01:54.000000000 +0000
-+++ linux_new 2011-12-21 18:45:41.487171012 +0000
-@@ -23,7 +23,7 @@
- # of the $1 in its args.
-
- # 'ip' just looks too weird. /sbin/ip looks less weird.
--ip=/sbin/ip
-+ip=/usr/sbin/ip
-
- make_resolv_conf() {
- if [ x"$new_domain_name_servers" != x ]; then
-@@ -122,9 +122,9 @@
- 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
-- ifconfig $interface 0 up
-+ /sbin/ifconfig $interface 0 up
-
- # We need to give the kernel some time to get the interface up.
- sleep 1
-@@ -151,25 +151,25 @@
- 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 $mtu_arg
- # Add a network route to the computed network address.
- 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 $metric_arg dev $interface
-+ /sbin/route add default gw $router $metric_arg dev $interface
- done
- else
- # we haven't changed the address, have we changed other options
-@@ -177,21 +177,21 @@
- if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
- # if we've changed routers delete the old and add the new.
- for router in $old_routers; do
-- route del default gw $router
-+ /sbin/route del default gw $router
- done
- 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 $metric_arg dev $interface
-+ /sbin/route add default gw $router $metric_arg dev $interface
- done
- fi
- 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
-@@ -201,42 +201,42 @@
- || [ 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 $mtu_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
- 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 $metric_arg dev $interface
-+ /sbin/route add default gw $router $metric_arg dev $interface
- 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
-
Deleted: dhcp-4.1.1-missing-ipv6-not-fatal.patch
===================================================================
--- dhcp-4.1.1-missing-ipv6-not-fatal.patch 2013-03-19 14:25:54 UTC (rev 180277)
+++ dhcp-4.1.1-missing-ipv6-not-fatal.patch 2013-03-19 15:21:04 UTC (rev 180278)
@@ -1,39 +0,0 @@
---- common/discover.c 2009-09-29 21:44:49.000000000 +0200
-+++ common/discover.c_new 2010-06-30 19:40:02.000000000 +0200
-@@ -443,7 +443,7 @@
- }
-
- #ifdef DHCPv6
-- if (local_family == AF_INET6) {
-+ if ((local_family == AF_INET6) && !access("/proc/net/if_inet6", R_OK)) {
- ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
- if (ifaces->fp6 == NULL) {
- log_error("Error opening '/proc/net/if_inet6' to "
-@@ -454,6 +454,8 @@
- ifaces->fp = NULL;
- return 0;
- }
-+ } else {
-+ ifaces->fp6 = NULL;
- }
- #endif
-
-@@ -721,7 +723,7 @@
- return 1;
- }
- #ifdef DHCPv6
-- if (!(*err)) {
-+ if (!(*err) && ifaces->fp6) {
- if (local_family == AF_INET6)
- return next_iface6(info, err, ifaces);
- }
-@@ -740,7 +742,8 @@
- ifaces->sock = -1;
- #ifdef DHCPv6
- if (local_family == AF_INET6) {
-- fclose(ifaces->fp6);
-+ if(ifaces->fp6)
-+ fclose(ifaces->fp6);
- ifaces->fp6 = NULL;
- }
- #endif
Added: dhcp-4.2.5-client_script-1.patch
===================================================================
--- dhcp-4.2.5-client_script-1.patch (rev 0)
+++ dhcp-4.2.5-client_script-1.patch 2013-03-19 15:21:04 UTC (rev 180278)
@@ -0,0 +1,648 @@
+Submitted By: Armin K. <krejzi at email dot com>
+Date: 2012-08-14
+Initial Package Version: 4.2.4-P1
+Upstream Status: Rejected by upstream.
+Origin: Based on Debian's dhclient-script, but modified for BLFS
+Description: This patch replaces original linux script for dhcp client with
+ better one which is based on Debian's dhclient-script, but modified
+ to be used on LFS/BLFS. It also removes net-tools dependency.
+ Modified for archlinux: restored exit/enter hooks path.
+
+--- dhcp.orig/client/scripts/linux 2012-07-13 08:10:30.000000000 +0200
++++ dhcp/client/scripts/linux 2012-08-14 21:00:29.786634932 +0200
+@@ -1,318 +1,346 @@
+ #!/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.
+-
+-# 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.
++# Modified for Debian. Matt Zimmerman and Eloy Paris, December 2003
++# Modified to remove useless tests for antiquated kernel versions that
++# this doesn't even work with anyway, and introduces a dependency on /usr
++# being mounted, which causes cosmetic errors on hosts that NFS mount /usr
++# Andrew Pollock, February 2005
++# Modified to work on point-to-point links. Andrew Pollock, June 2005
++# Modified to support passing the parameters called with to the hooks. Andrew Pollock, November 2005
++# Modified to use the script with Linux From Scratch by Armin K., May 2012
+
+-# 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.
+-
+-# 'ip' just looks too weird. /sbin/ip looks less weird.
+-ip=/sbin/ip
++# The alias handling in here probably still sucks. -mdz
+
++# update /etc/resolv.conf based on received values
+ make_resolv_conf() {
+- if [ x"$new_domain_name_servers" != x ]; then
+- cat /dev/null > /etc/resolv.conf.dhclient
+- chmod 644 /etc/resolv.conf.dhclient
+- if [ x"$new_domain_search" != x ]; then
+- echo search $new_domain_search >> /etc/resolv.conf.dhclient
+- elif [ x"$new_domain_name" != x ]; then
+- # Note that the DHCP 'Domain Name Option' is really just a domain
+- # name, and that this practice of using the domain name option as
+- # a search path is both nonstandard and deprecated.
+- echo search $new_domain_name >> /etc/resolv.conf.dhclient
+- fi
+- for nameserver in $new_domain_name_servers; do
+- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
+- done
+-
+- mv /etc/resolv.conf.dhclient /etc/resolv.conf
+- elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+- cat /dev/null > /etc/resolv.conf.dhclient6
+- chmod 644 /etc/resolv.conf.dhclient6
++ local new_resolv_conf
+
+- if [ "x${new_dhcp6_domain_search}" != x ] ; then
+- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++ # DHCPv4
++ if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
++ [ -n "$new_domain_name_servers" ]; then
++ new_resolv_conf=/etc/resolv.conf.dhclient-new
++ rm -f $new_resolv_conf
++
++ if [ -n "$new_domain_name" ]; then
++ echo domain ${new_domain_name%% *} >>$new_resolv_conf
++ fi
++
++ if [ -n "$new_domain_search" ]; then
++ if [ -n "$new_domain_name" ]; then
++ domain_in_search_list=""
++ for domain in $new_domain_search; do
++ if [ "$domain" = "${new_domain_name}" ] ||
++ [ "$domain" = "${new_domain_name}." ]; then
++ domain_in_search_list="Yes"
++ fi
++ done
++ if [ -z "$domain_in_search_list" ]; then
++ new_domain_search="$new_domain_name $new_domain_search"
++ fi
++ fi
++ echo "search ${new_domain_search}" >> $new_resolv_conf
++ elif [ -n "$new_domain_name" ]; then
++ echo "search ${new_domain_name}" >> $new_resolv_conf
++ fi
++
++ if [ -n "$new_domain_name_servers" ]; then
++ for nameserver in $new_domain_name_servers; do
++ echo nameserver $nameserver >>$new_resolv_conf
++ done
++ else # keep 'old' nameservers
++ sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf >>$new_resolv_conf
++ fi
++
++ chown --reference=/etc/resolv.conf $new_resolv_conf
++ chmod --reference=/etc/resolv.conf $new_resolv_conf
++ mv -f $new_resolv_conf /etc/resolv.conf
++ # DHCPv6
++ elif [ -n "$new_dhcp6_domain_search" ] || [ -n "$new_dhcp6_name_servers" ]; then
++ new_resolv_conf=/etc/resolv.conf.dhclient-new
++ rm -f $new_resolv_conf
++
++ if [ -n "$new_dhcp6_domain_search" ]; then
++ echo "search ${new_dhcp6_domain_search}" >> $new_resolv_conf
++ fi
++
++ if [ -n "$new_dhcp6_name_servers" ]; then
++ for nameserver in $new_dhcp6_name_servers; do
++ # append %interface to link-local-address nameservers
++ if [ "${nameserver##fe80::}" != "$nameserver" ] ||
++ [ "${nameserver##FE80::}" != "$nameserver" ]; then
++ nameserver="${nameserver}%${interface}"
++ fi
++ echo nameserver $nameserver >>$new_resolv_conf
++ done
++ else # keep 'old' nameservers
++ sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf >>$new_resolv_conf
++ fi
++
++ chown --reference=/etc/resolv.conf $new_resolv_conf
++ chmod --reference=/etc/resolv.conf $new_resolv_conf
++ mv -f $new_resolv_conf /etc/resolv.conf
+ fi
+- shopt -s nocasematch
+- for nameserver in ${new_dhcp6_name_servers} ; do
+- # If the nameserver has a link-local address
+- # add a <zone_id> (interface name) to it.
+- if [[ "$nameserver" =~ ^fe80:: ]]
+- then
+- zone_id="%$interface"
+- else
+- zone_id=
+- fi
+- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
+- done
+- shopt -u nocasematch
++}
+
+- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+- fi
++# set host name
++set_hostname() {
++ local current_hostname
++
++ if [ -n "$new_host_name" ]; then
++ current_hostname=$(hostname)
++
++ # current host name is empty, '(none)' or 'localhost' or differs from new one from DHCP
++ if [ -z "$current_hostname" ] ||
++ [ "$current_hostname" = '(none)' ] ||
++ [ "$current_hostname" = 'localhost' ] ||
++ [ "$current_hostname" = "$old_host_name" ]; then
++ if [ "$new_host_name" != "$old_host_name" ]; then
++ hostname "$new_host_name"
++ fi
++ fi
++ fi
+ }
+
+-# Must be used on exit. Invokes the local dhcp client exit hooks, if any.
++# Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+ exit_with_hooks() {
+ exit_status=$1
+- if [ -f /etc/dhclient-exit-hooks ]; then
+- . /etc/dhclient-exit-hooks
++ if [ -f /etc/dhclient-exit-hooks ]; then
++ . /etc/dhclient-exit-hooks
+ fi
+-# probably should do something with exit status of the local script
+ exit $exit_status
+ }
+
++# The 576 MTU is only used for X.25 and dialup connections
++# where the admin wants low latency. Such a low MTU can cause
++# problems with UDP traffic, among other things. As such,
++# disallow MTUs from 576 and below by default, so that broken
++# MTUs are ignored, but higher stuff is allowed (1492, 1500, etc).
++if [ -z "$new_interface_mtu" ] || [ "$new_interface_mtu" -le 576 ]; then
++ new_interface_mtu=''
++fi
++
++# The action starts here
++
+ # Invoke the local dhcp client enter hooks, if they exist.
+-if [ -f /etc/dhclient-enter-hooks ]; then
++if [ -f /etc/dhclient-enter-hooks ]; then
+ exit_status=0
+- . /etc/dhclient-enter-hooks
+- # allow the local script to abort processing of this state
+- # local script must set exit_status variable to nonzero.
++ . /etc/dhclient-enter-hooks
+ if [ $exit_status -ne 0 ]; then
+ exit $exit_status
+ fi
+ fi
+
+-###
+-### DHCPv4 Handlers
+-###
+-
+-if [ x$new_broadcast_address != x ]; then
+- new_broadcast_arg="broadcast $new_broadcast_address"
+-fi
+-if [ x$old_broadcast_address != x ]; then
+- old_broadcast_arg="broadcast $old_broadcast_address"
+-fi
+-if [ x$new_subnet_mask != x ]; then
+- new_subnet_arg="netmask $new_subnet_mask"
+-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"
+-fi
+-if [ x$new_interface_mtu != x ]; then
+- mtu_arg="mtu $new_interface_mtu"
+-fi
+-if [ x$IF_METRIC != x ]; then
+- metric_arg="metric $IF_METRIC"
+-fi
+-
+-if [ x$reason = xMEDIUM ]; then
+- # Linux doesn't do mediums (ok, ok, media).
+- exit_with_hooks 0
+-fi
+-
+-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
+- ifconfig $interface 0 up
+-
+- # We need to give the kernel some time to get the interface up.
+- sleep 1
+-
+- exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
+- exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
+- [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
+- current_hostname=`hostname`
+- if [ x$current_hostname = x ] || \
+- [ x$current_hostname = "x(none)" ] || \
+- [ x$current_hostname = xlocalhost ] || \
+- [ x$current_hostname = x$old_host_name ]; then
+- if [ x$new_host_name != x$old_host_name ]; then
+- hostname "$new_host_name"
+- 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,
+- # and clear the ARP cache.
+- ifconfig $interface inet 0 down
++# Execute the operation
++case "$reason" in
+
+- fi
+- if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+- [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
++ ### DHCPv4 Handlers
+
+- ifconfig $interface inet $new_ip_address $new_subnet_arg \
+- $new_broadcast_arg $mtu_arg
+- # Add a network route to the computed network address.
+- for router in $new_routers; do
+- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+- route add -host $router dev $interface
+- fi
+- route add default gw $router $metric_arg dev $interface
+- done
+- else
+- # we haven't changed the address, have we changed other options
+- # that we wish to update?
+- if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
+- # if we've changed routers delete the old and add the new.
+- for router in $old_routers; do
+- route del default gw $router
+- done
+- for router in $new_routers; do
+- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+- route add -host $router dev $interface
+- fi
+- route add default gw $router $metric_arg dev $interface
+- done
+- fi
+- 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
++ MEDIUM|ARPCHECK|ARPSEND)
++ # Do nothing
++ ;;
++ PREINIT)
++ # The DHCP client is requesting that an interface be
++ # configured as required in order to send packets prior to
++ # receiving an actual address. - dhclient-script(8)
++
++ # ensure interface is up
++ ip link set dev ${interface} up
++
++ if [ -n "$alias_ip_address" ]; then
++ # flush alias IP from interface
++ ip -4 addr flush dev ${interface} label ${interface}:0
++ fi
++
++ ;;
++
++ BOUND|RENEW|REBIND|REBOOT)
++ set_hostname
++
++ if [ -n "$old_ip_address" ] && [ -n "$alias_ip_address" ] &&
++ [ "$alias_ip_address" != "$old_ip_address" ]; then
++ # alias IP may have changed => flush it
++ ip -4 addr flush dev ${interface} label ${interface}:0
++ fi
++
++ if [ -n "$old_ip_address" ] &&
++ [ "$old_ip_address" != "$new_ip_address" ]; then
++ # leased IP has changed => flush it
++ ip -4 addr flush dev ${interface} label ${interface}
++ fi
++
++ if [ -z "$old_ip_address" ] ||
++ [ "$old_ip_address" != "$new_ip_address" ] ||
++ [ "$reason" = "BOUND" ] || [ "$reason" = "REBOOT" ]; then
++ # new IP has been leased or leased IP changed => set it
++ ip -4 addr add ${new_ip_address}${new_subnet_mask:+/$new_subnet_mask} \
++ ${new_broadcast_address:+broadcast $new_broadcast_address} \
++ dev ${interface} label ${interface}
++
++ if [ -n "$new_interface_mtu" ]; then
++ # set MTU
++ ip link set dev ${interface} mtu ${new_interface_mtu}
++ fi
++
++ # set if_metric if IF_METRIC is set or there's more than one router
++ if_metric="$IF_METRIC"
++ if [ "${new_routers%% *}" != "${new_routers}" ]; then
++ if_metric=${if_metric:-1}
++ fi
++
++ for router in $new_routers; do
++ if [ "$new_subnet_mask" = "255.255.255.255" ]; then
++ # point-to-point connection => set explicit route
++ ip -4 route add ${router} dev $interface >/dev/null 2>&1
++ fi
++
++ # set default route
++ ip -4 route add default via ${router} dev ${interface} \
++ ${if_metric:+metric $if_metric} >/dev/null 2>&1
++
++ if [ -n "$if_metric" ]; then
++ if_metric=$((if_metric+1))
++ fi
++ done
++ fi
++
++ if [ -n "$alias_ip_address" ] &&
++ [ "$new_ip_address" != "$alias_ip_address" ]; then
++ # separate alias IP given, which may have changed
++ # => flush it, set it & add host route to it
++ ip -4 addr flush dev ${interface} label ${interface}:0
++ ip -4 addr add ${alias_ip_address}${alias_subnet_mask:+/$alias_subnet_mask} \
++ dev ${interface} label ${interface}:0
++ ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
++ fi
++
++ # update /etc/resolv.conf
++ make_resolv_conf
++
++ ;;
++
++ EXPIRE|FAIL|RELEASE|STOP)
++ if [ -n "$alias_ip_address" ]; then
++ # flush alias IP
++ ip -4 addr flush dev ${interface} label ${interface}:0
++ fi
++
++ if [ -n "$old_ip_address" ]; then
++ # flush leased IP
++ ip -4 addr flush dev ${interface} label ${interface}
++ fi
++
++ if [ -n "$alias_ip_address" ]; then
++ # alias IP given => set it & add host route to it
++ ip -4 addr add ${alias_ip_address}${alias_network_arg} \
++ dev ${interface} label ${interface}:0
++ ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
++ fi
++
++ ;;
++
++ TIMEOUT)
++ if [ -n "$alias_ip_address" ]; then
++ # flush alias IP
++ ip -4 addr flush dev ${interface} label ${interface}:0
++ fi
++
++ # set IP from recorded lease
++ ip -4 addr add ${new_ip_address}${new_subnet_mask:+/$new_subnet_mask} \
++ ${new_broadcast_address:+broadcast $new_broadcast_address} \
++ dev ${interface} label ${interface}
++
++ if [ -n "$new_interface_mtu" ]; then
++ # set MTU
++ ip link set dev ${interface} mtu ${new_interface_mtu}
++ fi
++
++ # if there is no router recorded in the lease or the 1st router answers pings
++ if [ -z "$new_routers" ] || ping -q -c 1 "${new_routers%% *}"; then
++ if [ -n "$alias_ip_address" ] &&
++ [ "$new_ip_address" != "$alias_ip_address" ]; then
++ # separate alias IP given => set up the alias IP & add host route to it
++ ip -4 addr add ${alias_ip_address}${alias_subnet_mask:+/$alias_subnet_mask} \
++ dev ${interface} label ${interface}:0
++ ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
++ fi
++
++ # set if_metric if IF_METRIC is set or there's more than one router
++ if_metric="$IF_METRIC"
++ if [ "${new_routers%% *}" != "${new_routers}" ]; then
++ if_metric=${if_metric:-1}
++ fi
++
++ # set default route
++ for router in $new_routers; do
++ ip -4 route add default via ${router} dev ${interface} \
++ ${if_metric:+metric $if_metric} >/dev/null 2>&1
++
++ if [ -n "$if_metric" ]; then
++ if_metric=$((if_metric+1))
++ fi
++ done
++
++ # update /etc/resolv.conf
++ make_resolv_conf
++ else
++ # flush all IPs from interface
++ ip -4 addr flush dev ${interface}
++ exit_with_hooks 1
++ fi
++
++ ;;
++
++ ### DHCPv6 Handlers
++ # TODO handle prefix change: ?based on ${old_ip6_prefix} and ${new_ip6_prefix}?
++
++ PREINIT6)
++ # ensure interface is up
++ ip link set ${interface} up
++
++ # flush any stale global permanent IPs from interface
++ ip -6 addr flush dev ${interface} scope global permanent
++
++ ;;
++
++ BOUND6|RENEW6|REBIND6)
++ if [ "${new_ip6_address}" ] && [ "${new_ip6_prefixlen}" ]; then
++ # set leased IP
++ ip -6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
++ dev ${interface} scope global
++ fi
++
++ # update /etc/resolv.conf
++ if [ "${reason}" = BOUND6 ] ||
++ [ "${new_dhcp6_name_servers}" != "${old_dhcp6_name_servers}" ] ||
++ [ "${new_dhcp6_domain_search}" != "${old_dhcp6_domain_search}" ]; then
++ make_resolv_conf
++ fi
++
++ ;;
++
++ DEPREF6)
++ if [ -z "${cur_ip6_prefixlen}" ]; then
++ exit_with_hooks 1
++ fi
++
++ # set preferred lifetime of leased IP to 0
++ ip -6 addr change ${cur_ip6_address}/${cur_ip6_prefixlen} \
++ dev ${interface} scope global preferred_lft 0
++
++ ;;
++
++ EXPIRE6|RELEASE6|STOP6)
++ if [ -z "${old_ip6_address}" ] || [ -z "${old_ip6_prefixlen}" ]; then
++ exit_with_hooks 1
++ fi
++
++ # delete leased IP
++ ip -6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \
++ dev ${interface}
+
+-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
+- 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 $mtu_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
+- fi
+- for router in $new_routers; do
+- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+- route add -host $router dev $interface
+- fi
+- route add default gw $router $metric_arg dev $interface
+- done
+- make_resolv_conf
+- exit_with_hooks 0
+- fi
+- ifconfig $interface inet 0 down
+- exit_with_hooks 1
+-fi
+-
+-###
+-### DHCPv6 Handlers
+-###
+-
+-if [ x$reason = xPREINIT6 ] ; then
+- # Ensure interface is up.
+- ${ip} link set ${interface} up
+-
+- # Remove any stale addresses from aborted clients.
+- ${ip} -f inet6 addr flush dev ${interface} scope global permanent
+-
+- exit_with_hooks 0
+-fi
+-
+-if [ x${old_ip6_prefix} != x ] || [ x${new_ip6_prefix} != x ] ; then
+- echo Prefix ${reason} old=${old_ip6_prefix} new=${new_ip6_prefix}
+-
+- exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xBOUND6 ] ; then
+- if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
+- exit_with_hooks 2;
+- fi
+-
+- ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+- dev ${interface} scope global
+-
+- # Check for nameserver options.
+- make_resolv_conf
+-
+- exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ] ; then
+- if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
+- exit_with_hooks 2;
+- fi
+-
+- ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+- dev ${interface} scope global
+-
+- # Make sure nothing has moved around on us.
+-
+- # Nameservers/domains/etc.
+- if [ "x${new_dhcp6_name_servers}" != "x${old_dhcp6_name_servers}" ] ||
+- [ "x${new_dhcp6_domain_search}" != "x${old_dhcp6_domain_search}" ] ; then
+- make_resolv_conf
+- fi
+-
+- exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xDEPREF6 ] ; then
+- if [ x${new_ip6_prefixlen} = x ] ; then
+- exit_with_hooks 2;
+- fi
+-
+- ${ip} -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \
+- dev ${interface} scope global preferred_lft 0
+-
+- exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xEXPIRE6 -o x$reason = xRELEASE6 -o x$reason = xSTOP6 ] ; then
+- if [ x${old_ip6_address} = x ] || [ x${old_ip6_prefixlen} = x ] ; then
+- exit_with_hooks 2;
+- fi
+-
+- ${ip} -f inet6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \
+- dev ${interface}
+-
+- exit_with_hooks 0
+-fi
++ ;;
++esac
+
+ exit_with_hooks 0
Added: dhcp-4.2.5-missing_ipv6-1.patch
===================================================================
--- dhcp-4.2.5-missing_ipv6-1.patch (rev 0)
+++ dhcp-4.2.5-missing_ipv6-1.patch 2013-03-19 15:21:04 UTC (rev 180278)
@@ -0,0 +1,48 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2011-11-23
+Initial Package Version: 4.2.2
+Upstream Status: unknown
+Origin: found at fedora
+Description: Allow dhcp4 to work even if the kernel doesn't support ipv6.
+Fixed up by hand to apply to 4.2.2 (to me, it looks identical to the 4.2.0
+version, but patch failed in one hunk when I tried to apply that one).
+
+--- dhcp-4.2.2/common/discover.c.orig 2011-07-19 23:22:48.000000000 +0100
++++ dhcp-4.2.2/common/discover.c 2011-09-06 01:28:15.000000000 +0100
+@@ -455,7 +455,7 @@
+ }
+
+ #ifdef DHCPv6
+- if (local_family == AF_INET6) {
++ if ((local_family == AF_INET6) && !access("/proc/net/if_inet6", R_OK)) {
+ ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
+ if (ifaces->fp6 == NULL) {
+ log_error("Error opening '/proc/net/if_inet6' to "
+@@ -466,6 +466,8 @@
+ ifaces->fp = NULL;
+ return 0;
+ }
++ } else {
++ ifaces->fp6 = NULL;
+ }
+ #endif
+
+@@ -733,7 +735,7 @@
+ return 1;
+ }
+ #ifdef DHCPv6
+- if (!(*err)) {
++ if (!(*err) && ifaces->fp6) {
+ if (local_family == AF_INET6)
+ return next_iface6(info, err, ifaces);
+ }
+@@ -752,7 +754,8 @@
+ ifaces->sock = -1;
+ #ifdef DHCPv6
+ if (local_family == AF_INET6) {
+- fclose(ifaces->fp6);
++ if (ifaces->fp6)
++ fclose(ifaces->fp6);
+ ifaces->fp6 = NULL;
+ }
+ #endif
More information about the arch-commits
mailing list