New upstream release, and patches to fix working with baselayout-2 and dbus 1.0.2 since it expects a development version of DBus.

Package-Manager: portage-2.1.3.7

7 files changed, 174 insertions, 22 deletions

diff --git a/net-misc/dhcdbd/ChangeLog b/net-misc/dhcdbd/ChangeLog
index 8966acc5d8d8..e8b464082403 100644
--- a/net-misc/dhcdbd/ChangeLog
+++ b/net-misc/dhcdbd/ChangeLog
@@ -1,6 +1,18 @@
 # 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.9 2007/08/28 14:35:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcdbd/ChangeLog,v 1.10 2007/09/04 18:55:01 steev Exp $
+
+  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
diff --git a/net-misc/dhcdbd/Manifest b/net-misc/dhcdbd/Manifest
index 9010cc753e1d..d0b8395d75d0 100644
--- a/net-misc/dhcdbd/Manifest
+++ b/net-misc/dhcdbd/Manifest
@@ -6,6 +6,14 @@ AUX dhcdbd-2.8-daemon.patch 1666 RMD160 d37f5ba845809c971183e0aac0946ad3225007d2
 MD5 5fa3e8dbb0b1e6214137ed41cce8549e files/dhcdbd-2.8-daemon.patch 1666
 RMD160 d37f5ba845809c971183e0aac0946ad3225007d2 files/dhcdbd-2.8-daemon.patch 1666
 SHA256 c69fc989e973265f7cdb227933964c1edb0573bfa3d4c6ef953b575d6ed86383 files/dhcdbd-2.8-daemon.patch 1666
+AUX dhcdbd-3.0-daemon.patch 1758 RMD160 8df9b2d4472cab59b8b1563cbc539b4816f1377a SHA1 f0bf72616ab0f9b0a3f28007f4ba5690aa9513b9 SHA256 a18f4e8899489fe65f6eeb62344ac4044784a37a683582e6aa491cc898fcb85e
+MD5 c647ac5884a1431e2d06e12ef312ee1a files/dhcdbd-3.0-daemon.patch 1758
+RMD160 8df9b2d4472cab59b8b1563cbc539b4816f1377a files/dhcdbd-3.0-daemon.patch 1758
+SHA256 a18f4e8899489fe65f6eeb62344ac4044784a37a683582e6aa491cc898fcb85e files/dhcdbd-3.0-daemon.patch 1758
+AUX dhcdbd-3.0-dbus.patch 3531 RMD160 b11c5e78ade973c8dc3d4a08f9da1446894e3afb SHA1 8f71b82d0786bc5378e07e9e80e04cfc433ecb8c SHA256 2883b891a352eb6a2b471f70543e7cf9d3e57fb9b76c6a6f40c379d4ecefbfb8
+MD5 ece2b4c1d3fecb87509496c715736014 files/dhcdbd-3.0-dbus.patch 3531
+RMD160 b11c5e78ade973c8dc3d4a08f9da1446894e3afb files/dhcdbd-3.0-dbus.patch 3531
+SHA256 2883b891a352eb6a2b471f70543e7cf9d3e57fb9b76c6a6f40c379d4ecefbfb8 files/dhcdbd-3.0-dbus.patch 3531
 AUX dhcdbd.confd 99 RMD160 fa656c5ee4a3a90d61cff8d7bc2141c00a76b441 SHA1 2809224bb0615804a00047622e30fa95baa5912a SHA256 5e74188e4984eb83ded996fbe9ac61364ca925386754365549a314d8b8d656a5
 MD5 adb3e35233944179b7859d6dfda9bca9 files/dhcdbd.confd 99
 RMD160 fa656c5ee4a3a90d61cff8d7bc2141c00a76b441 files/dhcdbd.confd 99
@@ -14,12 +22,8 @@ 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-2.7.tar.bz2 56720 RMD160 ef5bd47fde825e923f10411c69d1d507719554c5 SHA1 aabfc4a76817554f0a704896b576d1b417ee3340 SHA256 3f3b77132c40198cdf8b86a09c93449f5e204bb6d39f4dbebde9264e73ec621d
 DIST dhcdbd-2.8.tar.bz2 56792 RMD160 e200683739f8f3f23fed64441231b99d72d48440 SHA1 d0ab01d5f6f64479b5c22ccefa725fe691cb4e34 SHA256 eb4c566509ea98f393e3488d1861f3a74f97438fb24551703fe6b2d00593f2b4
-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
+DIST dhcdbd-3.0.tar.bz2 56867 RMD160 f86abdeb5cc4f9cf2b9666057289d11cb453baae SHA1 e00dd158d63a7f0e77ec8bbe4455c75fcea71c11 SHA256 c62d5916dbd4d3148bd4deff355c3dfcb8092c2d9918d62dd24030e01c28361a
 EBUILD dhcdbd-2.8-r1.ebuild 1369 RMD160 6a633ab6a320a90ec4e60338ea88631cbf739b7b SHA1 6cb23997cb5a4a0d438ea426ed72909b54593144 SHA256 aa860c7ea7eba103fb0d7570a5d2b29086851872c37eb9e04e55976362c98a9d
 MD5 cba5cf0bd99ebe87bb639ef456152b8e dhcdbd-2.8-r1.ebuild 1369
 RMD160 6a633ab6a320a90ec4e60338ea88631cbf739b7b dhcdbd-2.8-r1.ebuild 1369
@@ -28,20 +32,24 @@ EBUILD dhcdbd-2.8.ebuild 1232 RMD160 8a77c84881e59f20900083de72e2433915440e75 SH
 MD5 6e29beab14b57def535837d214226115 dhcdbd-2.8.ebuild 1232
 RMD160 8a77c84881e59f20900083de72e2433915440e75 dhcdbd-2.8.ebuild 1232
 SHA256 9d9564a5d127f6e5c627d7310b4f603dee61833ea7a5c8d7ebdfd2b9ebd135b7 dhcdbd-2.8.ebuild 1232
-MISC ChangeLog 1859 RMD160 79c1206a8c65c02a3ed27022eb659b9075a84ac5 SHA1 b39898e0e9a0d634ad5b1a7de8a336fed9b4aa5d SHA256 8ce1f2809db94726e5f0261f9570d3e38b29227ab24a4137031b6997a60f3957
-MD5 cd7dfac2aa61f4db835a460945b22b03 ChangeLog 1859
-RMD160 79c1206a8c65c02a3ed27022eb659b9075a84ac5 ChangeLog 1859
-SHA256 8ce1f2809db94726e5f0261f9570d3e38b29227ab24a4137031b6997a60f3957 ChangeLog 1859
+EBUILD dhcdbd-3.0.ebuild 1330 RMD160 9400023fb8602824d16e7b7154d57445a691c600 SHA1 3322b1e6b4659c956c1d016fcd83a6dc22b4859e SHA256 25be36c580f635b1cb7d7bfb6e1467b2e55c888565624a66994dab70e0be1003
+MD5 c0769abd33d92fc09b0dc775835bde30 dhcdbd-3.0.ebuild 1330
+RMD160 9400023fb8602824d16e7b7154d57445a691c600 dhcdbd-3.0.ebuild 1330
+SHA256 25be36c580f635b1cb7d7bfb6e1467b2e55c888565624a66994dab70e0be1003 dhcdbd-3.0.ebuild 1330
+MISC ChangeLog 2378 RMD160 474f6f5e03e89769a8129b70ab681f434b17652b SHA1 b8444daad3459b5216a58f19c504f9e3ba38b36c SHA256 fd377daa705c76e47c2baba92a60f0ca34c200d8086c2ae6543d33e1ece468e3
+MD5 c90ff8bb767f603aac0ee2081cb6adba ChangeLog 2378
+RMD160 474f6f5e03e89769a8129b70ab681f434b17652b ChangeLog 2378
+SHA256 fd377daa705c76e47c2baba92a60f0ca34c200d8086c2ae6543d33e1ece468e3 ChangeLog 2378
 MISC metadata.xml 389 RMD160 be5b3f627e233d624f922bd95998e739bead5917 SHA1 8ad2361b71ab3181d0f8a1792fbc1859d6aa76ea SHA256 88f3f82bc0739b8d3e927fd033688807ca862e541f623f51f062656bf9e74173
 MD5 7b00393d0bb7793bf7f4a7fec2247cb1 metadata.xml 389
 RMD160 be5b3f627e233d624f922bd95998e739bead5917 metadata.xml 389
 SHA256 88f3f82bc0739b8d3e927fd033688807ca862e541f623f51f062656bf9e74173 metadata.xml 389
-MD5 e72539b910d073992bde00fbbaaec815 files/digest-dhcdbd-2.7 232
-RMD160 6d80c692a928ed5145b4f92ca608c580e0231320 files/digest-dhcdbd-2.7 232
-SHA256 72655b840e3757254936031464eabae43c63d54b4292b4418902b6b38b6c4a81 files/digest-dhcdbd-2.7 232
 MD5 8d2968e8ae89cb963cef433a9cb1a803 files/digest-dhcdbd-2.8 232
 RMD160 8bc74bd33dced9824e221bc9886baf979c2fc0d7 files/digest-dhcdbd-2.8 232
 SHA256 139ba928d254de984ea8d442451d2794c465db764a5813e7c32f49a0e9d62144 files/digest-dhcdbd-2.8 232
 MD5 8d2968e8ae89cb963cef433a9cb1a803 files/digest-dhcdbd-2.8-r1 232
 RMD160 8bc74bd33dced9824e221bc9886baf979c2fc0d7 files/digest-dhcdbd-2.8-r1 232
 SHA256 139ba928d254de984ea8d442451d2794c465db764a5813e7c32f49a0e9d62144 files/digest-dhcdbd-2.8-r1 232
+MD5 43837edc1fbff752198e455d7d6221cc files/digest-dhcdbd-3.0 232
+RMD160 ab7fc3a9bddee2a948759f8aad7e31f5f7d338fa files/digest-dhcdbd-3.0 232
+SHA256 5e902ec4afb3ba967ce7d04d93b06626537976ed2a3a51b118ba154370c1f823 files/digest-dhcdbd-3.0 232
diff --git a/net-misc/dhcdbd/dhcdbd-2.7.ebuild b/net-misc/dhcdbd/dhcdbd-3.0.ebuild
index 85f6fedd17cb..75600f6ee595 100644
--- a/net-misc/dhcdbd/dhcdbd-2.7.ebuild
+++ b/net-misc/dhcdbd/dhcdbd-3.0.ebuild
@@ -1,17 +1,18 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcdbd/dhcdbd-3.0.ebuild,v 1.1 2007/09/04 18:55:01 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"
+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=""
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
 
 DEPEND="sys-apps/dbus
 	>=net-misc/dhcp-3.0.3-r7"
@@ -20,8 +21,11 @@ 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}/${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() {
diff --git a/net-misc/dhcdbd/files/dhcdbd-3.0-daemon.patch b/net-misc/dhcdbd/files/dhcdbd-3.0-daemon.patch
new file mode 100644
index 000000000000..23534d386aca
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd-3.0-daemon.patch
@@ -0,0 +1,46 @@
+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)) == -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.");
diff --git a/net-misc/dhcdbd/files/dhcdbd-3.0-dbus.patch b/net-misc/dhcdbd/files/dhcdbd-3.0-dbus.patch
new file mode 100644
index 000000000000..3c96d457e9c5
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd-3.0-dbus.patch
@@ -0,0 +1,82 @@
+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);
diff --git a/net-misc/dhcdbd/files/digest-dhcdbd-2.7 b/net-misc/dhcdbd/files/digest-dhcdbd-2.7
deleted file mode 100644
index 0cbb866609ca..000000000000
--- a/net-misc/dhcdbd/files/digest-dhcdbd-2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9edf3eabe05487e7ee5f0b685683d7fb dhcdbd-2.7.tar.bz2 56720
-RMD160 ef5bd47fde825e923f10411c69d1d507719554c5 dhcdbd-2.7.tar.bz2 56720
-SHA256 3f3b77132c40198cdf8b86a09c93449f5e204bb6d39f4dbebde9264e73ec621d dhcdbd-2.7.tar.bz2 56720
diff --git a/net-misc/dhcdbd/files/digest-dhcdbd-3.0 b/net-misc/dhcdbd/files/digest-dhcdbd-3.0
new file mode 100644
index 000000000000..d0d95e258ee1
--- /dev/null
+++ b/net-misc/dhcdbd/files/digest-dhcdbd-3.0
@@ -0,0 +1,3 @@
+MD5 5316b1a0b3a3d53e972374627546d0bf dhcdbd-3.0.tar.bz2 56867
+RMD160 f86abdeb5cc4f9cf2b9666057289d11cb453baae dhcdbd-3.0.tar.bz2 56867
+SHA256 c62d5916dbd4d3148bd4deff355c3dfcb8092c2d9918d62dd24030e01c28361a dhcdbd-3.0.tar.bz2 56867