Split patches out into FILESDIR.

  Stop installing dhclient-script.sample as baselayout has its own.
  chroot creation no longer assumes a default directory.
  We copy resolv.conf and localtime as a real files into the chroot now.
  document resolv.conf in conf.d/dhcp for chroots, #113869.
  init script now parses dhcpd.conf for pidfile and leasefile locations, #89428.
  libdst.a gets installed now, #75544.

(Portage version: 2.0.53)

10 files changed, 332 insertions, 14 deletions

diff --git a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch b/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
new file mode 100644
index 000000000000..13debb20ed0e
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
@@ -0,0 +1,15 @@
+--- server/dhcpd.c	2003-11-05 14:08:09.000000000 -0800
++++ server/dhcpd.c	2003-11-05 14:15:32.000000000 -0800
+@@ -602,6 +602,12 @@
+ 	if (lftest)
+ 		exit (0);
+ 
++#if defined (PARANOIA)
++	/* Set proper permissions... */
++	if (lchown (path_dhcpd_db, set_uid, set_gid))
++		log_fatal ("lchown(%s, %d, %d): %m", path_dhcpd_db, (int) set_uid, (int) set_gid);
++#endif /* PARANOIA */
++
+ 	/* Discover all the network interfaces and initialize them. */
+ 	discover_interfaces (DISCOVER_SERVER);
+ 
diff --git a/net-misc/dhcp/files/dhcp-3.0-paranoia.patch b/net-misc/dhcp/files/dhcp-3.0-paranoia.patch
new file mode 100644
index 000000000000..886f5cb5ffe3
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0-paranoia.patch
@@ -0,0 +1,207 @@
+
+paranoia (non-root/chroot) patch for ISC dhcp 3.0
+file to patch: dhcp-3.0/server/dhcpd.c
+
+update from paranoia patch for ISC dhcp 2.0
+
+Adds 3 options:
+
+	-user <user>
+	-group <group>
+	-chroot <chroot_dir>
+
+Notes:
+	-DPARANOIA must be passed as an argument to the --copts option
+	of configure.  Otherwise, the paranoia code will not be compiled
+	in.  Example:  ./configure --copts -DPARANOIA
+
+	The chroot() call has been delayed in order to allow /dev/log to
+	be reopened after the configuration file has been read.  This is
+	beneficial for systems on which /dev/log is a unix domain socket.
+	The main side effect is that dhcpd.conf should be placed in /etc,
+	instead of <chroot_dir>/etc.
+
+	If dhcpd is to be run on a sysV-style architecture (or, more
+	generally, if /dev/log is a character device), one may opt to
+	create the <chroot_dir>/dev/log character device and add
+	-DEARLY_CHROOT to the --copts option of configure (in addition to
+	-DPARANOIA).  This will perform the chroot() call at the earliest
+	convenience (before reading the configuration file).
+
+	If the -user option is used, the lease and pid file directories
+	should be writable to the server process after it drops
+	privileges.
+
+
+ari edelkind (12/10/2001)
+last modified 12/10/2001
+
+
+--- dhcp-3.0/server/dhcpd.c	Thu Jun 21 22:12:58 2001
++++ dhcp-3.0+paranoia/server/dhcpd.c	Wed Oct 17 08:23:00 2001
+@@ -56,6 +56,16 @@
+ #include "version.h"
+ #include <omapip/omapip_p.h>
+ 
++#if defined (PARANOIA)
++#  include <sys/types.h>
++#  include <unistd.h>
++#  include <pwd.h>
++/* get around the ISC declaration of group */
++#  define group real_group 
++#    include <grp.h>
++#  undef group
++#endif /* PARANOIA */
++
+ static void usage PROTO ((void));
+ 
+ TIME cur_time;
+@@ -204,6 +214,22 @@
+ 	omapi_object_dereference (&listener, MDL);
+ }
+ 
++#if defined (PARANOIA)
++/* to be used in one of two possible scenarios */
++static void setup_chroot (char *chroot_dir) {
++	if (geteuid())
++		log_fatal ("you must be root to use chroot");
++
++	if (chroot(chroot_dir)) {
++		log_fatal ("chroot(\"%s\"): %m", chroot_dir);
++	}
++	if (chdir ("/")) {
++		/* probably permission denied */
++		log_fatal ("chdir(\"/\"): %m");
++	}
++}
++#endif /* PARANOIA */
++
+ int main (argc, argv, envp)
+ 	int argc;
+ 	char **argv, **envp;
+@@ -236,6 +262,14 @@
+ 	char *traceinfile = (char *)0;
+ 	char *traceoutfile = (char *)0;
+ #endif
++#if defined (PARANOIA)
++	char *set_user   = 0;
++	char *set_group  = 0;
++	char *set_chroot = 0;
++
++	uid_t set_uid = 0;
++	gid_t set_gid = 0;
++#endif /* PARANOIA */
+ 
+ 	/* Make sure we have stdin, stdout and stderr. */
+ 	status = open ("/dev/null", O_RDWR);
+@@ -298,6 +332,20 @@
+ 			if (++i == argc)
+ 				usage ();
+ 			server = argv [i];
++#if defined (PARANOIA)
++		} else if (!strcmp (argv [i], "-user")) {
++			if (++i == argc)
++				usage ();
++			set_user = argv [i];
++		} else if (!strcmp (argv [i], "-group")) {
++			if (++i == argc)
++				usage ();
++			set_group = argv [i];
++		} else if (!strcmp (argv [i], "-chroot")) {
++			if (++i == argc)
++				usage ();
++			set_chroot = argv [i];
++#endif /* PARANOIA */
+ 		} else if (!strcmp (argv [i], "-cf")) {
+ 			if (++i == argc)
+ 				usage ();
+@@ -397,6 +445,44 @@
+ 					     trace_seed_stop, MDL);
+ #endif
+ 
++#if defined (PARANOIA)
++	/* get user and group info if those options were given */
++	if (set_user) {
++		struct passwd *tmp_pwd;
++
++		if (geteuid())
++			log_fatal ("you must be root to set user");
++
++		if (!(tmp_pwd = getpwnam(set_user)))
++			log_fatal ("no such user: %s", set_user);
++
++		set_uid = tmp_pwd->pw_uid;
++
++		/* use the user's group as the default gid */
++		if (!set_group)
++			set_gid = tmp_pwd->pw_gid;
++	}
++
++	if (set_group) {
++/* get around the ISC declaration of group */
++#define group real_group
++		struct group *tmp_grp;
++
++		if (geteuid())
++			log_fatal ("you must be root to set group");
++
++		if (!(tmp_grp = getgrnam(set_group)))
++			log_fatal ("no such group: %s", set_group);
++
++		set_gid = tmp_grp->gr_gid;
++#undef group
++	}
++
++#  if defined (EARLY_CHROOT)
++	if (set_chroot) setup_chroot (set_chroot);
++#  endif /* EARLY_CHROOT */
++#endif /* PARANOIA */
++
+ 	/* Default to the DHCP/BOOTP port. */
+ 	if (!local_port)
+ 	{
+@@ -500,6 +586,10 @@
+ 
+ 	postconf_initialization (quiet);
+ 
++#if defined (PARANOIA) && !defined (EARLY_CHROOT)
++	if (set_chroot) setup_chroot (set_chroot);
++#endif /* PARANOIA && !EARLY_CHROOT */
++
+         /* test option should cause an early exit */
+  	if (cftest && !lftest) 
+  		exit(0);
+@@ -543,6 +633,22 @@
+ 			exit (0);
+ 	}
+ 
++#if defined (PARANOIA)
++	/* change uid to the specified one */
++
++	if (set_gid) {
++		if (setgroups (0, (void *)0))
++			log_fatal ("setgroups: %m");
++		if (setgid (set_gid))
++			log_fatal ("setgid(%d): %m", (int) set_gid);
++	}	
++
++	if (set_uid) {
++		if (setuid (set_uid))
++			log_fatal ("setuid(%d): %m", (int) set_uid);
++	}
++#endif /* PARANOIA */
++
+ 	/* Read previous pid file. */
+ 	if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) {
+ 		status = read (i, pbuf, (sizeof pbuf) - 1);
+@@ -888,6 +994,10 @@
+ 
+ 	log_fatal ("Usage: dhcpd [-p <UDP port #>] [-d] [-f]%s%s%s%s",
+ 		   "\n             [-cf config-file] [-lf lease-file]",
++#if defined (PARANOIA)
++		   /* meld into the following string */
++		   "\n             [-user user] [-group group] [-chroot dir]"
++#endif /* PARANOIA */
+ #if defined (TRACING)
+ 		   "\n		   [-tf trace-output-file]",
+ 		   "\n		   [-play trace-input-file]",
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-libdst.patch b/net-misc/dhcp/files/dhcp-3.0.3-libdst.patch
new file mode 100644
index 000000000000..8e93ac95bc40
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-libdst.patch
@@ -0,0 +1,14 @@
+--- dst/Makefile.dist.old	2004-12-24 13:31:22.986061032 +0000
++++ dst/Makefile.dist	2004-12-24 13:47:19.036913364 +0000
+@@ -31,6 +31,10 @@
+ all:	libdst.a
+ 
+ install:
++	mkdir -p $(DESTDIR)$(LIBDIR)
++	$(INSTALL) libdst.a $(DESTDIR)$(LIBDIR)
++	$(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libdst.a
++
+ 
+ libdst.a:	$(OBJ)
+    rm -f dst.a
+
diff --git a/net-misc/dhcp/files/dhcp.conf b/net-misc/dhcp/files/dhcp.conf
index 7fce9043df79..f842c1b826e7 100644
--- a/net-misc/dhcp/files/dhcp.conf
+++ b/net-misc/dhcp/files/dhcp.conf
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.conf,v 1.7 2004/12/20 18:54:23 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.conf,v 1.8 2005/12/07 13:59:32 uberlord Exp $
 
 # Configure which interface or interfaces to for dhcp to listen on
-# list all interfaces space separated.
-IFACE="eth0"
+# list all interfaces space separated. If this is not specified then
+# we listen on all interfaces.
+#IFACE=""
 
-# Insert any other options needed
-DHCPD_OPTS="-q"
+# Insert any other dhcp options - see the man page for a full list.
+#DHCPD_OPTS=""
 
 # If you wish to run dhcp in a chroot, run:
 # ebuild /var/db/pkg/net-misc/<dhcp version>/<dhcp-version>.ebuild config
@@ -15,5 +16,7 @@ DHCPD_OPTS="-q"
 # You can specify a different chroot directory but MAKE SURE it's empty.
 #CHROOT="/chroot/dhcp"
 
-# If you need name resolution under a chroot, uncomment the following:
+# If you need name resolution under a chroot, you need to ensure that
+# you have a working /etc/resolv.conf in your chroot and you
+# uncomment the following:
 #export LD_PRELOAD="/usr/lib/libresolv.so /usr/lib/libnss_dns.so"
diff --git a/net-misc/dhcp/files/dhcp.init b/net-misc/dhcp/files/dhcp.init
new file mode 100644
index 000000000000..784b7ccf8690
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp.init
@@ -0,0 +1,49 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.init,v 1.1 2005/12/07 13:59:32 uberlord Exp $
+
+depend() {
+	need net
+	use logger dns
+}
+
+get_var() {
+	sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#"]\+\)"*/\1/p' \
+		"${CHROOT}/etc/dhcp/dhcpd.conf"
+}
+
+start() {
+	if [[ ! -f "${CHROOT}/etc/dhcp/dhcpd.conf" ]] ; then
+		eerror "${CHROOT}/etc/dhcp/dhcpd.conf does not exist"
+		return 1
+	fi
+
+	local leasefile=$(get_var lease-file-name)
+	leasefile="${leasefile:-${CHROOT}/var/lib/dhcp/dhcpd.leases}"
+	if [[ ! -f ${leasefile} ]] ; then
+		ebegin "Creating ${leasefile}"
+		touch "${leasefile}"
+		chown dcp:dhcp "${leasefile}"
+		eend $? || return 1
+	fi
+
+	# Ensure that LD_PRELOAD is really exported
+	[[ -n ${LD_PRELOAD} ]] && export LD_PRELOAD="${LD_PRELOAD}"
+
+	local pidfile=$(get_var pid-file-name)
+	pidfile="${pidfile:-/var/run/dhcp.pid}"
+
+	ebegin "Starting ${CHROOT:+chrooted }dhcpd"
+	eval start-stop-daemon --start --exec /usr/sbin/dhcpd \
+		-- -q -pf "${pidfile}" \
+		-user dhcp -group dhcp "${DHCPD_OPTS}" \
+		${CHROOT:+-chroot "${CHROOT}"} "${IFACE}"
+	eend $? && save_options pidfile "${CHROOT}${pidfile}"
+}
+
+stop() {
+	ebegin "Stopping dhcpd"
+	start-stop-daemon --stop --pidfile "$(get_options pidfile)"
+	eend $?
+}
diff --git a/net-misc/dhcp/files/dhcrelay.conf b/net-misc/dhcp/files/dhcrelay.conf
index 2b7f91a39efe..516f8361a0c5 100644
--- a/net-misc/dhcp/files/dhcrelay.conf
+++ b/net-misc/dhcp/files/dhcrelay.conf
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.conf,v 1.4 2004/12/20 19:21:39 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.conf,v 1.5 2005/12/07 13:59:32 uberlord Exp $
 
 # Configure which interface or interfaces to for dhcp to listen on
-# list all interfaces space separated.
-IFACE="eth0"
+# list all interfaces space separated. If this is not specified then
+# we listen on all interfaces.
+#IFACE=""
 
 # Insert any other options needed.  See dhcrelay(8) for details.
-DHCRELAY_OPTS="-q"
+#DHCRELAY_OPTS=""
 
 # Space separated list of IPs to forward BOOTP/DHCP packets to.
 DHCRELAY_SERVERS=""
diff --git a/net-misc/dhcp/files/dhcrelay.init b/net-misc/dhcp/files/dhcrelay.init
new file mode 100644
index 000000000000..c373f4a6eac2
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay.init
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init,v 1.1 2005/12/07 13:59:32 uberlord Exp $
+
+depend() {
+	need net
+	use logger
+}
+
+start() {
+	if [[ -z ${DHCRELAY_SERVERS} ]]; then
+		eerror "No DHCRELAY_SERVERS specified in /etc/conf.d/dhcrelay"
+		return 1
+	fi
+
+	local IFACES="" i
+	for i in ${IFACE} ; do
+		IFACES="${IFACES} -i ${i}"
+	done
+
+	ebegin "Starting dhcrelay"
+	eval start-stop-daemon --start --exec /usr/sbin/dhcrelay \
+		-- "${IFACES}" -q "${DHCRELAY_OPTS}" "${DHCRELAY_SERVERS}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping dhcrelay"
+	start-stop-daemon --stop --pidfile /var/run/dhcrelay.pid
+	eend $?
+}
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.2 b/net-misc/dhcp/files/digest-dhcp-3.0.2
deleted file mode 100644
index bde8daecd235..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 04800a111521e7442749b2ce883f962b dhcp-3.0.2.tar.gz 853313
-MD5 d5f2610cff1207633770035b126aea8f dhcp-3-gentoo-1.tar.bz2 2825
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.3 b/net-misc/dhcp/files/digest-dhcp-3.0.3
deleted file mode 100644
index c0c842966e03..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f91416a0b8ed3fd0601688cf0b7df58f dhcp-3.0.3.tar.gz 870240
-MD5 d5f2610cff1207633770035b126aea8f dhcp-3-gentoo-1.tar.bz2 2825
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.3-r1 b/net-misc/dhcp/files/digest-dhcp-3.0.3-r1
new file mode 100644
index 000000000000..b5c6d4ce1238
--- /dev/null
+++ b/net-misc/dhcp/files/digest-dhcp-3.0.3-r1
@@ -0,0 +1 @@
+MD5 f91416a0b8ed3fd0601688cf0b7df58f dhcp-3.0.3.tar.gz 870240