ebuild missing some patches.

(Portage version: 2.1.2_rc1-r1)

5 files changed, 101 insertions, 0 deletions

diff --git a/net-misc/dhcdbd/files/dhcdbd-1.14-dbus_close.patch b/net-misc/dhcdbd/files/dhcdbd-1.14-dbus_close.patch
new file mode 100644
index 000000000000..206b464173e2
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd-1.14-dbus_close.patch
@@ -0,0 +1,21 @@
+diff -ruN dhcdbd-1.14.orig/dbus_service.c dhcdbd-1.14/dbus_service.c
+--- dhcdbd-1.14.orig/dbus_service.c	2006-07-28 16:38:43.000000000 -0500
++++ dhcdbd-1.14/dbus_service.c	2006-07-28 16:39:41.000000000 -0500
+@@ -1412,7 +1412,7 @@
+     return ( cs );
+ 
+  give_up:
+-    dbus_connection_disconnect( connection );
++    dbus_connection_close( connection );
+     dbus_shutdown();
+     return ( 0L );
+ }
+@@ -1456,7 +1456,7 @@
+     cs->roots=0L;
+ 
+ 
+-    dbus_connection_disconnect( cs->connection );
++    dbus_connection_close( cs->connection );
+     dbus_shutdown();
+     free( cs );
+ }
diff --git a/net-misc/dhcdbd/files/dhcdbd-1.14-enable_debug.patch b/net-misc/dhcdbd/files/dhcdbd-1.14-enable_debug.patch
new file mode 100644
index 000000000000..055d2cbc0cb5
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd-1.14-enable_debug.patch
@@ -0,0 +1,21 @@
+diff -ruN dhcdbd-1.14.orig/dhcdbd.c dhcdbd-1.14/dhcdbd.c
+--- dhcdbd-1.14.orig/dhcdbd.c	2006-05-05 11:25:35.000000000 -0500
++++ dhcdbd-1.14/dhcdbd.c	2006-05-05 23:40:18.000000000 -0500
+@@ -259,7 +259,7 @@
+ static void state_trans(DHC_IF* d_if, uint32_t next_state)
+ {
+     /* Uncomment to debug dhclient process state changes */
+-/*    
++    
+     char cs[16], ns[16];
+     if( d_if->state == next_state)
+ 	return;
+@@ -315,7 +315,7 @@
+                  	           ? "RELEASER"	       
+ 	                           : ns
+ 	);	   
+-*/
++
+ }
+ 
+ void dhcdbd_monitor( const void *p, const VISIT which, const int level )
diff --git a/net-misc/dhcdbd/files/dhcdbd-1.14-fix_dhclientconf.patch b/net-misc/dhcdbd/files/dhcdbd-1.14-fix_dhclientconf.patch
new file mode 100644
index 000000000000..991bf25afb54
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd-1.14-fix_dhclientconf.patch
@@ -0,0 +1,33 @@
+diff -ruN dhcdbd-1.14.orig/dhcdbd.c dhcdbd-1.14/dhcdbd.c
+--- dhcdbd-1.14.orig/dhcdbd.c	2006-05-05 11:25:35.000000000 -0500
++++ dhcdbd-1.14/dhcdbd.c	2006-05-05 11:28:06.000000000 -0500
+@@ -837,9 +837,8 @@
+     {
+ 	dhcdbd_debug("Running dhclient for IF_UP %s",d_if->name);
+ 
+-	snprintf(dhc_if_conf_file, 1024, "%s%s%s%s", 
+-		 DHCDBD_DHCLIENT_CONF_PFX,DHCDBD_DHCLIENT_CONF_SEP,
+-		 d_if->name, DHCDBD_DHCLIENT_CONF_SFX
++	snprintf(dhc_if_conf_file, 1024, "%s%s", 
++		 DHCDBD_DHCLIENT_CONF_PFX, DHCDBD_DHCLIENT_CONF_SFX
+ 	        );
+ 	
+ 	if( access( dhc_if_conf_file, R_OK ) == 0 )
+diff -ruN dhcdbd-1.14.orig/dhcdbd.h dhcdbd-1.14/dhcdbd.h
+--- dhcdbd-1.14.orig/dhcdbd.h	2006-05-05 11:25:35.000000000 -0500
++++ dhcdbd-1.14/dhcdbd.h	2006-05-05 11:27:33.000000000 -0500
+@@ -49,11 +49,11 @@
+ #define DHCDBD_DHCLIENT_PID_SFX   ".pid"
+ #endif
+ #ifndef DHCDBD_DHCLIENT_CONF_PFX
+-#define DHCDBD_DHCLIENT_CONF_PFX  "/etc/dhclient"
++#define DHCDBD_DHCLIENT_CONF_PFX  "/etc/dhcp/dhclient"
+ #endif
+-#ifndef DHCDBD_DHCLIENT_CONF_SEP
++/* #ifndef DHCDBD_DHCLIENT_CONF_SEP
+ #define DHCDBD_DHCLIENT_CONF_SEP  "-"
+-#endif
++#endif */
+ #ifndef DHCDBD_DHCLIENT_CONF_SFX
+ #define DHCDBD_DHCLIENT_CONF_SFX  ".conf"
+ #endif
diff --git a/net-misc/dhcdbd/files/dhcdbd.confd b/net-misc/dhcdbd/files/dhcdbd.confd
new file mode 100644
index 000000000000..ae833ecc3d8c
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd.confd
@@ -0,0 +1,4 @@
+# Configuration file for dhcdbd
+#
+# Arguments to pass to the dhcdbd daemon.
+DHCDBD_ARGS="--system"
diff --git a/net-misc/dhcdbd/files/dhcdbd.init b/net-misc/dhcdbd/files/dhcdbd.init
new file mode 100644
index 000000000000..9bf0cfe336fe
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd.init
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+   need net dbus
+}
+
+start() {
+   ebegin "Starting ${SVCNAME}"
+   start-stop-daemon --start --exec /sbin/dhcdbd \
+   	--pidfile /var/run/dhcdbd.pid \
+      	-- ${DHCDBD_ARGS}
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping ${SVCNAME}"
+   start-stop-daemon --stop --exec /sbin/dhcdbd \
+   	--pidfile /var/run/dhcdbd.pid
+   eend $?
+}