+++ /dev/null
-# ChangeLog for net-misc/dhcdbd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcdbd/ChangeLog,v 1.16 2009/02/25 20:55:25 rbu Exp $
-
- 25 Feb 2009; Robert Buchholz <rbu@gentoo.org>
- files/dhcdbd-2.8-daemon.patch, files/dhcdbd-3.0-daemon.patch,
- -dhcdbd-2.8.ebuild, dhcdbd-2.8-r1.ebuild, dhcdbd-3.0.ebuild:
- Fix compile bug when using FORTIFY_SOURCE: open with O_CREAT in second argument
- needs 3 arguments, bug #232084
-
- 29 Feb 2008; Brent Baude <ranger@gentoo.org> dhcdbd-3.0.ebuild:
- keyworded ~arch for ppc64, bug 211783
-
- 25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
- Removing metalgod from metadata.xml as per #99350.
-
- 08 Sep 2007; Joseph Jezak <josejx@gentoo.org> dhcdbd-3.0.ebuild:
- Marked ppc stable for bug #191302.
-
- 05 Sep 2007; <tester@gentoo.org> dhcdbd-3.0.ebuild:
- Stable on x86 per bug #191302
-
- 05 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> dhcdbd-3.0.ebuild:
- Marked stable on amd64 as per bug 191302 to make sure stable systems
- actually work.
-
- 04 Sep 2007; Steev Klimaszewski <steev@gentoo.org>
- +files/dhcdbd-3.0-daemon.patch, +files/dhcdbd-3.0-dbus.patch,
- -dhcdbd-2.7.ebuild, +dhcdbd-3.0.ebuild:
- Add patch so that 3.0 works with dbus 1.0.2, reported by rbu while testing.
-
-*dhcdbd-3.0 (04 Sep 2007)
-
- 04 Sep 2007; Steev Klimaszewski <steev@gentoo.org>
- +files/dhcdbd-3.0-daemon.patch, -dhcdbd-2.7.ebuild, +dhcdbd-3.0.ebuild:
- New upstream release, works with dhcp 3.1+ as well as lower. This should fix
- stable from being broken once we stablize it
-
- 28 Aug 2007; nixnut <nixnut@gentoo.org> dhcdbd-2.8-r1.ebuild:
- Stable on ppc wrt bug 189781
-
- 26 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> dhcdbd-2.8-r1.ebuild:
- Marked stable on amd64 as per bug 189781.
-
- 24 Aug 2007; Christian Faulhammer <opfer@gentoo.org> dhcdbd-2.8-r1.ebuild:
- stable x86, bug 189781
-
-*dhcdbd-2.8-r1 (16 Jul 2007)
-
- 16 Jul 2007; Roy Marples <uberlord@gentoo.org>
- +files/dhcdbd-2.8-daemon.patch, +dhcdbd-2.8-r1.ebuild:
- Create a pidfile immediately after daemonizing so we're more robust
- with baselayout-2
-
-*dhcdbd-2.8 (14 Jun 2007)
-
- 14 Jun 2007; Steev Klimaszewski <steev@gentoo.org> +dhcdbd-2.8.ebuild:
- New upstream release, closes bug #182033. Thanks to Tim Harder
- <thorium90@gmail.com> for reporting.
-
- 15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
- add <herd>no-herd</herd>
-
-*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
-
-*dhcdbd-1.14-r1 (28 Oct 2006)
-*dhcdbd-1.12-r3 (28 Oct 2006)
-
- 28 Oct 2006; Luis Medinas <metalgod@gentoo.org> +metadata.xml,
- +dhcdbd-1.12-r3.ebuild, +dhcdbd-1.14-r1.ebuild:
- Inital commit. This application is a dependency for NetworkManager.
-
+++ /dev/null
-AUX dhcdbd-2.5-fixes.patch 2069 RMD160 f886dee19510300b9c8df97dd81cc3e83a4b9cad SHA1 eb8228340f3679bb0335cbb7001a262bc437964a SHA256 e4640f549140668d8966eae365cb332d42ac340ae27a0e85eeb1e53b06ed7fe8
-AUX dhcdbd-2.8-daemon.patch 1685 RMD160 f7ab61dabf1732fb1bb8ad5b7b6a19e55cf48690 SHA1 3b93107f57cfddd5dceb0fc4bf1b35c342c4a100 SHA256 7f07baac5730cdc00248303c5aaefae6985dffb80cd1c8007166800c19227785
-AUX dhcdbd-3.0-daemon.patch 1777 RMD160 d8d447c504d86be358af0723e31f0483371adba9 SHA1 e746b2b1409f16c66412510e5a2711ecd1383712 SHA256 6ca4b6e93033be575c41e861394eeb15e126e28a46c605d64c711f0e13c53be9
-AUX dhcdbd-3.0-dbus.patch 3531 RMD160 b11c5e78ade973c8dc3d4a08f9da1446894e3afb SHA1 8f71b82d0786bc5378e07e9e80e04cfc433ecb8c SHA256 2883b891a352eb6a2b471f70543e7cf9d3e57fb9b76c6a6f40c379d4ecefbfb8
-AUX dhcdbd.confd 99 RMD160 fa656c5ee4a3a90d61cff8d7bc2141c00a76b441 SHA1 2809224bb0615804a00047622e30fa95baa5912a SHA256 5e74188e4984eb83ded996fbe9ac61364ca925386754365549a314d8b8d656a5
-AUX dhcdbd.init 458 RMD160 c729207d6265190879457446907077697183027e SHA1 faffa8ebf4d82823a1c2e90239f15d501ce6fd9a SHA256 5bfae41de81cafd532aad6813a98d4aaf78905b7e12ff713e1929cfd3dd6ebb0
-DIST dhcdbd-2.8.tar.bz2 56792 RMD160 e200683739f8f3f23fed64441231b99d72d48440 SHA1 d0ab01d5f6f64479b5c22ccefa725fe691cb4e34 SHA256 eb4c566509ea98f393e3488d1861f3a74f97438fb24551703fe6b2d00593f2b4
-DIST dhcdbd-3.0.tar.bz2 56867 RMD160 f86abdeb5cc4f9cf2b9666057289d11cb453baae SHA1 e00dd158d63a7f0e77ec8bbe4455c75fcea71c11 SHA256 c62d5916dbd4d3148bd4deff355c3dfcb8092c2d9918d62dd24030e01c28361a
-EBUILD dhcdbd-2.8-r1.ebuild 1396 RMD160 c7d18cc02c1157dab94f137feb1dc62180a31c30 SHA1 62d5441bf96ace698263d7bf5fd06f73c6ac1554 SHA256 4424546eeb0f1d6c346cce738e4c5ea111907cdb2905bc15e8baf79fc5e400c4
-EBUILD dhcdbd-3.0.ebuild 1362 RMD160 70bba8849c92306ecab26b1c0dcbe873bfb1e44a SHA1 ac165fd2eacd72d605bf5c7d94794c4c98bec705 SHA256 83bf0bd4373b092c7e701cab5b485bb3f3779f53f35ccd4b2d32e6b792c2ad8e
-MISC ChangeLog 3247 RMD160 6db464f683fe61f101f8ad092352ecb2531b382f SHA1 2671d593a2fa451e8b5c377cc048aef9886ee684 SHA256 daba666431f890461efa40de29d4edce75009f34a515a326f5690bd24aae834b
-MISC metadata.xml 260 RMD160 3bd2ac88342783f1ced38fe5de95da8d94db7c1c SHA1 7bcafc6b129a5890b55be1edf868f2e8751e7307 SHA256 94e8a0c83eb641ff321069cd9c7ee00744ffecb329ff14dc3a76773a8d2e228c
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcdbd/dhcdbd-2.8-r1.ebuild,v 1.6 2009/02/25 20:55:25 rbu 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"
-RDEPEND=${DEPEND}
-
-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
-
- # Create a pidfile immediately after daemonizing so we're more robust
- # with baselayout-2
- epatch "${FILESDIR}"/${P}-daemon.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."
- einfo "If you really feel you need to use it without that, simply add it"
- einfo "to your runlevel by issuing the following command:"
- einfo "rc-update add dhcdbd default"
-}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcdbd/dhcdbd-3.0.ebuild,v 1.6 2009/02/25 20:55:25 rbu 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"
-HOMEPAGE="http://dcantrel.fedorapeople.org/dhcdbd"
-SRC_URI="http://dcantrel.fedorapeople.org/dhcdbd/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="debug"
-
-DEPEND="sys-apps/dbus
- >=net-misc/dhcp-3.0.3-r7"
-RDEPEND=${DEPEND}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-2.5-fixes.patch
- # Create a pidfile immediately after daemonizing so we're more robust
- # with baselayout-2.
- epatch "${FILESDIR}"/${PN}-3.0-daemon.patch
- # We don't and won't have dbus snapshots in the tree
- epatch "${FILESDIR}"/${PN}-3.0-dbus.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"
-}
+++ /dev/null
-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
+++ /dev/null
-diff -ur a b
---- a/src/dhcdbd.c 2007-07-08 17:31:50.000000000 +0100
-+++ b/src/dhcdbd.c 2007-07-08 17:38:39.000000000 +0100
-@@ -2778,9 +2778,6 @@
- char path[1024];
- int fd, l;
-
-- if (dhcdbd_daemonize && (daemon (0, 0) == -1))
-- return errno;
--
- openlog ("dhcdbd", LOG_NDELAY | LOG_CONS, LOG_USER);
-
- dbus = dbus_svc_init (bus, dhcdbd_destination, dhcdbd_log, 0L);
-@@ -2821,6 +2818,17 @@
- (dbus, dhcdbd_object_path, path, dhcdbd_if_subscribe, dhco))
- return (1);
-
-+ /* Daemonize and write the pidfile write away, to avoid races */
-+ if (dhcdbd_daemonize && (daemon (0, 0) == -1))
-+ return errno;
-+ unlink (DHCDBD_PID_FILE);
-+ if ((fd = open (DHCDBD_PID_FILE, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR)) == -1)
-+ exit (errno);
-+ l = sprintf (path, "%u", getpid ());
-+ l = write (fd, path, l);
-+ fsync (fd);
-+ close (fd);
-+
- memset (&sa, '\0', sizeof (struct sigaction));
- sa.sa_sigaction = dhc_reaper;
- sa.sa_flags = SA_SIGINFO; /* NO RESTART, NO DEFER, CLDSTOP */
-@@ -2828,13 +2836,7 @@
- dhcdbd_log ("sigaction failed: %s\n", strerror (errno));
- return (1);
- }
-- unlink (DHCDBD_PID_FILE);
-- if ((fd = open (DHCDBD_PID_FILE, O_WRONLY | O_CREAT)) == -1)
-- exit (errno);
-- l = sprintf (path, "%u", getpid ());
-- l = write (fd, path, l);
-- fsync (fd);
-- close (fd);
-+
- dhcdbd_log ("Started up.");
- dbus_svc_main_loop (dbus, dhcdbd_work);
- dhcdbd_debug ("Main Loop Exited.");
+++ /dev/null
-diff -ruN dhcdbd-3.0.orig/src/dhcdbd.c dhcdbd-3.0/src/dhcdbd.c
---- dhcdbd-3.0.orig/src/dhcdbd.c 2007-09-04 10:31:45.000000000 -0500
-+++ dhcdbd-3.0/src/dhcdbd.c 2007-09-04 10:35:52.000000000 -0500
-@@ -2769,9 +2769,6 @@
- char path[1024];
- int fd, l;
-
-- if (dhcdbd_daemonize && (daemon (0, 0) == -1))
-- return errno;
--
- openlog ("dhcdbd", LOG_NDELAY | LOG_CONS, LOG_USER);
-
- dbus = dbus_svc_init (bus, dhcdbd_destination, dhcdbd_log, 0L);
-@@ -2812,6 +2809,17 @@
- (dbus, dhcdbd_object_path, path, dhcdbd_if_subscribe, dhco))
- return (1);
-
-+ /* Daemonize and write the pidfile write away, to avoid races */
-+ if (dhcdbd_daemonize && (daemon (0, 0) == -1))
-+ return errno;
-+ unlink (DHCDBD_PID_FILE);
-+ if ((fd = open (DHCDBD_PID_FILE, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR)) == -1)
-+ exit (errno);
-+ l = sprintf (path, "%u", getpid ());
-+ l = write (fd, path, l);
-+ fsync (fd);
-+ close (fd);
-+
- memset (&sa, '\0', sizeof (struct sigaction));
- sa.sa_sigaction = dhc_reaper;
- sa.sa_flags = SA_SIGINFO; /* NO RESTART, NO DEFER, CLDSTOP */
-@@ -2819,13 +2827,7 @@
- dhcdbd_log ("sigaction failed: %s\n", strerror (errno));
- return (1);
- }
-- unlink (DHCDBD_PID_FILE);
-- if ((fd = open (DHCDBD_PID_FILE, O_WRONLY | O_CREAT, 0644)) == -1)
-- exit (errno);
-- l = sprintf (path, "%u", getpid ());
-- l = write (fd, path, l);
-- fsync (fd);
-- close (fd);
-+
- dhcdbd_log ("Started up.");
- dbus_svc_main_loop (dbus, dhcdbd_work);
- dhcdbd_debug ("Main Loop Exited.");
+++ /dev/null
-diff -ruN dhcdbd-3.0.orig/src/dbus_service.c dhcdbd-3.0/src/dbus_service.c
---- dhcdbd-3.0.orig/src/dbus_service.c 2007-09-04 11:08:45.000000000 -0500
-+++ dhcdbd-3.0/src/dbus_service.c 2007-09-04 12:00:38.000000000 -0500
-@@ -1024,7 +1024,11 @@
-
- static void set_watch_fds(DBusWatch * watch, DBusConnectionState * cs) {
- uint8_t flags = dbus_watch_get_flags(watch);
-+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
- int fd = dbus_watch_get_unix_fd(watch);
-+#else
-+ int fd = dbus_watch_get_fd(watch);
-+#endif
-
- if (cs->n <= fd)
- cs->n = fd + 1;
-@@ -1057,7 +1061,11 @@
- dbus_watch_set_data(watch, cs, no_free);
-
- if (cs->dh != 0L)
-+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
- (*(cs->dh)) ("add_watch: %d", dbus_watch_get_unix_fd (watch));
-+#else
-+ (*(cs->dh)) ("add_watch: %d", dbus_watch_get_fd(watch));
-+#endif
-
- if (tsearch((const void *) watch, &(cs->watches), ptr_key_comparator) == 0L) {
- if (cs->eh != 0L)
-@@ -1074,14 +1082,22 @@
- static void remove_watch(DBusWatch * watch, void *csp)
- {
- DBusConnectionState *cs = csp;
-+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
- int fd = dbus_watch_get_unix_fd(watch);
-+#else
-+ int fd = dbus_watch_get_fd(watch);
-+#endif
-
- if (tdelete((const void *) watch, &(cs->watches), ptr_key_comparator) == 0L)
- if (cs->eh != 0L)
- (*(cs->eh)) ("remove_watch: can't happen?!?: watch not found");
-
- if (cs->dh != 0L)
-+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
- (*(cs->dh)) ("remove_watch: %d", dbus_watch_get_unix_fd(watch));
-+#else
-+ (*(cs->dh)) ("remove_watch: %d", dbus_watch_get_fd(watch));
-+#endif
-
- FD_CLR(fd, &(cs->r_fds));
- FD_CLR(fd, &(cs->w_fds));
-@@ -1092,7 +1108,11 @@
- DBusConnectionState *cs = csp;
-
- if (cs->dh != 0L)
-+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
- (*(cs->dh)) ("toggle_watch: %d", dbus_watch_get_unix_fd(watch));
-+#else
-+ (*(cs->dh)) ("toggle_watch: %d", dbus_watch_get_fd(watch));
-+#endif
-
- set_watch_fds(watch, cs);
- }
-@@ -1114,11 +1134,19 @@
- if (!dbus_watch_get_enabled(w))
- return;
-
-+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
- fd = dbus_watch_get_unix_fd(w);
-+#else
-+ fd = dbus_watch_get_fd(w);
-+#endif
- flags = dbus_watch_get_flags(w);
-
- if (cs->dh != 0L)
-+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
- (*(cs->dh)) ("handle_watch: %d", dbus_watch_get_unix_fd(w));
-+#else
-+ (*(cs->dh)) ("handle_watch: %d", dbus_watch_get_fd(w));
-+#endif
-
- if ((flags & DBUS_WATCH_READABLE) && (FD_ISSET(fd, &(cs->s_r_fds))))
- dbus_watch_handle(w, DBUS_WATCH_READABLE);
+++ /dev/null
-# Configuration file for dhcdbd
-#
-# Arguments to pass to the dhcdbd daemon.
-DHCDBD_ARGS="--system"
+++ /dev/null
-#!/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 $?
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>no-herd</herd>
- <maintainer>
- <email>steev@gentoo.org</email>
- <name>Stephen Klimaszewski</name>
- </maintainer>
-</pkgmetadata>
projects / gentoo.git / commitdiff