Version bump to 3.1.2 & 4.1.0 upstream releases, as requested in bug #264809. Create /var/lib/dhclient as per bug #222261. Recursive chown to dhcp:dhcp closes bug #236671. Test config in init-script, apache-style by Arturas from Lithuania in bug #259364. Paranoia/chroot support now upstream in 4.1, dropped patch.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 379 insertions, 0 deletions

diff --git a/net-misc/dhcp/files/dhcp-4.1-dhclient-metric.patch b/net-misc/dhcp/files/dhcp-4.1-dhclient-metric.patch
new file mode 100644
index 000000000000..3556d974864b
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.1-dhclient-metric.patch
@@ -0,0 +1,189 @@
+diff -uNr dhcp-4.1.0.ORIG/client/scripts/bsdos dhcp-4.1.0/client/scripts/bsdos
+--- dhcp-4.1.0.ORIG/client/scripts/bsdos	2009-07-09 15:16:11.000000000 +0100
++++ dhcp-4.1.0/client/scripts/bsdos	2009-07-09 15:17:41.000000000 +0100
+@@ -102,6 +102,9 @@
+ 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
+   eval "ifconfig $interface $medium"
+@@ -163,7 +166,7 @@
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+     eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+     route add $new_ip_address 127.1 >/dev/null 2>&1
+     for router in $new_routers; do
+       route add default $router >/dev/null 2>&1
+@@ -220,7 +223,7 @@
+     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+   fi
+   eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+diff -uNr dhcp-4.1.0.ORIG/client/scripts/freebsd dhcp-4.1.0/client/scripts/freebsd
+--- dhcp-4.1.0.ORIG/client/scripts/freebsd	2009-07-09 15:16:11.000000000 +0100
++++ dhcp-4.1.0/client/scripts/freebsd	2009-07-09 15:17:41.000000000 +0100
+@@ -112,6 +112,9 @@
+ 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
+   eval "ifconfig $interface $medium"
+@@ -173,7 +176,7 @@
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+     eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+     $LOGGER "New IP Address ($interface): $new_ip_address"
+     $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
+     $LOGGER "New Broadcast Address ($interface): $new_broadcast_address"
+@@ -243,7 +246,7 @@
+     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+   fi
+   eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+   $LOGGER "New IP Address ($interface): $new_ip_address"
+   $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
+   $LOGGER "New Broadcast Address ($interface): $new_broadcast_address"
+diff -uNr dhcp-4.1.0.ORIG/client/scripts/linux dhcp-4.1.0/client/scripts/linux
+--- dhcp-4.1.0.ORIG/client/scripts/linux	2009-07-09 15:16:11.000000000 +0100
++++ dhcp-4.1.0/client/scripts/linux	2009-07-09 15:20:50.000000000 +0100
+@@ -104,11 +104,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/'`
+-
+ ###
+ ### DHCPv4 Handlers
+ ###
+@@ -131,6 +126,9 @@
+ 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).
+@@ -142,15 +140,7 @@
+     # 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
+-  fi
++  ifconfig $interface 0 up
+ 
+   # We need to give the kernel some time to get the interface up.
+   sleep 1
+@@ -192,15 +182,17 @@
+     ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ 					$new_broadcast_arg $mtu_arg
+     # 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
++    if [ x$IF_METRIC != x ] && [ x$IF_METRIC != x0 ]; then
++      route del -net $new_network_number $new_subnet_arg \
++        dev $interface
++      route add -net $new_network_number $new_subnet_arg $metric_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
++	route add -host $router $metric_arg dev $interface
+       fi
+-      route add default gw $router
++      route add default gw $router $metric_arg dev $interface
+     done
+   fi
+   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+diff -uNr dhcp-4.1.0.ORIG/client/scripts/netbsd dhcp-4.1.0/client/scripts/netbsd
+--- dhcp-4.1.0.ORIG/client/scripts/netbsd	2009-07-09 15:16:11.000000000 +0100
++++ dhcp-4.1.0/client/scripts/netbsd	2009-07-09 15:17:41.000000000 +0100
+@@ -102,6 +102,9 @@
+ 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
+   eval "ifconfig $interface $medium"
+@@ -163,7 +166,7 @@
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+     eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+     route add $new_ip_address 127.1 >/dev/null 2>&1
+     for router in $new_routers; do
+       route add default $router >/dev/null 2>&1
+@@ -220,7 +223,7 @@
+     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+   fi
+   eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+diff -uNr dhcp-4.1.0.ORIG/client/scripts/solaris dhcp-4.1.0/client/scripts/solaris
+--- dhcp-4.1.0.ORIG/client/scripts/solaris	2009-07-09 15:16:11.000000000 +0100
++++ dhcp-4.1.0/client/scripts/solaris	2009-07-09 15:17:41.000000000 +0100
+@@ -97,6 +97,9 @@
+ 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
+ 
+ ifconfig=/sbin/ifconfig
+ 
+@@ -159,7 +162,7 @@
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+     eval "$ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+     route add $new_ip_address 127.1 1 >/dev/null 2>&1
+     for router in $new_routers; do
+       route add default $router 1 >/dev/null 2>&1
+@@ -200,7 +203,7 @@
+     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+   fi
+   eval "$ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+   sleep 1
+   set $new_routers
+   if ping -s -n -I 1 $1 64 1; then
diff --git a/net-misc/dhcp/files/dhcp-4.1-no_isc_blurb.patch b/net-misc/dhcp/files/dhcp-4.1-no_isc_blurb.patch
new file mode 100644
index 000000000000..1afdf21a934e
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.1-no_isc_blurb.patch
@@ -0,0 +1,96 @@
+diff -uNr dhcp-4.1.0.ORIG/client/dhclient.c dhcp-4.1.0/client/dhclient.c
+--- dhcp-4.1.0.ORIG/client/dhclient.c	2009-07-09 15:29:40.000000000 +0100
++++ dhcp-4.1.0/client/dhclient.c	2009-07-09 15:30:19.000000000 +0100
+@@ -87,6 +87,8 @@
+ 
+ static isc_result_t write_duid(struct data_string *duid);
+ 
++extern int log_isc_blurb;
++
+ int
+ main(int argc, char **argv) {
+ 	int fd;
+@@ -385,6 +387,7 @@
+ 		log_info("%s", "");
+ 	} else {
+ 		log_perror = 0;
++		log_isc_blurb = 0;
+ 		quiet_interface_discovery = 1;
+ 	}
+ 
+diff -uNr dhcp-4.1.0.ORIG/omapip/errwarn.c dhcp-4.1.0/omapip/errwarn.c
+--- dhcp-4.1.0.ORIG/omapip/errwarn.c	2009-07-09 15:29:40.000000000 +0100
++++ dhcp-4.1.0/omapip/errwarn.c	2009-07-09 15:29:52.000000000 +0100
+@@ -43,6 +43,8 @@
+ int log_perror = 1;
+ #endif
+ int log_priority;
++int log_isc_blurb=1;
++
+ void (*log_cleanup) (void);
+ 
+ #define CVT_BUF_MAX 1023
+@@ -74,7 +76,9 @@
+ 	  write (STDERR_FILENO, "\n", 1);
+   }
+ 
+-#if !defined (NOMINUM)
++#if !defined(NOMINUM)
++  if ( log_isc_blurb )
++  {
+   log_error ("%s", "");
+   log_error ("If you did not get this software from ftp.isc.org, please");
+   log_error ("get the latest from ftp.isc.org and install that before");
+@@ -92,7 +96,12 @@
+   log_error ("the README file.");
+   log_error ("%s", "");
+   log_error ("exiting.");
++  }else
++  {
++      log_error ("exiting.");
++  }
+ #endif
++
+   if (log_cleanup)
+ 	  (*log_cleanup) ();
+   exit (1);
+diff -uNr dhcp-4.1.0.ORIG/relay/dhcrelay.c dhcp-4.1.0/relay/dhcrelay.c
+--- dhcp-4.1.0.ORIG/relay/dhcrelay.c	2009-07-09 15:29:40.000000000 +0100
++++ dhcp-4.1.0/relay/dhcrelay.c	2009-07-09 15:31:53.000000000 +0100
+@@ -130,6 +130,7 @@
+ static char arr[] = "All rights reserved.";
+ static char message[] = "Internet Systems Consortium DHCP Relay Agent";
+ static char url[] = "For info, please visit http://www.isc.org/sw/dhcp/";
++extern int log_isc_blurb;
+ 
+ #ifdef DHCPv6
+ #define DHCRELAY_USAGE \
+@@ -219,6 +220,7 @@
+ 		} else if (!strcmp(argv[i], "-q")) {
+ 			quiet = 1;
+ 			quiet_interface_discovery = 1;
++			log_isc_blurb = 0;
+ 		} else if (!strcmp(argv[i], "-p")) {
+ 			if (++i == argc)
+ 				usage();
+diff -uNr dhcp-4.1.0.ORIG/server/dhcpd.c dhcp-4.1.0/server/dhcpd.c
+--- dhcp-4.1.0.ORIG/server/dhcpd.c	2009-07-09 15:29:40.000000000 +0100
++++ dhcp-4.1.0/server/dhcpd.c	2009-07-09 15:29:52.000000000 +0100
+@@ -62,6 +62,9 @@
+ struct iaddr server_identifier;
+ int server_identifier_matched;
+ 
++
++extern int log_isc_blurb;
++
+ #if defined (NSUPDATE)
+ 
+ /* This stuff is always executed to figure the default values for certain
+@@ -367,6 +370,7 @@
+ 			lftest = 1;
+ 			log_perror = -1;
+ 		} else if (!strcmp (argv [i], "-q")) {
++			log_isc_blurb = 0;
+ 			quiet = 1;
+ 			quiet_interface_discovery = 1;
+ #ifdef DHCPv6
diff --git a/net-misc/dhcp/files/dhcpd.init2 b/net-misc/dhcp/files/dhcpd.init2
new file mode 100644
index 000000000000..82cb26e77901
--- /dev/null
+++ b/net-misc/dhcp/files/dhcpd.init2
@@ -0,0 +1,94 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init2,v 1.1 2009/07/09 14:45:22 chainsaw Exp $
+
+opts="configtest"
+
+DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/dhcpd.conf}
+
+depend() {
+	need net
+	use logger dns
+}
+
+get_var() {
+	sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#";]\+\).*/\1/p' \
+		"${DHCPD_CHROOT}/${DHCPD_CONF}"
+}
+
+checkconfig() {
+	/usr/sbin/dhcpd -cf ${DHCPD_CHROOT}/${DHCPD_CONF} -t 1>/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} has detected a syntax error in your configuration files:"
+		/usr/sbin/dhcpd -cf ${DHCPD_CHROOT}/${DHCPD_CONF} -t
+	fi
+
+	return $ret
+}
+
+configtest() {
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $?
+}
+
+start() {
+	# Work out our cffile if it's on our DHCPD_OPTS
+	case " ${DHCPD_OPTS} " in
+		*" -cf "*) 
+			DHCPD_CONF=" ${DHCPD_OPTS} "
+			DHCPD_CONF="${DHCPD_CONF##* -cf }"
+			DHCPD_CONF="${DHCPD_CONF%% *}"
+			;;
+		*)	DHCPD_OPTS="${DHCPD_OPTS} -cf ${DHCPD_CONF}"
+			;;
+	esac
+
+	if [ ! -f "${DHCPD_CHROOT}/${DHCPD_CONF}" ] ; then
+		eerror "${DHCPD_CHROOT}/${DHCPD_CONF} does not exist"
+		return 1
+	fi
+
+	checkconfig || return 1
+
+	local leasefile="$(get_var lease-file-name)"
+	leasefile="${DHCPD_CHROOT}/${leasefile:-/var/lib/dhcp/dhcpd.leases}"
+	if [ ! -f "${leasefile}" ] ; then
+		ebegin "Creating ${leasefile}"
+		touch "${leasefile}"
+		chown dhcp:dhcp "${leasefile}"
+		eend $? || return 1
+	fi
+
+	# Setup LD_PRELOAD so name resolution works in our chroot.
+	if [ -n "${DHCPD_CHROOT}" ] ; then
+	    LD_PRELOAD="${LD_PRELOAD} /usr/lib/libresolv.so"
+	    export LD_PRELOAD="${LD_PRELOAD} /usr/lib/libnss_dns.so"
+	fi
+
+	local pidfile="$(get_var pid-file-name)"
+	pidfile="${pidfile:-/var/run/dhcp/dhcpd.pid}"
+
+	ebegin "Starting ${DHCPD_CHROOT:+chrooted }${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/dhcpd \
+		--pidfile "${DHCPD_CHROOT}/${pidfile}" \
+		-- ${DHCPD_OPTS} -q -pf "${pidfile}" \
+		-user dhcp -group dhcp \
+		${DHCPD_CHROOT:+-chroot} ${DHCPD_CHROOT} ${DHCPD_IFACE}
+	eend $? \
+	    && save_options chroot "${DHCPD_CHROOT}" \
+	    && save_options pidfile "${pidfile}"
+}
+
+stop() {
+	local chroot="$(get_options chroot)"
+	
+	checkconfig || return 1
+
+	ebegin "Stopping ${chroot:+chrooted }${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/sbin/dhcpd \
+	    --pidfile "${chroot}/$(get_options pidfile)"
+	eend $?
+}