ebuild missing some patches.

Package-Manager: portage-2.1.2_rc1-r1

6 files changed, 124 insertions, 3 deletions

diff --git a/net-misc/dhcdbd/Manifest b/net-misc/dhcdbd/Manifest
index 5e991099a093..129c796e1cb9 100644
--- a/net-misc/dhcdbd/Manifest
+++ b/net-misc/dhcdbd/Manifest
@@ -1,6 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX dhcdbd-1.14-dbus_close.patch 581 RMD160 6701f7c5cb997a2680d2e0a3e470a71acc83f475 SHA1 4c7040efb0927c1e1b05bcd4bc693fda92f4e598 SHA256 e27633e39c5ebe508bd799fec915b78c1154e8a2a692a5afebb9083733225765
+MD5 a6e1ee2c1f72ae08936bfd3a1c3df70e files/dhcdbd-1.14-dbus_close.patch 581
+RMD160 6701f7c5cb997a2680d2e0a3e470a71acc83f475 files/dhcdbd-1.14-dbus_close.patch 581
+SHA256 e27633e39c5ebe508bd799fec915b78c1154e8a2a692a5afebb9083733225765 files/dhcdbd-1.14-dbus_close.patch 581
+AUX dhcdbd-1.14-enable_debug.patch 613 RMD160 0c31445e1185acb66109baa4c3f9c5cdde500308 SHA1 71d596dbff73e15725b9325367dd833f1ef4dcf2 SHA256 466d33cedaf6032dc6f7dc60e2ccb423a957f5c51cbf11523f96ec4f5052a125
+MD5 a51f72837464bfc1052e9d7249de04db files/dhcdbd-1.14-enable_debug.patch 613
+RMD160 0c31445e1185acb66109baa4c3f9c5cdde500308 files/dhcdbd-1.14-enable_debug.patch 613
+SHA256 466d33cedaf6032dc6f7dc60e2ccb423a957f5c51cbf11523f96ec4f5052a125 files/dhcdbd-1.14-enable_debug.patch 613
+AUX dhcdbd-1.14-fix_dhclientconf.patch 1195 RMD160 4ad17ec2038ff9c2c978c509a730ae2c576a78db SHA1 81a4320981435e7648500b5ff8439750c5a12a32 SHA256 bac88e15cd46687b3d61e7837090010400839d3ab52bbb718d6ce11c3f401468
+MD5 c77da62529b9507f4422d8b448fa6663 files/dhcdbd-1.14-fix_dhclientconf.patch 1195
+RMD160 4ad17ec2038ff9c2c978c509a730ae2c576a78db files/dhcdbd-1.14-fix_dhclientconf.patch 1195
+SHA256 bac88e15cd46687b3d61e7837090010400839d3ab52bbb718d6ce11c3f401468 files/dhcdbd-1.14-fix_dhclientconf.patch 1195
+AUX dhcdbd.confd 99 RMD160 fa656c5ee4a3a90d61cff8d7bc2141c00a76b441 SHA1 2809224bb0615804a00047622e30fa95baa5912a SHA256 5e74188e4984eb83ded996fbe9ac61364ca925386754365549a314d8b8d656a5
+MD5 adb3e35233944179b7859d6dfda9bca9 files/dhcdbd.confd 99
+RMD160 fa656c5ee4a3a90d61cff8d7bc2141c00a76b441 files/dhcdbd.confd 99
+SHA256 5e74188e4984eb83ded996fbe9ac61364ca925386754365549a314d8b8d656a5 files/dhcdbd.confd 99
+AUX dhcdbd.init 458 RMD160 c729207d6265190879457446907077697183027e SHA1 faffa8ebf4d82823a1c2e90239f15d501ce6fd9a SHA256 5bfae41de81cafd532aad6813a98d4aaf78905b7e12ff713e1929cfd3dd6ebb0
+MD5 04e750a15bef168143401aeddbed5b51 files/dhcdbd.init 458
+RMD160 c729207d6265190879457446907077697183027e files/dhcdbd.init 458
+SHA256 5bfae41de81cafd532aad6813a98d4aaf78905b7e12ff713e1929cfd3dd6ebb0 files/dhcdbd.init 458
 DIST dhcdbd-1.12.tar.gz 70636 RMD160 abfcb0c408f8e86a9c772f9d8c1e20e742bfcc0a SHA1 84350e1e7a6733b04a5904fca9f8ba9d769af4e6 SHA256 be9d2c174474a46cbfa4dd7a19a0778aee066ca8019175dcc158555829e44cb1
 DIST dhcdbd-1.14.tar.gz 71440 RMD160 f7f2896b5787bf7f2217c56d73f63a61b6efd75d SHA1 338a35eda47b3f6e6ce0cd67ff34bdcf10d528d6 SHA256 e5facfcab28377d32fd4c70aa1fe0820d3dba4abdfc48bd15eda712c8815e505
 EBUILD dhcdbd-1.12-r3.ebuild 773 RMD160 3ab56654824fd96021a8b2ff31c439a700d4806f SHA1 312e6c1e755a2480ca4b8070bbf485011afa9d40 SHA256 118e6673d739a890ea7c6aeb6fa691316ff0327d290f92b8e7b0964d4e12ba81
@@ -28,7 +48,7 @@ SHA256 13c5ee98df3cc5890857260559aa0063db57c4d3e95c6ae9bd7482dac96e7141 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFQ9R0wUpWvClEHQoRAggOAJ4sBH7AFgwRh0Khudd6RzFclRKguQCfWwXr
-D2VrzsrfwnStpgMX5CxZNrQ=
-=hB1Z
+iD8DBQFFRbi+wUpWvClEHQoRAs7PAJ987jwSR84y7pZqB8vlQ8QvTUFXuwCfY7KZ
+ch6btuO4nwkzRWILJ1tfilg=
+=NARj
 -----END PGP SIGNATURE-----
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 $?
+}