diff --git a/ConsoleKit-0.2.3-dbus-change-sigpipe.patch b/ConsoleKit-0.2.3-dbus-change-sigpipe.patch new file mode 100644 index 0000000..8921dfd --- /dev/null +++ b/ConsoleKit-0.2.3-dbus-change-sigpipe.patch @@ -0,0 +1,28 @@ +diff --git a/pam-ck-connector/pam-ck-connector.c b/pam-ck-connector/pam-ck-connector.c +index 1c7ecd2..4203651 100644 +--- a/pam-ck-connector/pam-ck-connector.c ++++ b/pam-ck-connector/pam-ck-connector.c +@@ -103,9 +103,9 @@ ck_pam_vsyslog (const pam_handle_t *pamh, + mod_name, + service, + choice); +- if (res < 0) { ++ if (res < 0) { + return; +- } ++ } + + errno = save_errno; + res = vsnprintf (msgbuf2, sizeof (msgbuf2), fmt, args); +@@ -248,6 +248,11 @@ pam_sm_open_session (pam_handle_t *pamh, + goto out; + } + ++ /* set a global flag so that D-Bus does not change the SIGPIPE handler. ++ See https://bugzilla.redhat.com/show_bug.cgi?id=430431 ++ */ ++ dbus_connection_set_change_sigpipe (FALSE); ++ + ckc = ck_connector_new (); + if (ckc == NULL) { + ck_pam_syslog (pamh, LOG_ERR, "oom creating ConsoleKit connector object"); diff --git a/ConsoleKit.spec b/ConsoleKit.spec index ddc7723..23dbb43 100644 --- a/ConsoleKit.spec +++ b/ConsoleKit.spec @@ -5,12 +5,13 @@ Summary: System daemon for tracking users, sessions and seats Name: ConsoleKit Version: 0.2.3 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries -URL: http://www.freedesktop.org/wiki/Software/ConsoleKit +URL: http://www.freedesktop.org/wiki/Software/ConsoleKit Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.tar.gz Patch0: ConsoleKit-0.2.1-lsb.patch +Patch1: ConsoleKit-0.2.3-dbus-change-sigpipe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: dbus >= %{dbus_version} @@ -24,7 +25,7 @@ BuildRequires: xmlto Requires(post): chkconfig Requires(preun): chkconfig -%description +%description ConsoleKit is a system daemon for tracking what users are logged into the system and how they interact with the computer (e.g. which keyboard and mouse they use). @@ -38,7 +39,7 @@ Group: Development/Libraries Requires: %name = %{version}-%{release} Requires: libX11 -%description x11 +%description x11 ConsoleKit contains some tools that require Xlib to be installed, those are in this separate package so server systems need not install X. Applications (such as xorg-x11-xinit) and login managers (such as @@ -76,6 +77,7 @@ Developer documentation docs for HAL. %prep %setup -q %patch0 -p1 -b .lsb +%patch1 -p1 -b .sigpipe %build %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} @@ -144,6 +146,9 @@ fi %doc %{_datadir}/doc/%{name}-%{version}/spec/* %changelog +* Tue Feb 5 2008 Jon McCann - 0.2.3-3 +- Ask D-Bus not to change SIGPIPE handling (#430431) + * Sun Nov 11 2007 Matthias Clasen - 0.2.3-2 - Correct the URL (#375571)