New upstream release, version 2.7, tested locally with no issues. Fixes bug#178523. Thanks to Davide Pesavento <davidespa@gmail.com> for reporting.

(Portage version: 2.1.2.7)

9 files changed, 109 insertions, 118 deletions

diff --git a/net-misc/dhcdbd/ChangeLog b/net-misc/dhcdbd/ChangeLog
index a194c31206c3..faf1c0e9551b 100644
--- a/net-misc/dhcdbd/ChangeLog
+++ b/net-misc/dhcdbd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/dhcdbd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcdbd/ChangeLog,v 1.2 2007/01/14 11:08:45 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcdbd/ChangeLog,v 1.3 2007/05/14 16:53:56 steev Exp $
+
+*dhcdbd-2.7 (14 May 2007)
+
+  14 May 2007; Steev Klimaszewski <steev@gentoo.org>
+  -files/dhcdbd-1.14-dbus_close.patch,
+  -files/dhcdbd-1.14-enable_debug.patch,
+  -files/dhcdbd-1.14-fix_dhclientconf.patch, +files/dhcdbd-2.5-fixes.patch,
+  -dhcdbd-1.14-r1.ebuild, +dhcdbd-2.7.ebuild:
+  New upstream release, version 2.7, was testing locally, with no issues.  Fixes
+  bug #178523.  Thanks to Davide Pesavento <davidepesa@gmail.com> for reporting.
+  Remove the dhcdbd-1.14 line.
 
   14 Jan 2007; Markus Rothe <corsair@gentoo.org> dhcdbd-1.14-r1.ebuild:
   Added ~ppc64
diff --git a/net-misc/dhcdbd/dhcdbd-1.14-r1.ebuild b/net-misc/dhcdbd/dhcdbd-1.14-r1.ebuild
deleted file mode 100644
index e1b36d7f05a9..000000000000
--- a/net-misc/dhcdbd/dhcdbd-1.14-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcdbd/dhcdbd-1.14-r1.ebuild,v 1.3 2007/01/14 11:08:45 corsair Exp $
-
-inherit eutils
-
-DESCRIPTION="DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options."
-HOMEPAGE="http://people.redhat.com/~jvdias/dhcdbd"
-SRC_URI="http://people.redhat.com/~jvdias/dhcdbd/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
-
-DEPEND="sys-apps/dbus
-	>=net-misc/dhcp-3.0.3-r7"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.14-fix_dhclientconf.patch
-	epatch ${FILESDIR}/${PN}-1.14-dbus_close.patch
-	# This doesn't truely enable debugging, it simply allows us to see
-	# more info about state changes, hopefully.
-	use debug && epatch "${FILESDIR}/${PN}-1.14-enable_debug.patch"
-}
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc README dhcp_options.h
-	newinitd ${FILESDIR}/dhcdbd.init dhcdbd
-	newconfd ${FILESDIR}/dhcdbd.confd dhcdbd
-}
-
-pkg_postinst() {
-	einfo "dhcddb is used by NetworkManager in order to use it"
-	einfo "you can add it to runlevels by writing on your terminal"
-	einfo "rc-update add dhcdbd default"
-}
diff --git a/net-misc/dhcdbd/dhcdbd-2.7.ebuild b/net-misc/dhcdbd/dhcdbd-2.7.ebuild
new file mode 100644
index 000000000000..85f6fedd17cb
--- /dev/null
+++ b/net-misc/dhcdbd/dhcdbd-2.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcdbd/dhcdbd-2.7.ebuild,v 1.1 2007/05/14 16:53:56 steev Exp $
+
+inherit eutils
+
+DESCRIPTION="DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options."
+HOMEPAGE="http://people.redhat.com/dcantrel/dhcdbd"
+SRC_URI="http://people.redhat.com/dcantrel/dhcdbd/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/dbus
+	>=net-misc/dhcp-3.0.3-r7"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.5-fixes.patch
+	# Commented out for the moment as I need to re-work this to make it cleaner.
+	#use debug && epatch ${FILESDIR}/${PN}-2.5-debug.patch
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README include/dhcp_options.h
+	newinitd ${FILESDIR}/dhcdbd.init dhcdbd
+	newconfd ${FILESDIR}/dhcdbd.confd dhcdbd
+}
+
+pkg_postinst() {
+	einfo "dhcdbd is used by NetworkManager in order to use it"
+	einfo "you can add it to runlevels by writing on your terminal"
+	einfo "rc-update add dhcdbd default"
+}
diff --git a/net-misc/dhcdbd/files/dhcdbd-1.14-dbus_close.patch b/net-misc/dhcdbd/files/dhcdbd-1.14-dbus_close.patch
deleted file mode 100644
index 206b464173e2..000000000000
--- a/net-misc/dhcdbd/files/dhcdbd-1.14-dbus_close.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 055d2cbc0cb5..000000000000
--- a/net-misc/dhcdbd/files/dhcdbd-1.14-enable_debug.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 991bf25afb54..000000000000
--- a/net-misc/dhcdbd/files/dhcdbd-1.14-fix_dhclientconf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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-2.5-fixes.patch b/net-misc/dhcdbd/files/dhcdbd-2.5-fixes.patch
new file mode 100644
index 000000000000..aa0e56c7bae0
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd-2.5-fixes.patch
@@ -0,0 +1,56 @@
+diff -ruN dhcdbd-2.5.orig/include/dhcdbd.h dhcdbd-2.5/include/dhcdbd.h
+--- dhcdbd-2.5.orig/include/dhcdbd.h	2007-02-15 12:39:30.000000000 -0600
++++ dhcdbd-2.5/include/dhcdbd.h	2007-02-15 15:07:23.000000000 -0600
+@@ -64,12 +64,12 @@
+ #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"
+diff -ruN dhcdbd-2.5.orig/src/dbus_service.c dhcdbd-2.5/src/dbus_service.c
+--- dhcdbd-2.5.orig/src/dbus_service.c	2007-02-15 12:39:30.000000000 -0600
++++ dhcdbd-2.5/src/dbus_service.c	2007-02-15 12:44:43.000000000 -0600
+@@ -1216,7 +1216,7 @@
+     return (cs);
+ 
+ give_up:
+-    dbus_connection_close(connection);
++    dbus_connection_unref(connection);
+     dbus_shutdown();
+ 
+     return (0L);
+@@ -1250,7 +1250,7 @@
+     tdestroy(cs->roots, free_root);
+     cs->roots = 0L;
+ 
+-    dbus_connection_close(cs->connection);
++    dbus_connection_unref(cs->connection);
+     dbus_shutdown();
+     free(cs);
+ }
+diff -ruN dhcdbd-2.5.orig/src/dhcdbd.c dhcdbd-2.5/src/dhcdbd.c
+--- dhcdbd-2.5.orig/src/dhcdbd.c	2007-02-15 12:39:30.000000000 -0600
++++ dhcdbd-2.5/src/dhcdbd.c	2007-02-15 15:06:11.000000000 -0600
+@@ -833,9 +833,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)
+                         n_args += 2;
+Files dhcdbd-2.5.orig/src/.dhcdbd.c.swp and dhcdbd-2.5/src/.dhcdbd.c.swp differ
diff --git a/net-misc/dhcdbd/files/digest-dhcdbd-1.14-r1 b/net-misc/dhcdbd/files/digest-dhcdbd-1.14-r1
deleted file mode 100644
index 594cc56bfaf6..000000000000
--- a/net-misc/dhcdbd/files/digest-dhcdbd-1.14-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1180dee7a51a4384d55768650634cf93 dhcdbd-1.14.tar.gz 71440
-RMD160 f7f2896b5787bf7f2217c56d73f63a61b6efd75d dhcdbd-1.14.tar.gz 71440
-SHA256 e5facfcab28377d32fd4c70aa1fe0820d3dba4abdfc48bd15eda712c8815e505 dhcdbd-1.14.tar.gz 71440
diff --git a/net-misc/dhcdbd/files/digest-dhcdbd-2.7 b/net-misc/dhcdbd/files/digest-dhcdbd-2.7
new file mode 100644
index 000000000000..0cbb866609ca
--- /dev/null
+++ b/net-misc/dhcdbd/files/digest-dhcdbd-2.7
@@ -0,0 +1,3 @@
+MD5 9edf3eabe05487e7ee5f0b685683d7fb dhcdbd-2.7.tar.bz2 56720
+RMD160 ef5bd47fde825e923f10411c69d1d507719554c5 dhcdbd-2.7.tar.bz2 56720
+SHA256 3f3b77132c40198cdf8b86a09c93449f5e204bb6d39f4dbebde9264e73ec621d dhcdbd-2.7.tar.bz2 56720