rpms/dbus/F-9 dbus-1.1-fix_userdb_macro.patch, NONE, 1.1 dbus.spec, 1.143, 1.144

John (J5) Palmieri (johnp) fedora-extras-commits at redhat.com
Mon May 5 18:37:06 UTC 2008


Author: johnp

Update of /cvs/extras/rpms/dbus/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30985

Modified Files:
	dbus.spec 
Added Files:
	dbus-1.1-fix_userdb_macro.patch 
Log Message:
- patch to enable dbus userdb caching as was the default in 1.0.x
- previous upstream commit had accidentally disabled it because
  of mispelled macro names - the non-cached codepath can cause
  a crash of the bus
- fd.o bug #15588 - https://bugs.freedesktop.org/show_bug.cgi?id=15588



dbus-1.1-fix_userdb_macro.patch:

--- NEW FILE dbus-1.1-fix_userdb_macro.patch ---
>From ff997dd113565bb281c01b10d468e183992630df Mon Sep 17 00:00:00 2001
From: Scott James Remnant <scott at netsplit.com>
Date: Thu, 24 Apr 2008 16:00:16 +0100
Subject: [PATCH] 	* dbus/dbus-userdb-util.c, dbus/dbus-userdb.c: Correct name of
 	macro used in #ifdef block to match that defined by configure,
 	otherwise the userdb cache will never be enabled.

---
 dbus/dbus-userdb-util.c |    2 +-
 dbus/dbus-userdb.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c
index 30d5083..d03a7c7 100644
--- a/dbus/dbus-userdb-util.c
+++ b/dbus/dbus-userdb-util.c
@@ -223,7 +223,7 @@ _dbus_user_database_lookup_group (DBusUserDatabase *db,
         gid = n;
     }
 
-#ifdef DBUS_ENABLE_USER_CACHE
+#ifdef DBUS_ENABLE_USERDB_CACHE
   if (gid != DBUS_GID_UNSET)
     info = _dbus_hash_table_lookup_ulong (db->groups, gid);
   else
diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index 0e430b2..03d263f 100644
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -143,7 +143,7 @@ _dbus_user_database_lookup (DBusUserDatabase *db,
         uid = n;
     }
 
-#ifdef DBUS_ENABLE_USER_CACHE  
+#ifdef DBUS_ENABLE_USERDB_CACHE  
   if (uid != DBUS_UID_UNSET)
     info = _dbus_hash_table_lookup_ulong (db->users, uid);
   else
-- 
1.5.4.3



Index: dbus.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus/F-9/dbus.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- dbus.spec	4 Apr 2008 20:10:23 -0000	1.143
+++ dbus.spec	5 May 2008 18:36:23 -0000	1.144
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -39,6 +39,7 @@
 
 Patch0: dbus-0.60-start-early.patch
 Patch1: dbus-1.0.1-generate-xml-docs.patch
+Patch2: dbus-1.1-fix_userdb_macro.patch
 
 %description
 
@@ -94,6 +95,7 @@
 
 %patch0 -p1 -b .start-early
 %patch1 -p1 -b .generate-xml-docs
+%patch2 -p1 -b .fix_userdb_macro
 
 autoreconf -f -i
 
@@ -221,6 +223,13 @@
 %{_includedir}/*
 
 %changelog
+* Fri May 05 2008 John (J5) Palmieri <johnp at redhat.com> - 1.2.1-2
+- patch to enable dbus userdb caching as was the default in 1.0.x
+- previous upstream commit had accidentally disabled it because
+  of mispelled macro names - the non-cached codepath can cause
+  a crash of the bus
+- fd.o bug #15588 - https://bugs.freedesktop.org/show_bug.cgi?id=15588
+
 * Fri Apr 04 2008 John (J5) Palmieri <johnp at redhat.com> - 1.2.1-1
 - update to latest upstream
 - major version change is really a maint release for 1.1.20




More information about the fedora-extras-commits mailing list