Attachment #146813 for bug #214196




AUX dhcdbd-2.8-daemon.patch 1666 RMD160 d37f5ba845809c971183e0aac0946ad3225007d2 SHA1 8353185f011683166c8bb118182447505d8d299b SHA256 c69fc989e973265f7cdb227933964c1edb0573bfa3d4c6ef953b575d6ed86383
AUX dhcdbd-3.0-daemon.patch 1758 RMD160 8df9b2d4472cab59b8b1563cbc539b4816f1377a SHA1 f0bf72616ab0f9b0a3f28007f4ba5690aa9513b9 SHA256 a18f4e8899489fe65f6eeb62344ac4044784a37a683582e6aa491cc898fcb85e
AUX dhcdbd-3.0-dbus.patch 3531 RMD160 b11c5e78ade973c8dc3d4a08f9da1446894e3afb SHA1 8f71b82d0786bc5378e07e9e80e04cfc433ecb8c SHA256 2883b891a352eb6a2b471f70543e7cf9d3e57fb9b76c6a6f40c379d4ecefbfb8
AUX dhcdbd-3.0-location.patch 574 RMD160 cceca95f2eae309bc07a0c834a9f2ba8e7c46c97 SHA1 cbd3e2e1486262bd35871aeaae07a45546d2bcea SHA256 490d24eba06604fa877a580d521b2eb392876e8c4f59d80bb443f3398a2565e1
AUX dhcdbd.confd 99 RMD160 fa656c5ee4a3a90d61cff8d7bc2141c00a76b441 SHA1 2809224bb0615804a00047622e30fa95baa5912a SHA256 5e74188e4984eb83ded996fbe9ac61364ca925386754365549a314d8b8d656a5
AUX dhcdbd.init 466 RMD160 a968e72e0ab958281941fa27689e21b31f841111 SHA1 a1875cdc9774f4a281bda52679f57f1e0ff29829 SHA256 b3b2d2f69a62044728122a5b13cc89270f456f71b4f8119fb46a7606b1c01648
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 1369 RMD160 6a633ab6a320a90ec4e60338ea88631cbf739b7b SHA1 6cb23997cb5a4a0d438ea426ed72909b54593144 SHA256 aa860c7ea7eba103fb0d7570a5d2b29086851872c37eb9e04e55976362c98a9d
EBUILD dhcdbd-2.8.ebuild 1232 RMD160 8a77c84881e59f20900083de72e2433915440e75 SHA1 7a1ea393bc04b891053ffc98fb02f3c26c39a6dc SHA256 9d9564a5d127f6e5c627d7310b4f603dee61833ea7a5c8d7ebdfd2b9ebd135b7
EBUILD dhcdbd-3.0.ebuild 1380 RMD160 59c58eec220d5073bff3cdadbf6a111bfe91f3ea SHA1 9fe8f1aee26c3dae80bdf1bc59908572d07f4a11 SHA256 eb014964b8f7460a4cda0c327443db829a88db7a3a9348c2cf37d5acc1ed032e
MISC ChangeLog 2959 RMD160 c4a55ecfdb27adc05cab07a595f854fa710e75b9 SHA1 71b97f628012ca822f0c69ee05f5ec0a45f766da SHA256 1e47cf8100d687e97eccddf3e6ba68cb61ce4fb502b2db9696e2a859c346449a
MISC metadata.xml 260 RMD160 3bd2ac88342783f1ced38fe5de95da8d94db7c1c SHA1 7bcafc6b129a5890b55be1edf868f2e8751e7307 SHA256 94e8a0c83eb641ff321069cd9c7ee00744ffecb329ff14dc3a76773a8d2e228c

Lines 26-31 Link Here

(-)dhcdbd.old/dhcdbd-3.0.ebuild (+1 lines)
26	epatch ${FILESDIR}/${PN}-3.0-daemon.patch	26	epatch ${FILESDIR}/${PN}-3.0-daemon.patch
27	# We don't and won't have dbus snapshots in the tree	27	# We don't and won't have dbus snapshots in the tree
28	epatch ${FILESDIR}/${PN}-3.0-dbus.patch	28	epatch ${FILESDIR}/${PN}-3.0-dbus.patch
		29	epatch ${FILESDIR}/${PN}-3.0-location.patch
29	}	30	}
30		31
31	src_install() {	32	src_install() {




diff --git a/Makefile b/Makefile
index 48175a7..f27bb4f 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,10 @@ clean:
 	-rm -f *.tar.bz2
 
 install: dhcdbd
-	mkdir -p $(DESTDIR)/sbin
+	mkdir -p $(DESTDIR)/usr/sbin
 	mkdir -p $(DESTDIR)/usr/share/dbus-1/services
 	mkdir -p $(DESTDIR)/etc/dbus-1/system.d
-	install -m 0755 src/dhcdbd $(DESTDIR)/sbin/dhcdbd
+	install -m 0755 src/dhcdbd $(DESTDIR)/usr/sbin/dhcdbd
 	install -m 0644 dhcdbd.conf $(DESTDIR)/etc/dbus-1/system.d/dhcdbd.conf
 	install -m 0644 dhcdbd.service $(DESTDIR)/usr/share/dbus-1/services/dhcdbd.service
 

Lines 8-14 Link Here

(-)dhcdbd.old/files/dhcdbd.init (-2 / +2 lines)
8		8
9	start() {	9	start() {
10	ebegin "Starting ${SVCNAME}"	10	ebegin "Starting ${SVCNAME}"
11	start-stop-daemon --start --exec /sbin/dhcdbd \	11	start-stop-daemon --start --exec /usr/sbin/dhcdbd \
12	--pidfile /var/run/dhcdbd.pid \	12	--pidfile /var/run/dhcdbd.pid \
13	-- ${DHCDBD_ARGS}	13	-- ${DHCDBD_ARGS}
14	eend $?	14	eend $?
Lines 16-22 Link Here
16		16
17	stop() {	17	stop() {
18	ebegin "Stopping ${SVCNAME}"	18	ebegin "Stopping ${SVCNAME}"
19	start-stop-daemon --stop --exec /sbin/dhcdbd \	19	start-stop-daemon --stop --exec /usr/sbin/dhcdbd \
20	--pidfile /var/run/dhcdbd.pid	20	--pidfile /var/run/dhcdbd.pid
21	eend $?	21	eend $?
22	}	22	}

Return to bug 214196

Lines 2-13 Link Here

(-)dhcdbd.old/Manifest (-2 / +3 lines)
2	AUX dhcdbd-2.8-daemon.patch 1666 RMD160 d37f5ba845809c971183e0aac0946ad3225007d2 SHA1 8353185f011683166c8bb118182447505d8d299b SHA256 c69fc989e973265f7cdb227933964c1edb0573bfa3d4c6ef953b575d6ed86383	2	AUX dhcdbd-2.8-daemon.patch 1666 RMD160 d37f5ba845809c971183e0aac0946ad3225007d2 SHA1 8353185f011683166c8bb118182447505d8d299b SHA256 c69fc989e973265f7cdb227933964c1edb0573bfa3d4c6ef953b575d6ed86383
3	AUX dhcdbd-3.0-daemon.patch 1758 RMD160 8df9b2d4472cab59b8b1563cbc539b4816f1377a SHA1 f0bf72616ab0f9b0a3f28007f4ba5690aa9513b9 SHA256 a18f4e8899489fe65f6eeb62344ac4044784a37a683582e6aa491cc898fcb85e	3	AUX dhcdbd-3.0-daemon.patch 1758 RMD160 8df9b2d4472cab59b8b1563cbc539b4816f1377a SHA1 f0bf72616ab0f9b0a3f28007f4ba5690aa9513b9 SHA256 a18f4e8899489fe65f6eeb62344ac4044784a37a683582e6aa491cc898fcb85e
4	AUX dhcdbd-3.0-dbus.patch 3531 RMD160 b11c5e78ade973c8dc3d4a08f9da1446894e3afb SHA1 8f71b82d0786bc5378e07e9e80e04cfc433ecb8c SHA256 2883b891a352eb6a2b471f70543e7cf9d3e57fb9b76c6a6f40c379d4ecefbfb8	4	AUX dhcdbd-3.0-dbus.patch 3531 RMD160 b11c5e78ade973c8dc3d4a08f9da1446894e3afb SHA1 8f71b82d0786bc5378e07e9e80e04cfc433ecb8c SHA256 2883b891a352eb6a2b471f70543e7cf9d3e57fb9b76c6a6f40c379d4ecefbfb8
		5	AUX dhcdbd-3.0-location.patch 574 RMD160 cceca95f2eae309bc07a0c834a9f2ba8e7c46c97 SHA1 cbd3e2e1486262bd35871aeaae07a45546d2bcea SHA256 490d24eba06604fa877a580d521b2eb392876e8c4f59d80bb443f3398a2565e1
5	AUX dhcdbd.confd 99 RMD160 fa656c5ee4a3a90d61cff8d7bc2141c00a76b441 SHA1 2809224bb0615804a00047622e30fa95baa5912a SHA256 5e74188e4984eb83ded996fbe9ac61364ca925386754365549a314d8b8d656a5	6	AUX dhcdbd.confd 99 RMD160 fa656c5ee4a3a90d61cff8d7bc2141c00a76b441 SHA1 2809224bb0615804a00047622e30fa95baa5912a SHA256 5e74188e4984eb83ded996fbe9ac61364ca925386754365549a314d8b8d656a5
6	AUX dhcdbd.init 458 RMD160 c729207d6265190879457446907077697183027e SHA1 faffa8ebf4d82823a1c2e90239f15d501ce6fd9a SHA256 5bfae41de81cafd532aad6813a98d4aaf78905b7e12ff713e1929cfd3dd6ebb0	7	AUX dhcdbd.init 466 RMD160 a968e72e0ab958281941fa27689e21b31f841111 SHA1 a1875cdc9774f4a281bda52679f57f1e0ff29829 SHA256 b3b2d2f69a62044728122a5b13cc89270f456f71b4f8119fb46a7606b1c01648
7	DIST dhcdbd-2.8.tar.bz2 56792 RMD160 e200683739f8f3f23fed64441231b99d72d48440 SHA1 d0ab01d5f6f64479b5c22ccefa725fe691cb4e34 SHA256 eb4c566509ea98f393e3488d1861f3a74f97438fb24551703fe6b2d00593f2b4	8	DIST dhcdbd-2.8.tar.bz2 56792 RMD160 e200683739f8f3f23fed64441231b99d72d48440 SHA1 d0ab01d5f6f64479b5c22ccefa725fe691cb4e34 SHA256 eb4c566509ea98f393e3488d1861f3a74f97438fb24551703fe6b2d00593f2b4
8	DIST dhcdbd-3.0.tar.bz2 56867 RMD160 f86abdeb5cc4f9cf2b9666057289d11cb453baae SHA1 e00dd158d63a7f0e77ec8bbe4455c75fcea71c11 SHA256 c62d5916dbd4d3148bd4deff355c3dfcb8092c2d9918d62dd24030e01c28361a	9	DIST dhcdbd-3.0.tar.bz2 56867 RMD160 f86abdeb5cc4f9cf2b9666057289d11cb453baae SHA1 e00dd158d63a7f0e77ec8bbe4455c75fcea71c11 SHA256 c62d5916dbd4d3148bd4deff355c3dfcb8092c2d9918d62dd24030e01c28361a
9	EBUILD dhcdbd-2.8-r1.ebuild 1369 RMD160 6a633ab6a320a90ec4e60338ea88631cbf739b7b SHA1 6cb23997cb5a4a0d438ea426ed72909b54593144 SHA256 aa860c7ea7eba103fb0d7570a5d2b29086851872c37eb9e04e55976362c98a9d	10	EBUILD dhcdbd-2.8-r1.ebuild 1369 RMD160 6a633ab6a320a90ec4e60338ea88631cbf739b7b SHA1 6cb23997cb5a4a0d438ea426ed72909b54593144 SHA256 aa860c7ea7eba103fb0d7570a5d2b29086851872c37eb9e04e55976362c98a9d
10	EBUILD dhcdbd-2.8.ebuild 1232 RMD160 8a77c84881e59f20900083de72e2433915440e75 SHA1 7a1ea393bc04b891053ffc98fb02f3c26c39a6dc SHA256 9d9564a5d127f6e5c627d7310b4f603dee61833ea7a5c8d7ebdfd2b9ebd135b7	11	EBUILD dhcdbd-2.8.ebuild 1232 RMD160 8a77c84881e59f20900083de72e2433915440e75 SHA1 7a1ea393bc04b891053ffc98fb02f3c26c39a6dc SHA256 9d9564a5d127f6e5c627d7310b4f603dee61833ea7a5c8d7ebdfd2b9ebd135b7
11	EBUILD dhcdbd-3.0.ebuild 1335 RMD160 ac986e63f976c45a0c6e2aec624603130f428834 SHA1 8744f8e415be0bafe6dc0e9acbb537e43ab3594c SHA256 571003467fe0a7d97cd771749dbb3f620e5dda13fb33f06fe703832b2ebcaed9	12	EBUILD dhcdbd-3.0.ebuild 1380 RMD160 59c58eec220d5073bff3cdadbf6a111bfe91f3ea SHA1 9fe8f1aee26c3dae80bdf1bc59908572d07f4a11 SHA256 eb014964b8f7460a4cda0c327443db829a88db7a3a9348c2cf37d5acc1ed032e
12	MISC ChangeLog 2959 RMD160 c4a55ecfdb27adc05cab07a595f854fa710e75b9 SHA1 71b97f628012ca822f0c69ee05f5ec0a45f766da SHA256 1e47cf8100d687e97eccddf3e6ba68cb61ce4fb502b2db9696e2a859c346449a	13	MISC ChangeLog 2959 RMD160 c4a55ecfdb27adc05cab07a595f854fa710e75b9 SHA1 71b97f628012ca822f0c69ee05f5ec0a45f766da SHA256 1e47cf8100d687e97eccddf3e6ba68cb61ce4fb502b2db9696e2a859c346449a
13	MISC metadata.xml 260 RMD160 3bd2ac88342783f1ced38fe5de95da8d94db7c1c SHA1 7bcafc6b129a5890b55be1edf868f2e8751e7307 SHA256 94e8a0c83eb641ff321069cd9c7ee00744ffecb329ff14dc3a76773a8d2e228c	14	MISC metadata.xml 260 RMD160 3bd2ac88342783f1ced38fe5de95da8d94db7c1c SHA1 7bcafc6b129a5890b55be1edf868f2e8751e7307 SHA256 94e8a0c83eb641ff321069cd9c7ee00744ffecb329ff14dc3a76773a8d2e228c

Line 0 Link Here

(-)dhcdbd.old/files/dhcdbd-3.0-location.patch (+17 lines)
	1	diff --git a/Makefile b/Makefile
	2	index 48175a7..f27bb4f 100644
	3	--- a/Makefile
	4	+++ b/Makefile
	5	@@ -16,10 +16,10 @@ clean:
	6	-rm -f *.tar.bz2
	7
	8	install: dhcdbd
	9	- mkdir -p $(DESTDIR)/sbin
	10	+ mkdir -p $(DESTDIR)/usr/sbin
	11	mkdir -p $(DESTDIR)/usr/share/dbus-1/services
	12	mkdir -p $(DESTDIR)/etc/dbus-1/system.d
	13	- install -m 0755 src/dhcdbd $(DESTDIR)/sbin/dhcdbd
	14	+ install -m 0755 src/dhcdbd $(DESTDIR)/usr/sbin/dhcdbd
	15	install -m 0644 dhcdbd.conf $(DESTDIR)/etc/dbus-1/system.d/dhcdbd.conf
	16	install -m 0644 dhcdbd.service $(DESTDIR)/usr/share/dbus-1/services/dhcdbd.service
	17