New upstream release. This is identical to 1.1.3-r1

Package-Manager: portage-2.1.4

5 files changed, 25 insertions, 137 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index b39237d14580..135796e5daba 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.203 2008/01/17 19:37:38 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.204 2008/01/17 21:26:13 steev Exp $
+
+*dbus-1.1.4 (17 Jan 2008)
+
+  17 Jan 2008; Steev Klimaszewski <steev@gentoo.org>
+  -files/dbus-inotify-fix-thoenig-01.patch, -dbus-1.1.3-r1.ebuild,
+  +dbus-1.1.4.ebuild:
+  New release candidate - the same as 1.1.3-r1 but upstream felt it was better
+  to release a new tarball
 
 *dbus-1.1.3-r1 (17 Jan 2008)
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 43413cff9afd..a7d03ebac8a4 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -6,28 +6,24 @@ AUX dbus-1.0.1-fixfilecreation.patch 474 RMD160 63e1a6737519773dc85b64098577a97b
 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-inotify-fix-thoenig-01.patch 3307 RMD160 a46b2b8787e42a00a079cd5326654c1d819d033f SHA1 c05035464e2208c5ab5f26d5bd802a9d693ccf26 SHA256 a604fb99e68423ea66e378ad2f79b707d08ae4042fb9e4e782158b458c1e2a91
-MD5 de9aefc17ba94252fc20aa4b9421b94e files/dbus-inotify-fix-thoenig-01.patch 3307
-RMD160 a46b2b8787e42a00a079cd5326654c1d819d033f files/dbus-inotify-fix-thoenig-01.patch 3307
-SHA256 a604fb99e68423ea66e378ad2f79b707d08ae4042fb9e4e782158b458c1e2a91 files/dbus-inotify-fix-thoenig-01.patch 3307
 AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
 MD5 58356b4db650a89312a670c02804c540 files/dbus.init-1.0 1152
 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 files/dbus.init-1.0 1152
 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98 files/dbus.init-1.0 1152
 DIST dbus-1.0.2.tar.gz 1400278 RMD160 d5eddfb058c4c026d4a9f091ad90abcc6e54861a SHA1 2870efd6ea0b5b0d14e52195f560238a74bb1e0e SHA256 8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca
-DIST dbus-1.1.3.tar.gz 1400207 RMD160 e8d3bd4015cda0e13482940105ff364a82021535 SHA1 173d546bf95a81e9b2741018f61a9896e7f21ae3 SHA256 964d8d15c1ed01d74efd8d4c74ed70bb137cc9ed152ab118de972a4968e51b5f
+DIST dbus-1.1.4.tar.gz 1400585 RMD160 22d08a6c00ac3cd0bcf97d7733f39af36bcbfb0b SHA1 f246dfbc7dadb8a11a413f3376fdcd22e52eb1e4 SHA256 4f8ff9324a5d363833833333193a3e83c074a51ce82d8c66c2e304b0378c714d
 EBUILD dbus-1.0.2-r2.ebuild 3410 RMD160 20a3ef3be71b4cc11dd18405a5412151c7718021 SHA1 cc5a0ded66095eb59525af5cbe6d97490b29b8de SHA256 c577d7abfac98323766581b38f0ad8e2b42f0b9823e09f48d1df5e8812e374de
 MD5 6850bcdf8dbe37eeed1025590bbba34d dbus-1.0.2-r2.ebuild 3410
 RMD160 20a3ef3be71b4cc11dd18405a5412151c7718021 dbus-1.0.2-r2.ebuild 3410
 SHA256 c577d7abfac98323766581b38f0ad8e2b42f0b9823e09f48d1df5e8812e374de dbus-1.0.2-r2.ebuild 3410
-EBUILD dbus-1.1.3-r1.ebuild 3245 RMD160 ad6dd6d52dd6a3b06189aa15131092f7c8b4bda3 SHA1 568ae63f22fdaede4d10bcf99edb146fb9e4c967 SHA256 d3d0a0f524c7c4780446b9a33ea318c5a347eab736ca7917ab8de69bf577bc88
-MD5 ff6a9df7b42f35cf49c5d8751f5290fe dbus-1.1.3-r1.ebuild 3245
-RMD160 ad6dd6d52dd6a3b06189aa15131092f7c8b4bda3 dbus-1.1.3-r1.ebuild 3245
-SHA256 d3d0a0f524c7c4780446b9a33ea318c5a347eab736ca7917ab8de69bf577bc88 dbus-1.1.3-r1.ebuild 3245
-MISC ChangeLog 30315 RMD160 311e4bfdb889a4d2e85f268cca3f8781d8a91bd3 SHA1 ade7f8f705d7ea4381c4e704d596cf028b9f22f4 SHA256 c16b3f23110abc4b76b36fb1e48723c6e9667827e49108ed173ec91bddb4cecf
-MD5 dd98b5e05bd75fa078465014130e8f54 ChangeLog 30315
-RMD160 311e4bfdb889a4d2e85f268cca3f8781d8a91bd3 ChangeLog 30315
-SHA256 c16b3f23110abc4b76b36fb1e48723c6e9667827e49108ed173ec91bddb4cecf ChangeLog 30315
+EBUILD dbus-1.1.4.ebuild 3144 RMD160 bc1862c9dfe3e403450ad9335c518a306566a59f SHA1 44e8a07ef4f5a3c8bcd6cf4b0791e66bb84208b3 SHA256 1ab0da39d3390df116525676f928445dc27a12c8ac48880e1b48a65c1c0607cc
+MD5 0b364d7e92021b28873f835aee576da9 dbus-1.1.4.ebuild 3144
+RMD160 bc1862c9dfe3e403450ad9335c518a306566a59f dbus-1.1.4.ebuild 3144
+SHA256 1ab0da39d3390df116525676f928445dc27a12c8ac48880e1b48a65c1c0607cc dbus-1.1.4.ebuild 3144
+MISC ChangeLog 30591 RMD160 c6c396366f69511423305a20f5264dafad4c7563 SHA1 9670639ba5d4ef55ef0a31afb7be2504f9b24f1a SHA256 7cdb3293d155292626a6fb66548652452db699eb67298c836c0dae58c7b7e6ef
+MD5 6d6242dabd152a1ca13f6bd9ac2d9a80 ChangeLog 30591
+RMD160 c6c396366f69511423305a20f5264dafad4c7563 ChangeLog 30591
+SHA256 7cdb3293d155292626a6fb66548652452db699eb67298c836c0dae58c7b7e6ef ChangeLog 30591
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -35,6 +31,6 @@ SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d metadata
 MD5 497fe5e3a5dfd951a073118e2de14adb files/digest-dbus-1.0.2-r2 235
 RMD160 a4e31868ed956d2fcdcd55cc71c7758d9d2bda8c files/digest-dbus-1.0.2-r2 235
 SHA256 f398ccc18d90f59f55f826046878cb5dd08b0b1abe1c5fd016b6dacb54891b88 files/digest-dbus-1.0.2-r2 235
-MD5 25f9ca49ad801d78594d65cd6d90a217 files/digest-dbus-1.1.3-r1 235
-RMD160 a7b40d826dd918746382f126727b57a4da0ed72b files/digest-dbus-1.1.3-r1 235
-SHA256 fc0bb406d8aae7f539afe18cd8e5e5d806bf09ef0b105d64f3a31f8f2e9b3eca files/digest-dbus-1.1.3-r1 235
+MD5 198ad70f2c7d8a2f145f1252f0e03857 files/digest-dbus-1.1.4 235
+RMD160 86435c12f940c58292dad7dbd074f379567c841c files/digest-dbus-1.1.4 235
+SHA256 6b4b32e9e7cbf8ff7df329e8e7bf570271e1d42f5e3d5f72c24c60d64fed56a8 files/digest-dbus-1.1.4 235
diff --git a/sys-apps/dbus/dbus-1.1.3-r1.ebuild b/sys-apps/dbus/dbus-1.1.4.ebuild
index 976ed260ca33..8630d5d3cb5b 100644
--- a/sys-apps/dbus/dbus-1.1.3-r1.ebuild
+++ b/sys-apps/dbus/dbus-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.1.3-r1.ebuild,v 1.1 2008/01/17 19:37:38 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.1.4.ebuild,v 1.1 2008/01/17 21:26:13 steev Exp $
 
 inherit eutils multilib autotools flag-o-matic
 
@@ -23,12 +23,6 @@ DEPEND="${RDEPEND}
 	doc? (	app-doc/doxygen
 		app-text/xmlto )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/dbus-inotify-fix-thoenig-01.patch"
-}
-
 src_compile() {
 	# so we can get backtraces from apps
 	append-flags -rdynamic
diff --git a/sys-apps/dbus/files/dbus-inotify-fix-thoenig-01.patch b/sys-apps/dbus/files/dbus-inotify-fix-thoenig-01.patch
deleted file mode 100644
index ad1acfef1bc1..000000000000
--- a/sys-apps/dbus/files/dbus-inotify-fix-thoenig-01.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c
---- a/bus/dir-watch-inotify.c
-+++ b/bus/dir-watch-inotify.c
-@@ -38,6 +38,8 @@
- #include "dir-watch.h"
- 
- #define MAX_DIRS_TO_WATCH 128
-+#define INOTIFY_EVENT_SIZE (sizeof(struct inotify_event))
-+#define INOTIFY_BUF_LEN (1024 * (INOTIFY_EVENT_SIZE + 16))
- 
- /* use a static array to avoid handling OOM */
- static int wds[MAX_DIRS_TO_WATCH];
-@@ -55,33 +57,43 @@ _inotify_watch_callback (DBusWatch *watch, unsigned int condition, void *data)
- static dbus_bool_t
- _handle_inotify_watch (DBusWatch *watch, unsigned int flags, void *data)
- {
--  struct inotify_event ev;
--  size_t res;
-+  char buffer[INOTIFY_BUF_LEN];
-+  ssize_t ret = 0;
-+  int i = 0;
-   pid_t pid;
- 
--  res = read (inotify_fd, &ev, sizeof(ev));
-+  ret = read (inotify_fd, buffer, INOTIFY_BUF_LEN);
-+  if (ret < 0)
-+    _dbus_verbose ("Error reading inotify event: '%s'\n, _dbus_strerror(errno)");
-+  else if (!ret)
-+    _dbus_verbose ("Error reading inotify event: buffer too small\n");
- 
--  if (res > 0)
-+  while (i < ret)
-     {
--      pid = getpid ();
-+      struct inotify_event *ev;
-+      pid = _dbus_getpid ();
-+
-+      ev = (struct inotify_event *) &buffer[i];
-+      i += INOTIFY_EVENT_SIZE + ev->len;
-+#ifdef DBUS_ENABLE_VERBOSE_MODE
-+      if (ev->len)
-+        _dbus_verbose ("event name: '%s'\n", ev->name);
-+      _dbus_verbose ("inotify event: wd=%d mask=%u cookie=%u len=%u\n", ev->wd, ev->mask, ev->cookie, ev->len);
-+#endif
-       _dbus_verbose ("Sending SIGHUP signal on reception of a inotify event\n");
-       (void) kill (pid, SIGHUP);
-     }
--  else if (res < 0 && errno == EBADF)
-+
-+  if (watch != NULL)
-     {
--      if (watch != NULL)
--	{
--	  _dbus_loop_remove_watch (loop, watch, _inotify_watch_callback, NULL);
--          _dbus_watch_unref (watch);
--	  watch = NULL;
--	}
--      pid = getpid ();
--      _dbus_verbose ("Sending SIGHUP signal since inotify fd has been closed\n");
--      (void) kill (pid, SIGHUP);
-+      _dbus_loop_remove_watch (loop, watch, _inotify_watch_callback, NULL);
-+      _dbus_watch_unref (watch);
-+      watch = NULL;
-     }
--
-+ 
-   return TRUE;
- }
-+
- void
- bus_watch_directory (const char *dir, BusContext *context)
- {
-@@ -116,14 +128,13 @@ bus_watch_directory (const char *dir, BusContext *context)
- 	  }
-   }
- 
--
-   if (num_wds >= MAX_DIRS_TO_WATCH )
-     {
-       _dbus_warn ("Cannot watch config directory '%s'. Already watching %d directories\n", dir, MAX_DIRS_TO_WATCH);
-       goto out;
-     }
- 
--  wd = inotify_add_watch (inotify_fd, dir, IN_MODIFY);
-+  wd = inotify_add_watch (inotify_fd, dir, IN_MODIFY | IN_CREATE | IN_DELETE);
-   if (wd < 0)
-     {
-       _dbus_warn ("Cannot setup inotify for '%s'; error '%s'\n", dir, _dbus_strerror (errno));
-@@ -140,17 +151,13 @@ bus_watch_directory (const char *dir, BusContext *context)
- void 
- bus_drop_all_directory_watches (void)
- {
--  int i;
-- 
-+  int ret;
-+
-   _dbus_verbose ("Dropping all watches on config directories\n");
-- 
--  for (i = 0; i < num_wds; i++)
--    {
--      if (inotify_rm_watch(inotify_fd, wds[i]) != 0)
--	{
--	  _dbus_verbose ("Error closing fd %d for config directory watch\n", wds[i]);
--	}
--    }
--  
-+  ret = close (inotify_fd);
-+  if (ret)
-+    _dbus_verbose ("Error dropping watches: '%s'\n", perror(ret));
-+
-   num_wds = 0;
-+  inotify_fd = -1;
- }
diff --git a/sys-apps/dbus/files/digest-dbus-1.1.4 b/sys-apps/dbus/files/digest-dbus-1.1.4
new file mode 100644
index 000000000000..c741e3a8203e
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-1.1.4
@@ -0,0 +1,3 @@
+MD5 e08fdf702cae648acd9780eca0ce4df6 dbus-1.1.4.tar.gz 1400585
+RMD160 22d08a6c00ac3cd0bcf97d7733f39af36bcbfb0b dbus-1.1.4.tar.gz 1400585
+SHA256 4f8ff9324a5d363833833333193a3e83c074a51ce82d8c66c2e304b0378c714d dbus-1.1.4.tar.gz 1400585