summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Klimaszewski <steev@gentoo.org>2007-05-14 16:53:56 +0000
committerStephen Klimaszewski <steev@gentoo.org>2007-05-14 16:53:56 +0000
commit490327f89f6c359ea88fd80c0d6101602c30b226 (patch)
tree372b0cc847a9fdc8cc1af63a8b59010c932b937b /net-misc/dhcdbd
parentold (diff)
downloadhistorical-490327f89f6c359ea88fd80c0d6101602c30b226.tar.gz
historical-490327f89f6c359ea88fd80c0d6101602c30b226.tar.bz2
historical-490327f89f6c359ea88fd80c0d6101602c30b226.zip
New upstream release, version 2.7, tested locally with no issues. Fixes bug#178523. Thanks to Davide Pesavento <davidespa@gmail.com> for reporting.
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'net-misc/dhcdbd')
-rw-r--r--net-misc/dhcdbd/ChangeLog13
-rw-r--r--net-misc/dhcdbd/Manifest40
-rw-r--r--net-misc/dhcdbd/dhcdbd-1.14-r1.ebuild39
-rw-r--r--net-misc/dhcdbd/dhcdbd-2.7.ebuild38
-rw-r--r--net-misc/dhcdbd/files/dhcdbd-1.14-dbus_close.patch21
-rw-r--r--net-misc/dhcdbd/files/dhcdbd-1.14-enable_debug.patch21
-rw-r--r--net-misc/dhcdbd/files/dhcdbd-1.14-fix_dhclientconf.patch33
-rw-r--r--net-misc/dhcdbd/files/dhcdbd-2.5-fixes.patch56
-rw-r--r--net-misc/dhcdbd/files/digest-dhcdbd-1.14-r13
-rw-r--r--net-misc/dhcdbd/files/digest-dhcdbd-2.73
10 files changed, 125 insertions, 142 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/Manifest b/net-misc/dhcdbd/Manifest
index 0e5ab1594f55..50f326db7ebb 100644
--- a/net-misc/dhcdbd/Manifest
+++ b/net-misc/dhcdbd/Manifest
@@ -1,15 +1,7 @@
-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-2.5-fixes.patch 2069 RMD160 f886dee19510300b9c8df97dd81cc3e83a4b9cad SHA1 eb8228340f3679bb0335cbb7001a262bc437964a SHA256 e4640f549140668d8966eae365cb332d42ac340ae27a0e85eeb1e53b06ed7fe8
+MD5 c2e5654818d5329f1c78590336f8b4fa files/dhcdbd-2.5-fixes.patch 2069
+RMD160 f886dee19510300b9c8df97dd81cc3e83a4b9cad files/dhcdbd-2.5-fixes.patch 2069
+SHA256 e4640f549140668d8966eae365cb332d42ac340ae27a0e85eeb1e53b06ed7fe8 files/dhcdbd-2.5-fixes.patch 2069
AUX dhcdbd.confd 99 RMD160 fa656c5ee4a3a90d61cff8d7bc2141c00a76b441 SHA1 2809224bb0615804a00047622e30fa95baa5912a SHA256 5e74188e4984eb83ded996fbe9ac61364ca925386754365549a314d8b8d656a5
MD5 adb3e35233944179b7859d6dfda9bca9 files/dhcdbd.confd 99
RMD160 fa656c5ee4a3a90d61cff8d7bc2141c00a76b441 files/dhcdbd.confd 99
@@ -18,19 +10,19 @@ AUX dhcdbd.init 458 RMD160 c729207d6265190879457446907077697183027e SHA1 faffa8e
MD5 04e750a15bef168143401aeddbed5b51 files/dhcdbd.init 458
RMD160 c729207d6265190879457446907077697183027e files/dhcdbd.init 458
SHA256 5bfae41de81cafd532aad6813a98d4aaf78905b7e12ff713e1929cfd3dd6ebb0 files/dhcdbd.init 458
-DIST dhcdbd-1.14.tar.gz 71440 RMD160 f7f2896b5787bf7f2217c56d73f63a61b6efd75d SHA1 338a35eda47b3f6e6ce0cd67ff34bdcf10d528d6 SHA256 e5facfcab28377d32fd4c70aa1fe0820d3dba4abdfc48bd15eda712c8815e505
-EBUILD dhcdbd-1.14-r1.ebuild 1286 RMD160 8724588c16125f5e4baac648f13bf75d04623523 SHA1 c510cfd21c6db8390c1ab660fd00cc99a2488484 SHA256 d2aeb50c087a58e5bf5815e4b32ad21708056ea0f99cc2d8e2a9e978ba9f8992
-MD5 af7bf83530adc1166c07f0f385613b16 dhcdbd-1.14-r1.ebuild 1286
-RMD160 8724588c16125f5e4baac648f13bf75d04623523 dhcdbd-1.14-r1.ebuild 1286
-SHA256 d2aeb50c087a58e5bf5815e4b32ad21708056ea0f99cc2d8e2a9e978ba9f8992 dhcdbd-1.14-r1.ebuild 1286
-MISC ChangeLog 539 RMD160 2cfb9b29fd7ee5ec3f2eef878919c77405bac885 SHA1 f3657c6a83b539b56635dee9a4756ad9e629783a SHA256 28bf107532897cdb0d2260fb017ecec2c946d35cdb9a975502379a424163b651
-MD5 80d63abb3a5407660eeab595c0987750 ChangeLog 539
-RMD160 2cfb9b29fd7ee5ec3f2eef878919c77405bac885 ChangeLog 539
-SHA256 28bf107532897cdb0d2260fb017ecec2c946d35cdb9a975502379a424163b651 ChangeLog 539
+DIST dhcdbd-2.7.tar.bz2 56720 RMD160 ef5bd47fde825e923f10411c69d1d507719554c5 SHA1 aabfc4a76817554f0a704896b576d1b417ee3340 SHA256 3f3b77132c40198cdf8b86a09c93449f5e204bb6d39f4dbebde9264e73ec621d
+EBUILD dhcdbd-2.7.ebuild 1185 RMD160 db6073fefcbadfe9b306ad41c7fad1b06da0f132 SHA1 3dba8b23204e9f99435963a00444ffe095252317 SHA256 1941a8db9709d0602c7da14be6c42731179e2dea9db617c1b9103137ef2821e9
+MD5 712b4cdda5996fd552644c2d7a4399c9 dhcdbd-2.7.ebuild 1185
+RMD160 db6073fefcbadfe9b306ad41c7fad1b06da0f132 dhcdbd-2.7.ebuild 1185
+SHA256 1941a8db9709d0602c7da14be6c42731179e2dea9db617c1b9103137ef2821e9 dhcdbd-2.7.ebuild 1185
+MISC ChangeLog 1013 RMD160 4aca295cdedcea6613c9701e36d9c3b2a8c2df0e SHA1 d62c1d8b7be7bf520a66baa6110ce6010bb96449 SHA256 042e62ed04386319b0c8fd38ca40db6b3a9a6a3f89b478cbe63ad6bfde4c6c2d
+MD5 98c67c9d2f879df57aa5518a68170960 ChangeLog 1013
+RMD160 4aca295cdedcea6613c9701e36d9c3b2a8c2df0e ChangeLog 1013
+SHA256 042e62ed04386319b0c8fd38ca40db6b3a9a6a3f89b478cbe63ad6bfde4c6c2d ChangeLog 1013
MISC metadata.xml 382 RMD160 6502df804c9513d3b87069f5da390438254d794e SHA1 65051b628c33b7327089bb5893b0f49aafd4a1d1 SHA256 a9fca86b318190e2eaccf17e969626e2b9f71629c3e941e487520eda9b0801fc
MD5 99b5f59e416ba77f0e3bc6b5ef912ec3 metadata.xml 382
RMD160 6502df804c9513d3b87069f5da390438254d794e metadata.xml 382
SHA256 a9fca86b318190e2eaccf17e969626e2b9f71629c3e941e487520eda9b0801fc metadata.xml 382
-MD5 b967a4e2b07c2ac2a5ed89ec4277deaf files/digest-dhcdbd-1.14-r1 232
-RMD160 ea11e9e0ec2d6350bc26a7ecbf6d8d892023c316 files/digest-dhcdbd-1.14-r1 232
-SHA256 13c5ee98df3cc5890857260559aa0063db57c4d3e95c6ae9bd7482dac96e7141 files/digest-dhcdbd-1.14-r1 232
+MD5 e72539b910d073992bde00fbbaaec815 files/digest-dhcdbd-2.7 232
+RMD160 6d80c692a928ed5145b4f92ca608c580e0231320 files/digest-dhcdbd-2.7 232
+SHA256 72655b840e3757254936031464eabae43c63d54b4292b4418902b6b38b6c4a81 files/digest-dhcdbd-2.7 232
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