summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-09-28 04:45:31 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-09-28 04:45:31 +0000
commitd93d4278893e659353684ad40144fc0a3025cbd2 (patch)
tree32ff72122cbb15a3657199038acfa355d59e3064 /sys-auth/consolekit/files
parenthardened-sources-2.6.35 based on grsec-2.2.0-2.6.35.6-201009262116 (diff)
downloadgentoo-2-d93d4278893e659353684ad40144fc0a3025cbd2.tar.gz
gentoo-2-d93d4278893e659353684ad40144fc0a3025cbd2.tar.bz2
gentoo-2-d93d4278893e659353684ad40144fc0a3025cbd2.zip
old
(Portage version: 2.2_rc87/cvs/Linux x86_64)
Diffstat (limited to 'sys-auth/consolekit/files')
-rw-r--r--sys-auth/consolekit/files/consolekit-0.2.10-directory-leak.patch11
-rw-r--r--sys-auth/consolekit/files/consolekit-0.2.10-pam-add-nox11.patch54
-rw-r--r--sys-auth/consolekit/files/consolekit-0.3.0-allow-setidle.patch12
-rw-r--r--sys-auth/consolekit/files/consolekit-0.3.0-shutdown.patch32
-rw-r--r--sys-auth/consolekit/files/consolekit-0.3.0-skip_xmlto_validation.patch18
-rw-r--r--sys-auth/consolekit/files/consolekit-0.4.1-nodaemon.patch11
-rw-r--r--sys-auth/consolekit/files/consolekit-0.4.1-reorder-initialization.patch44
7 files changed, 0 insertions, 182 deletions
diff --git a/sys-auth/consolekit/files/consolekit-0.2.10-directory-leak.patch b/sys-auth/consolekit/files/consolekit-0.2.10-directory-leak.patch
deleted file mode 100644
index 450ff77d1f54..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.2.10-directory-leak.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-# https://bugs.gentoo.org/show_bug.cgi?id=258685
---- a/src/ck-run-programs.c
-+++ b/src/ck-run-programs.c
-@@ -225,6 +225,7 @@
- out_loop:
- g_free (child_argv[0]);
- }
-+ g_dir_close (dir);
- out:
- g_strfreev (env_for_child);
- }
diff --git a/sys-auth/consolekit/files/consolekit-0.2.10-pam-add-nox11.patch b/sys-auth/consolekit/files/consolekit-0.2.10-pam-add-nox11.patch
deleted file mode 100644
index ddac6bc0efa4..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.2.10-pam-add-nox11.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-# Description: Add "nox11" option to the PAM module, which ignores PAM
-# sessions where PAM_TTY is an X11 display. This allows adding
-# pam_ck_connector to PAM's "common-session" without interfering
-# with the already existing ConsoleKit operations in gdm, the
-# Xsession script, etc.
-# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=16746
-
-Index: consolekit-0.2.10/pam-ck-connector/pam-ck-connector.c
-===================================================================
---- consolekit-0.2.10.orig/pam-ck-connector/pam-ck-connector.c 2008-08-04 18:23:37.000000000 +0200
-+++ consolekit-0.2.10/pam-ck-connector/pam-ck-connector.c 2008-08-04 18:23:49.000000000 +0200
-@@ -63,6 +63,7 @@
- #include "ck-connector.h"
-
- static int opt_debug = FALSE;
-+static int opt_nox11 = FALSE;
-
- #ifndef HAVE_PAM_SYSLOG
-
-@@ -145,6 +146,8 @@
- for (i = 0; i < argc && argv[i] != NULL; i++) {
- if (strcmp (argv[i] , "debug") == 0) {
- opt_debug = TRUE;
-+ } else if (strcmp (argv[i] , "nox11") == 0) {
-+ opt_nox11 = TRUE;
- } else {
- ck_pam_syslog (pamh, LOG_ERR, "unknown option: %s", argv[i]);
- }
-@@ -276,6 +279,10 @@
- x11_display = NULL;
- /* interpret any tty with a colon as a DISPLAY */
- if (strchr (display_device, ':') != NULL) {
-+ if (opt_nox11) {
-+ ck_pam_syslog (pamh, LOG_WARNING, "nox11 mode, ignoring PAM_TTY %s", display_device);
-+ goto out;
-+ }
- x11_display = display_device;
- display_device = "";
- } else if (strncmp (_PATH_DEV, display_device, 5) != 0) {
-Index: consolekit-0.2.10/pam-ck-connector/pam_ck_connector.8
-===================================================================
---- consolekit-0.2.10.orig/pam-ck-connector/pam_ck_connector.8 2008-08-04 18:23:44.000000000 +0200
-+++ consolekit-0.2.10/pam-ck-connector/pam_ck_connector.8 2008-08-04 18:23:49.000000000 +0200
-@@ -66,6 +66,10 @@
- .TP 3n
- \fBdebug\fR
- Print debug information.
-+.TP 3n
-+\fBnox11\fR
-+Do not create a session if PAM specifies an X11 display instead of a
-+/dev/tty terminal.
- .fi
- .RE
- .sp
diff --git a/sys-auth/consolekit/files/consolekit-0.3.0-allow-setidle.patch b/sys-auth/consolekit/files/consolekit-0.3.0-allow-setidle.patch
deleted file mode 100644
index 27aa96a1e92d..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.3.0-allow-setidle.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN ConsoleKit-0.3.0.orig/data/ConsoleKit.conf ConsoleKit-0.3.0/data/ConsoleKit.conf
---- ConsoleKit-0.3.0.orig/data/ConsoleKit.conf 2008-04-19 01:39:49.000000000 -0400
-+++ ConsoleKit-0.3.0/data/ConsoleKit.conf 2009-04-27 15:20:57.000000000 -0400
-@@ -90,6 +90,8 @@
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetIdleHint"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ send_member="SetIdleHint"/>
-+ <allow send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetIdleSinceHint"/>
- </policy>
-
diff --git a/sys-auth/consolekit/files/consolekit-0.3.0-shutdown.patch b/sys-auth/consolekit/files/consolekit-0.3.0-shutdown.patch
deleted file mode 100644
index 682f8208c6d5..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.3.0-shutdown.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b09ddd0f5c9de463ad0d1ebd329a9d16b084e192 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 1 Oct 2008 22:27:24 +0200
-Subject: [PATCH] allow shutdown without policykit or RBAC intervention.
-
----
- src/ck-manager.c | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/src/ck-manager.c b/src/ck-manager.c
-index bcb9350..54a78e6 100644
---- a/src/ck-manager.c
-+++ b/src/ck-manager.c
-@@ -1349,7 +1349,6 @@ ck_manager_restart (CkManager *manager,
- }
- #else
- g_warning ("Compiled without PolicyKit or RBAC support!");
-- goto out;
- #endif
-
- g_debug ("ConsoleKit preforming Restart: %s", action);
-@@ -1409,7 +1408,6 @@ ck_manager_stop (CkManager *manager,
- }
- #else
- g_warning ("Compiled without PolicyKit or RBAC support!");
-- goto out;
- #endif
-
- g_debug ("Stopping system");
---
-1.6.0.2
-
diff --git a/sys-auth/consolekit/files/consolekit-0.3.0-skip_xmlto_validation.patch b/sys-auth/consolekit/files/consolekit-0.3.0-skip_xmlto_validation.patch
deleted file mode 100644
index 1dfe366ce58c..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.3.0-skip_xmlto_validation.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Because xmlto-0.0.22 adds --noent to xmllint options, it's more strict,
-and doesn't validate anymore. This is a temp. solution until upstream
-gets their documentation fixed.
-
-http://bugs.gentoo.org/show_bug.cgi?id=271678
-
-diff -ur ConsoleKit-0.3.0.orig/doc/dbus/Makefile.am ConsoleKit-0.3.0/doc/dbus/Makefile.am
---- ConsoleKit-0.3.0.orig/doc/dbus/Makefile.am 2008-07-31 00:35:51.000000000 +0300
-+++ ConsoleKit-0.3.0/doc/dbus/Makefile.am 2009-06-09 22:30:57.000000000 +0300
-@@ -16,7 +16,7 @@
- htmldoc_DATA = ConsoleKit.html
-
- ConsoleKit.html : $(SPEC_XML_FILES)
-- $(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
-+ $(XMLTO) --skip-validation xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
-
- endif # DOCBOOK_DOCS_ENABLED
-
diff --git a/sys-auth/consolekit/files/consolekit-0.4.1-nodaemon.patch b/sys-auth/consolekit/files/consolekit-0.4.1-nodaemon.patch
deleted file mode 100644
index 7d25030f04cc..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.4.1-nodaemon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-http://cgit.freedesktop.org/ConsoleKit/patch/?id=fc2870a65f6b3ed3b71bcac69c5faf3a9c759c64
-http://bugs.freedesktop.org/show_bug.cgi?id=25642
-
---- data/org.freedesktop.ConsoleKit.service.in
-+++ data/org.freedesktop.ConsoleKit.service.in
-@@ -1,4 +1,4 @@
- [D-BUS Service]
- Name=org.freedesktop.ConsoleKit
--Exec=@sbindir@/console-kit-daemon
-+Exec=@sbindir@/console-kit-daemon --no-daemon
- User=root
diff --git a/sys-auth/consolekit/files/consolekit-0.4.1-reorder-initialization.patch b/sys-auth/consolekit/files/consolekit-0.4.1-reorder-initialization.patch
deleted file mode 100644
index d9d3d66f4e73..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.4.1-reorder-initialization.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-http://bugs.gentoo.org/333349
-http://bugs.freedesktop.org/show_bug.cgi?id=25744
-
---- src/main.c
-+++ src/main.c
-@@ -331,11 +331,19 @@
-
- setup_debug_log (debug);
-
-+ g_debug ("initializing console-kit-daemon %s", VERSION);
-+
- connection = get_system_bus ();
- if (connection == NULL) {
- goto out;
- }
-
-+ manager = ck_manager_new ();
-+
-+ if (manager == NULL) {
-+ goto out;
-+ }
-+
- bus_proxy = get_bus_proxy (connection);
- if (bus_proxy == NULL) {
- g_warning ("Could not construct bus_proxy object; bailing out");
-@@ -347,18 +355,10 @@
- goto out;
- }
-
-- g_debug ("initializing console-kit-daemon %s", VERSION);
--
- delete_console_tags ();
-
- create_pid_file ();
-
-- manager = ck_manager_new ();
--
-- if (manager == NULL) {
-- goto out;
-- }
--
- loop = g_main_loop_new (NULL, FALSE);
-
- g_signal_connect (bus_proxy,