From 2439b3517e9a1c7a154f6d8ae80c29d478d82e89 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@gentoo.org>
Date: Mon, 4 Dec 2006 17:33:35 +0000
Subject: [PATCH] Fix dnotify on file creation Package-Manager:
 portage-2.1.2_rc2-r3

---
 sys-apps/dbus/ChangeLog                       |   9 +-
 sys-apps/dbus/Manifest                        |  33 +++--
 sys-apps/dbus/dbus-1.0.1-r1.ebuild            |   5 +-
 sys-apps/dbus/dbus-1.0.1-r2.ebuild            | 119 ++++++++++++++++++
 .../files/dbus-1.0.1-fixfilecreation.patch    |  11 ++
 sys-apps/dbus/files/digest-dbus-1.0.1-r2      |   3 +
 6 files changed, 167 insertions(+), 13 deletions(-)
 create mode 100644 sys-apps/dbus/dbus-1.0.1-r2.ebuild
 create mode 100644 sys-apps/dbus/files/dbus-1.0.1-fixfilecreation.patch
 create mode 100644 sys-apps/dbus/files/digest-dbus-1.0.1-r2

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 647e373e12c5..8f9762b38a31 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.156 2006/12/02 20:21:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.157 2006/12/04 17:33:35 cardoe Exp $
+
+*dbus-1.0.1-r2 (04 Dec 2006)
+
+  04 Dec 2006; Doug Goldstein <cardoe@gentoo.org>
+  +files/dbus-1.0.1-fixfilecreation.patch, dbus-1.0.1-r1.ebuild,
+  +dbus-1.0.1-r2.ebuild:
+  Fix dnotify on file creation
 
   02 Dec 2006; Doug Goldstein <cardoe@gentoo.org> dbus-0.62-r1.ebuild:
   Fix bug #156225. Masking -fstack-protector-all
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 8e5101d8f982..2d11ee98d32c 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -33,6 +33,10 @@ AUX dbus-0.61-qt-disabling.patch 501 RMD160 a7c1af95cc8dd455387eefad00fa90d86015
 MD5 1d1c73d8eea0a6f4ffe70c8091409ad0 files/dbus-0.61-qt-disabling.patch 501
 RMD160 a7c1af95cc8dd455387eefad00fa90d86015bbda files/dbus-0.61-qt-disabling.patch 501
 SHA256 acfd9f175223cb2679d37b941cae9d54adbd494be3c0f4f7be7e004c0bd02a20 files/dbus-0.61-qt-disabling.patch 501
+AUX dbus-1.0.1-fixfilecreation.patch 474 RMD160 63e1a6737519773dc85b64098577a97bae7ef6cc SHA1 a4748d3db24f425bd8ed2409bf225d01ced11640 SHA256 183ec284a385b3ef724abbcebd10e42765d81212d23e269c473fb3772f9ab2a3
+MD5 c2cbbace7965e670bb95daa896dcfee2 files/dbus-1.0.1-fixfilecreation.patch 474
+RMD160 63e1a6737519773dc85b64098577a97bae7ef6cc files/dbus-1.0.1-fixfilecreation.patch 474
+SHA256 183ec284a385b3ef724abbcebd10e42765d81212d23e269c473fb3772f9ab2a3 files/dbus-1.0.1-fixfilecreation.patch 474
 AUX dbus-1.0.1-pthread-holder-fix.diff 1452 RMD160 857f36030a5c1c5a07574cd668b2768e9dc97a47 SHA1 0a360cf98af768c4266d62ef4aa238b0a0245094 SHA256 22b258be44f2e64c975824a777fd70469235f31700b3c71956451b94c24fa8a1
 MD5 fc972b7f0c89bbae82c534e898300c82 files/dbus-1.0.1-pthread-holder-fix.diff 1452
 RMD160 857f36030a5c1c5a07574cd668b2768e9dc97a47 files/dbus-1.0.1-pthread-holder-fix.diff 1452
@@ -56,18 +60,22 @@ EBUILD dbus-0.62-r1.ebuild 4108 RMD160 fef099d67a88e2e7fc8070a1ae6818ebc8f30e19
 MD5 735fb1f6c2dbde38da32c867da4bbe31 dbus-0.62-r1.ebuild 4108
 RMD160 fef099d67a88e2e7fc8070a1ae6818ebc8f30e19 dbus-0.62-r1.ebuild 4108
 SHA256 f30631bff35889d81ec42fe7cdd92e5457f0c48eb02af7486d03b0eeac649d38 dbus-0.62-r1.ebuild 4108
-EBUILD dbus-1.0.1-r1.ebuild 3247 RMD160 b6297079a3ac2dce6b72b364198c49a7420fdb40 SHA1 86c3e0baff5ff827812386b86a4c2bdce809c7db SHA256 b24159ab36c63695a31efa7f1bec038bfe6165e97544f452ea4870ff95a60b4c
-MD5 c15c430f57d16cf97ce528c2f39c30cf dbus-1.0.1-r1.ebuild 3247
-RMD160 b6297079a3ac2dce6b72b364198c49a7420fdb40 dbus-1.0.1-r1.ebuild 3247
-SHA256 b24159ab36c63695a31efa7f1bec038bfe6165e97544f452ea4870ff95a60b4c dbus-1.0.1-r1.ebuild 3247
+EBUILD dbus-1.0.1-r1.ebuild 3358 RMD160 6f4831867a0b85d4dd307126105f2f670646d1e4 SHA1 423f56aa09609313260409cbaf1082c9b1051c92 SHA256 6bedb502658d5d4616865d5f20af3630f54ff3365371377d49170a98a826a5e8
+MD5 d6864c3920aa15110a6a75439d425bd3 dbus-1.0.1-r1.ebuild 3358
+RMD160 6f4831867a0b85d4dd307126105f2f670646d1e4 dbus-1.0.1-r1.ebuild 3358
+SHA256 6bedb502658d5d4616865d5f20af3630f54ff3365371377d49170a98a826a5e8 dbus-1.0.1-r1.ebuild 3358
+EBUILD dbus-1.0.1-r2.ebuild 3358 RMD160 450234f0d4b61ae0b326e65d3f6e75176eb71819 SHA1 b65d5150692acf0680fe2b667d014fc611b0ca18 SHA256 31859c32aac068a9b68a3c155fcd8545db809d7fff25dbc855716e1f7fce6791
+MD5 226b0a824c0b6cc8d4baef6c53fc664a dbus-1.0.1-r2.ebuild 3358
+RMD160 450234f0d4b61ae0b326e65d3f6e75176eb71819 dbus-1.0.1-r2.ebuild 3358
+SHA256 31859c32aac068a9b68a3c155fcd8545db809d7fff25dbc855716e1f7fce6791 dbus-1.0.1-r2.ebuild 3358
 EBUILD dbus-1.0.1.ebuild 3102 RMD160 7f706fe4e5562632013d37451659571e961bd345 SHA1 e1a8875ba5d2daba1d238252928eaa79eca6f9db SHA256 3d2184db88b553da8133f35cff021e5be306308b7a03a0167bb9aa0c15393d96
 MD5 c2c615188b6f44d24e189801d52eabc7 dbus-1.0.1.ebuild 3102
 RMD160 7f706fe4e5562632013d37451659571e961bd345 dbus-1.0.1.ebuild 3102
 SHA256 3d2184db88b553da8133f35cff021e5be306308b7a03a0167bb9aa0c15393d96 dbus-1.0.1.ebuild 3102
-MISC ChangeLog 23329 RMD160 ccc7f9375496cb390a79f8f264198e0a14bb5805 SHA1 022008bcf5f11d3f20eb1461608814e793ef81b5 SHA256 71ed383b54c7bd2a7121c55924462fa153b893dc0eb88fa320269bd4146aaf84
-MD5 c0fedceb9cc60e0582053f376011a33f ChangeLog 23329
-RMD160 ccc7f9375496cb390a79f8f264198e0a14bb5805 ChangeLog 23329
-SHA256 71ed383b54c7bd2a7121c55924462fa153b893dc0eb88fa320269bd4146aaf84 ChangeLog 23329
+MISC ChangeLog 23531 RMD160 874dc539193e6934f9081c8f8ed504cfa07e05bd SHA1 0c4e0b69c67fa63d64b8fdd2c368af58e1a8ee28 SHA256 1723b616282de9aabce878d0e6b2b1225fd58f9c176f48f7ece7adcbb24f0f13
+MD5 3e1e938e822a031b42da40da808639a4 ChangeLog 23531
+RMD160 874dc539193e6934f9081c8f8ed504cfa07e05bd ChangeLog 23531
+SHA256 1723b616282de9aabce878d0e6b2b1225fd58f9c176f48f7ece7adcbb24f0f13 ChangeLog 23531
 MISC metadata.xml 222 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc SHA1 d2b55bed5d827913edafe6777b37d03c352d9adf SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf
 MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222
 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc metadata.xml 222
@@ -84,10 +92,13 @@ SHA256 4cbf0ae7597954ff8a66c880022b416c7bc114a5075a130cb9da8c6de139cf0b files/di
 MD5 bab4ebd671999e500c31bd05e32fc296 files/digest-dbus-1.0.1-r1 235
 RMD160 3429f1e05c33fc85515246a181c9fa3680258fdc files/digest-dbus-1.0.1-r1 235
 SHA256 4cbf0ae7597954ff8a66c880022b416c7bc114a5075a130cb9da8c6de139cf0b files/digest-dbus-1.0.1-r1 235
+MD5 bab4ebd671999e500c31bd05e32fc296 files/digest-dbus-1.0.1-r2 235
+RMD160 3429f1e05c33fc85515246a181c9fa3680258fdc files/digest-dbus-1.0.1-r2 235
+SHA256 4cbf0ae7597954ff8a66c880022b416c7bc114a5075a130cb9da8c6de139cf0b files/digest-dbus-1.0.1-r2 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFceJIoeSe8B0zEfwRAttWAJ0TjKAvR+mDBHAv9ChljnVUlaVJWACfbkQh
-UJHTwoS+/UqDMEKxx5gDsrU=
-=6ipd
+iD8DBQFFdFvuoeSe8B0zEfwRAtVtAJ42Oz7t8tXtC5lN8qQWUwLtPLfwQACfRBbh
+EIiqEKI0cAqQmKbJ+y/nkL4=
+=jF5E
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.0.1-r1.ebuild b/sys-apps/dbus/dbus-1.0.1-r1.ebuild
index 266fbe8549b4..7e33a2f71d0a 100644
--- a/sys-apps/dbus/dbus-1.0.1-r1.ebuild
+++ b/sys-apps/dbus/dbus-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.0.1-r1.ebuild,v 1.1 2006/11/19 17:32:33 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.0.1-r1.ebuild,v 1.2 2006/12/04 17:33:35 cardoe Exp $
 
 WANT_AUTOCONF=2.5
 inherit eutils multilib debug autotools
@@ -30,6 +30,9 @@ src_unpack() {
 
 	# fix assertion failure with pthreads
 	epatch "${FILESDIR}"/${PN}-1.0.1-pthread-holder-fix.diff
+
+	# fix dnotify issue with not detecting created files
+	epatch "${FILESDIR}"/${PN}-1.0.1-fixfilecreation.patch
 }
 
 src_compile() {
diff --git a/sys-apps/dbus/dbus-1.0.1-r2.ebuild b/sys-apps/dbus/dbus-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..90aec7660373
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.0.1-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.0.1-r2.ebuild,v 1.1 2006/12/04 17:33:35 cardoe Exp $
+
+WANT_AUTOCONF=2.5
+inherit eutils multilib debug autotools
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="http://dbus.freedesktop.org/"
+SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc selinux X"
+
+RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
+	selinux? ( sys-libs/libselinux )
+	>=dev-libs/expat-1.95.8
+	!<sys-apps/dbus-0.91"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (	app-doc/doxygen
+		app-text/xmlto )"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# fix assertion failure with pthreads
+	epatch "${FILESDIR}"/${PN}-1.0.1-pthread-holder-fix.diff
+
+	# fix dnotify issue with not detecting created files
+	epatch "${FILESDIR}"/${PN}-1.0.1-fixfilecreation.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	hasq test ${FEATURES} && myconf="${myconf} --enable-tests=yes"
+
+	econf \
+		$(use_with X x) \
+		$(use_enable kernel_linux dnotify) \
+		$(use_enable kernel_FreeBSD kqueue) \
+		$(use_enable selinux) \
+		$(use_enable debug verbose-mode) \
+		$(use_enable debug asserts) \
+		--with-xml=expat \
+		--with-system-pid-file=/var/run/dbus.pid \
+		--with-system-socket=/var/run/dbus/system_bus_socket \
+		--with-session-socket-dir=/tmp \
+		--with-dbus-user=messagebus \
+		--localstatedir=/var \
+		$(use_enable doc doxygen-docs) \
+		--disable-xml-docs \
+		${myconf} \
+		|| die "econf failed"
+
+	# after the compile, it uses a selinuxfs interface to
+	# check if the SELinux policy has the right support
+	use selinux && addwrite /selinux/access
+
+	emake || die "make failed"
+}
+
+src_test() {
+	DBUS_VERBOSE=1 make check || die "make check failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# initscript
+	newinitd "${FILESDIR}"/dbus.init-1.0 dbus
+
+	# dbus X session script (#77504)
+	# turns out to only work for GDM. has been merged into other desktop
+	# (kdm and such scripts)
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}"/30-dbus
+
+	# needs to exist for the system socket
+	keepdir /var/run/dbus
+	# needs to exist for machine id
+	keepdir /var/lib/dbus
+
+	keepdir /usr/lib/dbus-1.0/services
+	keepdir /usr/share/dbus-1/services
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
+	if use doc; then
+		dohtml doc/*html
+	fi
+}
+
+pkg_preinst() {
+	enewgroup messagebus || die "Problem adding messagebus group"
+	enewuser messagebus -1 "-1" -1 messagebus || die "Problem adding messagebus user"
+}
+
+pkg_postinst() {
+	elog "To start the D-Bus system-wide messagebus by default"
+	elog "you should add it to the default runlevel :"
+	elog "\`rc-update add dbus default\`"
+	elog
+	elog "If dbus is already installed and running,"
+	elog "run etc-update and then run the following:"
+	elog "\`/etc/init.d/dbus reload\`"
+	elog "This will cause it to reload it's configs but"
+	elog "*not* run the newest version you just installed."
+	elog "You must tell it to restart for that to happen,"
+	elog "however not all apps can handle a D-Bus restart."
+	elog
+	ewarn
+	ewarn "You MUST run 'revdep-rebuild' after emerging this package"
+	ewarn
+}
diff --git a/sys-apps/dbus/files/dbus-1.0.1-fixfilecreation.patch b/sys-apps/dbus/files/dbus-1.0.1-fixfilecreation.patch
new file mode 100644
index 000000000000..0dabf2cc68cd
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-1.0.1-fixfilecreation.patch
@@ -0,0 +1,11 @@
+--- dbus-1.0.0/bus/dir-watch-dnotify.c.fixfilecreation	2006-11-22 14:24:01.000000000 +0100
++++ dbus-1.0.0/bus/dir-watch-dnotify.c	2006-11-22 14:26:06.000000000 +0100
+@@ -57,7 +57,7 @@
+       goto out;
+     }
+ 
+-  if (fcntl (fd, F_NOTIFY, DN_DELETE|DN_RENAME|DN_MODIFY) == -1)
++  if (fcntl (fd, F_NOTIFY, DN_CREATE|DN_DELETE|DN_RENAME|DN_MODIFY) == -1)
+     {
+       _dbus_warn ("Cannot setup D_NOTIFY for '%s' error '%s'\n", dir, _dbus_strerror (errno));
+       close (fd);
diff --git a/sys-apps/dbus/files/digest-dbus-1.0.1-r2 b/sys-apps/dbus/files/digest-dbus-1.0.1-r2
new file mode 100644
index 000000000000..7660510d0186
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-1.0.1-r2
@@ -0,0 +1,3 @@
+MD5 52c70d18fe0b398f5de3b8a18a589960 dbus-1.0.1.tar.gz 1406595
+RMD160 2270f27d9314f0e7b99540f0aa1902b8d0d7343d dbus-1.0.1.tar.gz 1406595
+SHA256 6e0730a39485fb502d640841f0f328c1a0212743f17b3fa61c78e6e32925f061 dbus-1.0.1.tar.gz 1406595
-- 
2.26.2