Fix compile bug when using FORTIFY_SOURCE: open with O_CREAT in second argument

    needs 3 arguments, bug #232084
Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

7 files changed, 33 insertions, 65 deletions

diff --git a/net-misc/dhcdbd/ChangeLog b/net-misc/dhcdbd/ChangeLog
index c9fa9755f900..1218c7ec9ef9 100644
--- a/net-misc/dhcdbd/ChangeLog
+++ b/net-misc/dhcdbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dhcdbd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcdbd/ChangeLog,v 1.15 2008/02/29 03:12:57 ranger Exp $
+# 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
diff --git a/net-misc/dhcdbd/Manifest b/net-misc/dhcdbd/Manifest
index e19fe6d33e77..fa2d1b5108e8 100644
--- a/net-misc/dhcdbd/Manifest
+++ b/net-misc/dhcdbd/Manifest
@@ -1,13 +1,12 @@
 AUX dhcdbd-2.5-fixes.patch 2069 RMD160 f886dee19510300b9c8df97dd81cc3e83a4b9cad SHA1 eb8228340f3679bb0335cbb7001a262bc437964a SHA256 e4640f549140668d8966eae365cb332d42ac340ae27a0e85eeb1e53b06ed7fe8
-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-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 1369 RMD160 6a633ab6a320a90ec4e60338ea88631cbf739b7b SHA1 6cb23997cb5a4a0d438ea426ed72909b54593144 SHA256 aa860c7ea7eba103fb0d7570a5d2b29086851872c37eb9e04e55976362c98a9d
-EBUILD dhcdbd-2.8.ebuild 1232 RMD160 8a77c84881e59f20900083de72e2433915440e75 SHA1 7a1ea393bc04b891053ffc98fb02f3c26c39a6dc SHA256 9d9564a5d127f6e5c627d7310b4f603dee61833ea7a5c8d7ebdfd2b9ebd135b7
-EBUILD dhcdbd-3.0.ebuild 1335 RMD160 ac986e63f976c45a0c6e2aec624603130f428834 SHA1 8744f8e415be0bafe6dc0e9acbb537e43ab3594c SHA256 571003467fe0a7d97cd771749dbb3f620e5dda13fb33f06fe703832b2ebcaed9
-MISC ChangeLog 2959 RMD160 c4a55ecfdb27adc05cab07a595f854fa710e75b9 SHA1 71b97f628012ca822f0c69ee05f5ec0a45f766da SHA256 1e47cf8100d687e97eccddf3e6ba68cb61ce4fb502b2db9696e2a859c346449a
+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
diff --git a/net-misc/dhcdbd/dhcdbd-2.8-r1.ebuild b/net-misc/dhcdbd/dhcdbd-2.8-r1.ebuild
index 3a207bee5109..6f7855463764 100644
--- a/net-misc/dhcdbd/dhcdbd-2.8-r1.ebuild
+++ b/net-misc/dhcdbd/dhcdbd-2.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.5 2007/08/28 14:35:09 nixnut Exp $
+# $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
 
@@ -15,24 +15,25 @@ 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
+	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
+	#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
+	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
+	newinitd "${FILESDIR}"/dhcdbd.init dhcdbd
+	newconfd "${FILESDIR}"/dhcdbd.confd dhcdbd
 }
 
 pkg_postinst() {
diff --git a/net-misc/dhcdbd/dhcdbd-2.8.ebuild b/net-misc/dhcdbd/dhcdbd-2.8.ebuild
deleted file mode 100644
index 87a2649b5205..000000000000
--- a/net-misc/dhcdbd/dhcdbd-2.8.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-2.8.ebuild,v 1.2 2007/07/16 21:44:27 seemant 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."
-	einfo "If you feel you need to use it without that, simply add it to your"
-	einfo "runlevel by issuing the following command:"
-	einfo "rc-update add dhcdbd default"
-}
diff --git a/net-misc/dhcdbd/dhcdbd-3.0.ebuild b/net-misc/dhcdbd/dhcdbd-3.0.ebuild
index ce5473f8723a..661f79b15490 100644
--- a/net-misc/dhcdbd/dhcdbd-3.0.ebuild
+++ b/net-misc/dhcdbd/dhcdbd-3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.5 2008/02/29 03:12:57 ranger Exp $
+# $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
 
@@ -16,23 +16,24 @@ 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
+	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
+	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
+	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
+	newinitd "${FILESDIR}"/dhcdbd.init dhcdbd
+	newconfd "${FILESDIR}"/dhcdbd.confd dhcdbd
 }
 
 pkg_postinst() {
diff --git a/net-misc/dhcdbd/files/dhcdbd-2.8-daemon.patch b/net-misc/dhcdbd/files/dhcdbd-2.8-daemon.patch
index 342ce0da8d70..9f65a6e00c33 100644
--- a/net-misc/dhcdbd/files/dhcdbd-2.8-daemon.patch
+++ b/net-misc/dhcdbd/files/dhcdbd-2.8-daemon.patch
@@ -19,7 +19,7 @@ diff -ur a b
 +        if (dhcdbd_daemonize && (daemon (0, 0) == -1))
 +                return errno;
 +		unlink (DHCDBD_PID_FILE);
-+        if ((fd = open (DHCDBD_PID_FILE, O_WRONLY | O_CREAT)) == -1)
++        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);
diff --git a/net-misc/dhcdbd/files/dhcdbd-3.0-daemon.patch b/net-misc/dhcdbd/files/dhcdbd-3.0-daemon.patch
index 23534d386aca..a5730fcbe000 100644
--- a/net-misc/dhcdbd/files/dhcdbd-3.0-daemon.patch
+++ b/net-misc/dhcdbd/files/dhcdbd-3.0-daemon.patch
@@ -19,7 +19,7 @@ diff -ruN dhcdbd-3.0.orig/src/dhcdbd.c dhcdbd-3.0/src/dhcdbd.c
 +        if (dhcdbd_daemonize && (daemon (0, 0) == -1))
 +                return errno;
 +               unlink (DHCDBD_PID_FILE);
-+        if ((fd = open (DHCDBD_PID_FILE, O_WRONLY | O_CREAT)) == -1)
++        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);