diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-08-08 20:45:16 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-08-08 20:45:16 +0000 |
| commit | 0adfeec291eb179019b124991dcf4215a9e67e48 (patch) | |
| tree | 66f005d2758a23325cd6120e420697f1679a15f4 /sys-apps/dbus | |
| parent | Fixing build against glibc 2.10, bug #279787 (diff) | |
| download | gentoo-2-0adfeec291eb179019b124991dcf4215a9e67e48.tar.gz gentoo-2-0adfeec291eb179019b124991dcf4215a9e67e48.tar.bz2 gentoo-2-0adfeec291eb179019b124991dcf4215a9e67e48.zip | |
Add patch from upstream to fix check for cloexec (bug #280299). No revbump, but it didn't use cloexec there before.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/dbus')
| -rw-r--r-- | sys-apps/dbus/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/dbus/dbus-1.3.0.ebuild | 5 | ||||
| -rw-r--r-- | sys-apps/dbus/files/dbus-1.3.0-no-cloexec.patch | 21 |
3 files changed, 30 insertions, 3 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index 63be0430207c..5f72540eee15 100644 --- a/sys-apps/dbus/ChangeLog +++ b/sys-apps/dbus/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/dbus # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.238 2009/08/08 19:25:26 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.239 2009/08/08 20:45:16 flameeyes Exp $ + + 08 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org> dbus-1.3.0.ebuild, + +files/dbus-1.3.0-no-cloexec.patch: + Add patch from upstream to fix check for cloexec (bug #280299). No + revbump, but it didn't use cloexec there before. 08 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org> dbus-1.3.0.ebuild: Remove ~x86-fbsd keyword as per bug #280299 for now. diff --git a/sys-apps/dbus/dbus-1.3.0.ebuild b/sys-apps/dbus/dbus-1.3.0.ebuild index 3639502be17e..a42ea3ad8d44 100644 --- a/sys-apps/dbus/dbus-1.3.0.ebuild +++ b/sys-apps/dbus/dbus-1.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.3.0.ebuild,v 1.4 2009/08/08 19:25:26 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.3.0.ebuild,v 1.5 2009/08/08 20:45:16 flameeyes Exp $ inherit autotools eutils multilib flag-o-matic @@ -10,7 +10,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz" LICENSE="|| ( GPL-2 AFL-2.1 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="debug doc selinux test X" RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 ) @@ -31,6 +31,7 @@ src_unpack() { sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \ -e '/"dispatch"/d' -i "${S}/bus/test-main.c" epatch "${FILESDIR}"/${P}-asneeded.patch + epatch "${FILESDIR}"/${P}-no-cloexec.patch # required for asneeded patch but also for bug 263909, cross-compile so # don't remove eautoreconf eautoreconf diff --git a/sys-apps/dbus/files/dbus-1.3.0-no-cloexec.patch b/sys-apps/dbus/files/dbus-1.3.0-no-cloexec.patch new file mode 100644 index 000000000000..ba76eec00ec4 --- /dev/null +++ b/sys-apps/dbus/files/dbus-1.3.0-no-cloexec.patch @@ -0,0 +1,21 @@ +commit a8cf509a06cdc42568e446dea8a54a398e1c003b +Author: Benjamin Reed <rangerrick@befunk.com> +Date: Wed Jul 22 08:47:51 2009 -0400 + + Fix compilation on non-Linux: the F_DUPFD_CLOEXEC check was reversed + + Signed-off-by: Thiago Macieira <thiago@kde.org> + +diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c +index f0f1e70..e60e614 100644 +--- a/dbus/dbus-sysdeps-unix.c ++++ b/dbus/dbus-sysdeps-unix.c +@@ -3043,7 +3043,7 @@ _dbus_dup(int fd, + return -1; + } + +-#ifndef F_DUPFD_CLOEXEC ++#ifdef F_DUPFD_CLOEXEC + if (!cloexec_done) + #endif + { |