New upstream release, includes the 2 patches we had applied to 1.2.18.

Package-Manager: portage-2.1.7.17/cvs/Linux i686

5 files changed, 13 insertions, 387 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index a69870b051ca..dbd20d202e7c 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.243 2010/02/03 16:07:35 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.244 2010/02/03 19:34:32 steev Exp $
+
+*dbus-1.2.20 (03 Feb 2010)
+
+  03 Feb 2010; <steev@gentoo.org> -files/0001-Fix-inotify-shutdown.patch,
+  -dbus-1.2.18.ebuild,
+  -files/0002-Fix-compilation-in-disable-selinux-case.patch,
+  +dbus-1.2.20.ebuild:
+  New upstream release, includes the 2 patches we had applied to 1.2.18
 
 *dbus-1.2.18 (03 Feb 2010)
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index b00eb0266d9d..2cfb3ea8e937 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,5 +1,3 @@
-AUX 0001-Fix-inotify-shutdown.patch 4852 RMD160 b4c2c8cd4b90caea5329210e4ec66beaed9c4522 SHA1 6ebcedc07573369a28e42f00515e49d29d7ecc68 SHA256 4d99ad3bda8952621e5a9225c650e79d59bc8367eb66b75070dee1f4e47c3a2a
-AUX 0002-Fix-compilation-in-disable-selinux-case.patch 5468 RMD160 7092f69f06ef0f375e8dabaa2992a2659f7d1b21 SHA1 31118d4860d8f1e8f19e64f998426987ac252f17 SHA256 d6a52073c3d2d1717589dad897d79596848658821bd661d1171543b710a6d352
 AUX 30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 SHA1 35ee3a5d3db9c7e372603ce916e17a41edd01d36 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d
 AUX dbus-1.2.3-bsd.patch 1638 RMD160 9a134c5e1ccc1215d0579a02568a5707ad39e484 SHA1 061787f8131f33ccf07f11e04e6a327372de1c69 SHA256 0428d70451344153c6bf44f12d04fb7732070abf44d0d162ad995de5a9a24f1e
 AUX dbus-1.2.3-panic-from-dbus_signature_validate.patch 1064 RMD160 a7a587fb604f94f8d064c21d0adfae080edc1a80 SHA1 309faf628e3a207985c79afd2789b8cce696eed6 SHA256 455e2834b71878b3ea1ff9f0b678c8890b2c25f0c309c96c4a8e5551e23bca68
@@ -7,13 +5,13 @@ AUX dbus-1.3.0-asneeded.patch 3655 RMD160 31d3eef602d1d95adfe548285e00c25699f5d0
 AUX dbus-1.3.0-no-cloexec.patch 578 RMD160 74403299da1ab2224738cd9770462cf5e1d037ee SHA1 5ff5856e4fc1a10bcdd841e2c0650e417badade6 SHA256 aba67f8431dd66619c0f6105b99fc887d0b0da90f86765ef56eb1919d822249e
 AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
 DIST dbus-1.2.12.tar.gz 1574756 RMD160 779d76320f1343dae7447c82a683e372e6c11729 SHA1 13de8dc28c9edae7b9d2928ff691549bb2bef21a SHA256 b2ec81e7d9fa5e24f67baccfd9af2755a7797a65cb4c3cad10d023867f2bd220
-DIST dbus-1.2.18.tar.gz 1668410 RMD160 075851c5d6224ef8fa0b0571c05d2fd209412db3 SHA1 721ad8d1e876564e30e4ebf9fcbdbbf26eadc712 SHA256 ec52551a19a608d6af176371bc22801ca707a1d5c469a03698c2cd1f1773c539
+DIST dbus-1.2.20.tar.gz 1672544 RMD160 b6f97a3a0c039e9e7a0ddb2f9c4aef6d71d5d7e1 SHA1 a1966fc28cb03c3a7af58dfdf90688d35a9c18d2 SHA256 0ef086d738710384d525130797ee86a0ce2daebffa7dc4d28386503ef7448011
 DIST dbus-1.2.3.tar.gz 1564475 RMD160 d1a207b2a4c744f27c9c01388e80cebdb61f43f0 SHA1 ceb8d496bc1a9c2dcdbe559515c01ec9c0cdcf81 SHA256 16ffaa4a8758f115cf02c78962b0849ed4d802872420fd460c433a9cd580ed1a
 DIST dbus-1.3.0.tar.gz 1517408 RMD160 ed823727c11a437e9a0d548b9c3d92a8fd4d386b SHA1 ebd23c65ebf5448efc6367da1414de212db38055 SHA256 fe32b49667894cf91b0a97503163be5c4814ecf67259e8feb26d1ba57cb03dae
 EBUILD dbus-1.2.12.ebuild 3858 RMD160 e690a95d18c1b003f0555cd2ef59ae98aad7b16d SHA1 3aa70b1e08b7ac672fcf407755b4ab45e988f9d7 SHA256 507833339197a3b9fef81ef513be658f616a3d38e5a9b924cc24e332daa0121e
-EBUILD dbus-1.2.18.ebuild 3983 RMD160 45584bb7ca3e4bab704f854fc471c28025d74179 SHA1 5b90bd217f58890bf05379e4783d4392d5cc5ed1 SHA256 0d47af561b64deec9ff0019c6c1f34d2ed1c477e32321897baee8536f16b7031
+EBUILD dbus-1.2.20.ebuild 3855 RMD160 7fb2ef5ec328a87b65c3b8551dd85d116f40db41 SHA1 12abe8cac4cac4fb15fb1886b7e947733c363f29 SHA256 bf833ed9cb13f8b9b1e5d40630cfba7df7856a6a25899cb07246ef7888a2f486
 EBUILD dbus-1.2.3-r1.ebuild 3752 RMD160 dc66d0b29adcde506e40b3240f4e19144f3ed159 SHA1 fc9c2db2f73605fbcc2807ee0bd886e86f8bb93d SHA256 09c62bdce60af40e79f88f6bc7110867f6f6d051b08aa5ed585a10570beeb2fc
 EBUILD dbus-1.3.0-r1.ebuild 4829 RMD160 8962f2e34bfcd96f3ce004b1990df1fc0143ef76 SHA1 173474aa263caa03ddb8aa6cc791faa7dfd67a96 SHA256 3022f1452397cda6a917fb04dd2a9146e7054beb9e6e67ebc125b6a951d32c0f
 EBUILD dbus-1.3.0.ebuild 4068 RMD160 89a06c41e86334f57a2256a0667e7f24083c2561 SHA1 b0a9eb87b19d9998f1732880e8e2626ad0d57f5b SHA256 38a01cdf9aa19e527e9cfc0917f60b38d2a3b6615e16c25b5d15755cc4b99e94
-MISC ChangeLog 37059 RMD160 e39d2fc89f0f2df8de71cc9e867a9a838a7dc1c2 SHA1 fd81ff611bb5ae81b6df6fdc34fbe9d105621972 SHA256 6896ec5a189c805ef8efd5b30259f9302c2c3ed91176d7c542ededff83f9ce32
+MISC ChangeLog 37341 RMD160 e1ee8ca0d0c8b29150f5cffa13bef9b3fcd718d3 SHA1 14d745c8408291c5687b8bc0719e5731484c7d30 SHA256 1d40e9198ab13f217370ca30ad272f36519c8866b35643dd9153f51fb7a9d3b4
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
diff --git a/sys-apps/dbus/dbus-1.2.18.ebuild b/sys-apps/dbus/dbus-1.2.20.ebuild
index 4057f98089c2..aa42a5deac11 100644
--- a/sys-apps/dbus/dbus-1.2.18.ebuild
+++ b/sys-apps/dbus/dbus-1.2.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.18.ebuild,v 1.1 2010/02/03 16:07:35 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.20.ebuild,v 1.1 2010/02/03 19:34:32 steev Exp $
 
 inherit eutils multilib flag-o-matic
 
@@ -27,9 +27,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/0001-Fix-inotify-shutdown.patch"
-	epatch "${FILESDIR}/0002-Fix-compilation-in-disable-selinux-case.patch"
-
 	# Tests were restricted because of this
 	sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
 		-e '/"dispatch"/d' -i "${S}/bus/test-main.c"
diff --git a/sys-apps/dbus/files/0001-Fix-inotify-shutdown.patch b/sys-apps/dbus/files/0001-Fix-inotify-shutdown.patch
deleted file mode 100644
index 862adb28a413..000000000000
--- a/sys-apps/dbus/files/0001-Fix-inotify-shutdown.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From 90fe96b1875350f86a4a773d4a0a22009950dd4d Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Tue, 2 Feb 2010 12:37:17 -0500
-Subject: [PATCH 1/2] Fix inotify shutdown
-
-We were incorrectly passing NULL for a DBusList when the usage expected
-is a pointer to a NULL DBusList pointer.  Also during dbus_shutdown
-we need to actually close the inotify fd, and remove our watch.
-
-Move the shutdown handler out of bus.c and into inotify where we
-can do all of this cleanly.
----
- bus/bus.c               |    8 ---
- bus/dir-watch-inotify.c |  128 ++++++++++++++++++++++++++++++-----------------
- 2 files changed, 82 insertions(+), 54 deletions(-)
-
-diff --git a/bus/bus.c b/bus/bus.c
-index bfd398e..8150df2 100644
---- a/bus/bus.c
-+++ b/bus/bus.c
-@@ -551,12 +551,6 @@ process_config_postinit (BusContext      *context,
-   return TRUE;
- }
- 
--static void
--bus_shutdown_all_directory_watches (void *data)
--{
--  bus_set_watched_dirs ((BusContext *) data, NULL);
--}
--
- BusContext*
- bus_context_new (const DBusString *config_file,
-                  ForceForkSetting  force_fork,
-@@ -588,8 +582,6 @@ bus_context_new (const DBusString *config_file,
- 
-   _dbus_generate_uuid (&context->uuid);
- 
--  _dbus_register_shutdown_func (bus_shutdown_all_directory_watches, context);
--
-   if (!_dbus_string_copy_data (config_file, &context->config_file))
-     {
-       BUS_SET_OOM (error);
-diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c
-index f87a634..bb71394 100644
---- a/bus/dir-watch-inotify.c
-+++ b/bus/dir-watch-inotify.c
-@@ -92,59 +92,16 @@ _handle_inotify_watch (DBusWatch *passed_watch, unsigned int flags, void *data)
-   return TRUE;
- }
- 
--static int
--_init_inotify (BusContext *context)
--{
--  int ret = 0;
--
--  if (inotify_fd == -1) {
--#ifdef HAVE_INOTIFY_INIT1
--     inotify_fd = inotify_init1 (IN_CLOEXEC);
--#else
--     inotify_fd = inotify_init ();
--#endif
--     if (inotify_fd <= 0) {
--      _dbus_warn ("Cannot initialize inotify\n");
--      goto out;
--     } 
--     loop = bus_context_get_loop (context);
--
--     watch = _dbus_watch_new (inotify_fd, DBUS_WATCH_READABLE, TRUE,
--                              _handle_inotify_watch, NULL, NULL);
--
--     if (watch == NULL)
--       {
--         _dbus_warn ("Unable to create inotify watch\n");
--         goto out;
--       }
--
--     if (!_dbus_loop_add_watch (loop, watch, _inotify_watch_callback,
--                                NULL, NULL))
--       {
--         _dbus_warn ("Unable to add reload watch to main loop");
--	 _dbus_watch_unref (watch);
--	 watch = NULL;
--         goto out;
--       }
--  }
-+#include <stdio.h>
- 
--  ret = 1;
--
--out:
--  return ret;
--}
--
--void
--bus_set_watched_dirs (BusContext *context, DBusList **directories)
-+static void
-+_set_watched_dirs_internal (DBusList **directories)
- {
-   int new_wds[MAX_DIRS_TO_WATCH];
-   char *new_dirs[MAX_DIRS_TO_WATCH];
-   DBusList *link;
-   int i, j, wd;
- 
--  if (!_init_inotify (context))
--    goto out;
--
-   for (i = 0; i < MAX_DIRS_TO_WATCH; i++)
-     {
-       new_wds[i] = -1;
-@@ -226,3 +183,82 @@ bus_set_watched_dirs (BusContext *context, DBusList **directories)
- 
-  out:;
- }
-+
-+#include <stdio.h>
-+static void
-+_shutdown_inotify (void *data)
-+{
-+  DBusList *empty = NULL;
-+
-+  if (inotify_fd == -1)
-+    return;
-+
-+  _set_watched_dirs_internal (&empty);
-+
-+  close (inotify_fd);
-+  inotify_fd = -1;
-+  if (watch != NULL)
-+    {
-+      _dbus_loop_remove_watch (loop, watch, _inotify_watch_callback, NULL);
-+      _dbus_watch_unref (watch);
-+      _dbus_loop_unref (loop);
-+    }
-+  watch = NULL;
-+  loop = NULL;
-+}
-+
-+static int
-+_init_inotify (BusContext *context)
-+{
-+  int ret = 0;
-+
-+  if (inotify_fd == -1)
-+    {
-+#ifdef HAVE_INOTIFY_INIT1
-+      inotify_fd = inotify_init1 (IN_CLOEXEC);
-+#else
-+      inotify_fd = inotify_init ();
-+#endif
-+      if (inotify_fd <= 0)
-+        {
-+          _dbus_warn ("Cannot initialize inotify\n");
-+          goto out;
-+        }
-+      loop = bus_context_get_loop (context);
-+      _dbus_loop_ref (loop);
-+
-+      watch = _dbus_watch_new (inotify_fd, DBUS_WATCH_READABLE, TRUE,
-+                               _handle_inotify_watch, NULL, NULL);
-+
-+      if (watch == NULL)
-+        {
-+          _dbus_warn ("Unable to create inotify watch\n");
-+          goto out;
-+        }
-+
-+      if (!_dbus_loop_add_watch (loop, watch, _inotify_watch_callback,
-+                                 NULL, NULL))
-+        {
-+          _dbus_warn ("Unable to add reload watch to main loop");
-+          _dbus_watch_unref (watch);
-+          watch = NULL;
-+          goto out;
-+        }
-+
-+      _dbus_register_shutdown_func (_shutdown_inotify, NULL);
-+    }
-+
-+  ret = 1;
-+
-+out:
-+  return ret;
-+}
-+
-+void
-+bus_set_watched_dirs (BusContext *context, DBusList **directories)
-+{
-+  if (!_init_inotify (context))
-+    return;
-+
-+  _set_watched_dirs_internal (directories);
-+}
--- 
-1.6.2.5
-
diff --git a/sys-apps/dbus/files/0002-Fix-compilation-in-disable-selinux-case.patch b/sys-apps/dbus/files/0002-Fix-compilation-in-disable-selinux-case.patch
deleted file mode 100644
index a0f6e47b841e..000000000000
--- a/sys-apps/dbus/files/0002-Fix-compilation-in-disable-selinux-case.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 3dac125d61ebc4f614a1723580043e2f1c811f59 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Tue, 2 Feb 2010 14:57:47 -0500
-Subject: [PATCH 2/2] Fix compilation in --disable-selinux case
-
-_dbus_change_to_daemon_user moved into selinux.c for the --with-selinux
-(and audit) case because that's where all of the relevant libcap headers
-were being used.  However in the --disable-selinux case this didn't
-compile and wasn't very clean.
-
-If we don't have libaudit, use the legacy direct setgid/setuid bits
-we had before in dbus-sysdeps-util-unix.c.
----
- bus/selinux.c                 |   35 ++---------------------
- bus/selinux.h                 |    2 -
- dbus/dbus-sysdeps-util-unix.c |   62 +++++++++++++++++++++++++++++++++++++++++
- dbus/dbus-sysdeps.h           |    3 ++
- 4 files changed, 68 insertions(+), 34 deletions(-)
-
-diff --git a/bus/selinux.c b/bus/selinux.c
-index 456723a..e61efc5 100644
---- a/bus/selinux.c
-+++ b/bus/selinux.c
-@@ -1017,6 +1017,8 @@ bus_selinux_shutdown (void)
- #endif /* HAVE_SELINUX */
- }
- 
-+/* The !HAVE_LIBAUDIT case lives in dbus-sysdeps-util-unix.c */
-+#ifdef HAVE_LIBAUDIT
- /**
-  * Changes the user and group the bus is running as.
-  *
-@@ -1042,7 +1044,6 @@ _dbus_change_to_daemon_user  (const char    *user,
-       return FALSE;
-     }
- 
--#ifdef HAVE_LIBAUDIT
-   /* If we were root */
-   if (_dbus_geteuid () == 0)
-     {
-@@ -1083,38 +1084,8 @@ _dbus_change_to_daemon_user  (const char    *user,
-           return FALSE;
-         }
-     }
--#else
--  /* setgroups() only works if we are a privileged process,
--   * so we don't return error on failure; the only possible
--   * failure is that we don't have perms to do it.
--   *
--   * not sure this is right, maybe if setuid()
--   * is going to work then setgroups() should also work.
--   */
--  if (setgroups (0, NULL) < 0)
--    _dbus_warn ("Failed to drop supplementary groups: %s\n",
--                _dbus_strerror (errno));
--
--  /* Set GID first, or the setuid may remove our permission
--   * to change the GID
--   */
--  if (setgid (gid) < 0)
--    {
--      dbus_set_error (error, _dbus_error_from_errno (errno),
--                      "Failed to set GID to %lu: %s", gid,
--                      _dbus_strerror (errno));
--      return FALSE;
--    }
--
--  if (setuid (uid) < 0)
--    {
--      dbus_set_error (error, _dbus_error_from_errno (errno),
--                      "Failed to set UID to %lu: %s", uid,
--                      _dbus_strerror (errno));
--      return FALSE;
--    }
--#endif /* !HAVE_LIBAUDIT */
- 
-  return TRUE;
- }
-+#endif
- 
-diff --git a/bus/selinux.h b/bus/selinux.h
-index f208fbe..3bab36d 100644
---- a/bus/selinux.h
-+++ b/bus/selinux.h
-@@ -68,7 +68,5 @@ BusSELinuxID* bus_selinux_init_connection_id (DBusConnection *connection,
- 
- 
- void bus_selinux_audit_init(void);
--dbus_bool_t _dbus_change_to_daemon_user (const char *user,
--                                         DBusError  *error);
- 
- #endif /* BUS_SELINUX_H */
-diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
-index 27cdbb0..74e8d88 100644
---- a/dbus/dbus-sysdeps-util-unix.c
-+++ b/dbus/dbus-sysdeps-util-unix.c
-@@ -303,6 +303,68 @@ _dbus_verify_daemon_user (const char *user)
-   return _dbus_get_user_id_and_primary_group (&u, NULL, NULL);
- }
- 
-+
-+/* The HAVE_LIBAUDIT case lives in selinux.c */
-+#ifndef HAVE_LIBAUDIT
-+/**
-+ * Changes the user and group the bus is running as.
-+ *
-+ * @param user the user to become
-+ * @param error return location for errors
-+ * @returns #FALSE on failure
-+ */
-+dbus_bool_t
-+_dbus_change_to_daemon_user  (const char    *user,
-+                              DBusError     *error)
-+{
-+  dbus_uid_t uid;
-+  dbus_gid_t gid;
-+  DBusString u;
-+
-+  _dbus_string_init_const (&u, user);
-+
-+  if (!_dbus_get_user_id_and_primary_group (&u, &uid, &gid))
-+    {
-+      dbus_set_error (error, DBUS_ERROR_FAILED,
-+                      "User '%s' does not appear to exist?",
-+                      user);
-+      return FALSE;
-+    }
-+
-+  /* setgroups() only works if we are a privileged process,
-+   * so we don't return error on failure; the only possible
-+   * failure is that we don't have perms to do it.
-+   *
-+   * not sure this is right, maybe if setuid()
-+   * is going to work then setgroups() should also work.
-+   */
-+  if (setgroups (0, NULL) < 0)
-+    _dbus_warn ("Failed to drop supplementary groups: %s\n",
-+                _dbus_strerror (errno));
-+
-+  /* Set GID first, or the setuid may remove our permission
-+   * to change the GID
-+   */
-+  if (setgid (gid) < 0)
-+    {
-+      dbus_set_error (error, _dbus_error_from_errno (errno),
-+                      "Failed to set GID to %lu: %s", gid,
-+                      _dbus_strerror (errno));
-+      return FALSE;
-+    }
-+
-+  if (setuid (uid) < 0)
-+    {
-+      dbus_set_error (error, _dbus_error_from_errno (errno),
-+                      "Failed to set UID to %lu: %s", uid,
-+                      _dbus_strerror (errno));
-+      return FALSE;
-+    }
-+
-+  return TRUE;
-+}
-+#endif /* !HAVE_LIBAUDIT */
-+
- void 
- _dbus_init_system_log (void)
- {
-diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
-index b154f01..80f0ba2 100644
---- a/dbus/dbus-sysdeps.h
-+++ b/dbus/dbus-sysdeps.h
-@@ -512,6 +512,9 @@ unsigned long _dbus_pid_for_log (void);
-  */
- dbus_pid_t    _dbus_getpid (void);
- 
-+dbus_bool_t _dbus_change_to_daemon_user (const char *user,
-+                                         DBusError  *error);
-+
- void _dbus_flush_caches (void);
- 
- /** @} */
--- 
-1.6.2.5
-