diff options
Diffstat (limited to 'sys-auth')
10 files changed, 0 insertions, 393 deletions
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest index 3419c9b25ddf..e5da0e39416a 100644 --- a/sys-auth/consolekit/Manifest +++ b/sys-auth/consolekit/Manifest @@ -1,24 +1,14 @@ AUX 90-consolekit 272 RMD160 f95a580dda5e8d65713153921cd77f8c064b2357 SHA1 f3e535ae34b9f30ad45c77ceac116ec73572b3d9 SHA256 d372f292f765c1cab533285be8f9af16b0783d7aa44a5e038174396e61c780cc AUX consolekit-0.1.rc 586 RMD160 04282efee7a8abb69ddd787ea4b9f180e6954d86 SHA1 4ca9cb3f4d33d08c2dadcd7a9884ed351990376f SHA256 af61c7d61bfda4d7c30f3f4142a9e8dc26bfdd4e14c57d7ff8bfef5febdcee1f AUX consolekit-0.2.10-cleanup_console_tags.patch 1728 RMD160 d1fffa6524eec4f3ad8c1412c9ad9bfeae179a1c SHA1 c07d848591fafbe79709a3313bfaffd3e601f309 SHA256 884c8cd1186b26746ec6e4cfdb13771e62e54c892979501e231ba6a6611b5449 -AUX consolekit-0.2.10-directory-leak.patch 270 RMD160 b0fadcdbeb020d31a294f67b1e1c1b456f819ecc SHA1 0d8933736cc72a5fe4501c61ac531e958433f77d SHA256 800f61f49f6df1a6d4d6b9f9d7c08f14483c13bed2089c988d039288f4a66a4b -AUX consolekit-0.2.10-pam-add-nox11.patch 2258 RMD160 23b77cc0397e08bfc367bbe6683d44d67b9e5a22 SHA1 051973327b7a629d84ecb938980c7bf110c6f8fc SHA256 1e96db20c78b4b983ac89f98ebaeeb5ef08239916ada6e7ecfff3e9c12c8f1ef AUX consolekit-0.2.10-polkit-automagic.patch 988 RMD160 1146e1c30b327191a5429e54eb7d42d600f4e1b1 SHA1 ada8d56ab096dc49d609f1d9f44679971936c0df SHA256 9e31ae84ec3d838aaaddaa1fee1b68f7bf02e6c16935ca2a7a3cc086ff868433 -AUX consolekit-0.3.0-allow-setidle.patch 648 RMD160 03bd610a6d13ece9a1ad46beb43efbc3ac875e61 SHA1 00145467e96ac917e0aa6a756a938f2c62434602 SHA256 693accef2bea6fe62900226075c88b50b6ff541649a86affbebe98ea6134ec08 -AUX consolekit-0.3.0-shutdown.patch 924 RMD160 d0ad31aed472df41f94327c0625b64aee31fc6ed SHA1 f02205b3273047afdfe4438fac4f71f50655112b SHA256 7016cf51e86a5e87104ce960524fa4c75a1f7362d7b3d8d8e0e3e5f8469132ab -AUX consolekit-0.3.0-skip_xmlto_validation.patch 770 RMD160 b8b229e8d7ab2f2ef2266dc553588f9a1ccf0600 SHA1 5518debddb04d814f12a5377e4b958c8963ffaee SHA256 28e1cb19567d8b57d81aea5c0ed02f998cc7017fe3ada5759574fdaa217653cb AUX consolekit-0.4.0-multilib.patch 4378 RMD160 ef80a5e681e7d036be4de1dff40a550c3b422087 SHA1 221d6b04e35fca3bc42ec97f9bccb7c3792a0788 SHA256 1b00d28b62c0c71648978a48e65bd1bac08d230945c933e3f7cfd74cf59f337d AUX consolekit-0.4.0-polkit-automagic.patch 841 RMD160 59f6f8d13a6f030107908b5926e2f49439ae2f6e SHA1 6c1442f4cc860bd5e828997a6fb44cc891028e1c SHA256 965ea7e3a2868ae8fa3d0ee6c48a5b06149c08d273e8f4a8e6afa9eec0a26357 -AUX consolekit-0.4.1-nodaemon.patch 394 RMD160 7d04667e5a732766b0b40247b46ba38ec4055642 SHA1 51cc75ed833c758fc6b0efcd01d20280224a34d6 SHA256 d56d55379f22d3bcada56507c196b5c32c81b6cc8de5b5c4bc42ff6e53be2af1 -AUX consolekit-0.4.1-reorder-initialization.patch 978 RMD160 718513d80720c0440b32ab2266f1ebface780848 SHA1 bce58460f1b4628aee6cd179615207057ae4ca32 SHA256 247af5462a1572c7ffc5b94c360ff8b9e9b3055f5da972f93fc8ceb230c1c7b4 AUX consolekit-0.4.1-shutdown-reboot-without-policies.patch 1166 RMD160 946969cbc2c86bf81f151cbefae022ea95971a57 SHA1 1db7f74e84146c738d5de4b5f835376a1a394280 SHA256 78e7e3b71c34c9a0b2eef58c55c8ac6e34fd4ee0ddb03d20c9adf138d2dafbc9 AUX consolekit-0.4.2-revert.patch 7953 RMD160 7b156638e153eefa9ded729c48fa4a0aea2041c2 SHA1 3ea4e6d3b604a0c67fd5c3dac28a7f1ca6233cb8 SHA256 aec3c64c7412ad746c871ad596bb67614bbecc0dd40f4e60cd8127aec6bde28d AUX pam-foreground-compat.ck 389 RMD160 b72a66d5fde612a825fb60f0f1402a0665cc6d81 SHA1 25c3e54e326606e6c476e0dbb9637e2e551a6ccc SHA256 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9 -DIST ConsoleKit-0.3.0.tar.bz2 393694 RMD160 7a1ebd2f4bfb65690e70138c9923c3fd2fcaf671 SHA1 e3b6156622cc14ebca7382a55b8ed15f2f2bad98 SHA256 cbcfbb3df2dc76855c99c1cdff04a257ec5270fa62e1d21b0d057b08d88c0fd4 DIST ConsoleKit-0.4.1.tar.bz2 398080 RMD160 800076645134ad63d582ea9ffb3ada0113a32db1 SHA1 ab2b8643c1e696df4dc79d9ee0323bdc95aaa6a1 SHA256 f032adc6146d745034315054c5822a7a09f30e20a40d6e802221fa977354403e DIST ConsoleKit-0.4.2.tar.bz2 412651 RMD160 cc76cfb1462a238754c7c1ecd7404a0db26c7501 SHA1 fa588abe532c1d55fd98e0cc0178dde3f30266ff SHA256 656f406c9c436bd105c34d87e824cb2fbae09fa672b93894059281124480fe15 -EBUILD consolekit-0.3.0-r2.ebuild 3091 RMD160 b7d84d8821230e79b4a2a8da7267cd9c8941fc65 SHA1 b2ec7694f04547c6e57dad483e33d0d44d55cb65 SHA256 02670a963bf9188d307129b31da110686b83f17888188fb41eb17a14a6a47ba1 -EBUILD consolekit-0.4.1-r1.ebuild 3094 RMD160 c4b754cf0fc9bb86af6842a7b4f5e431daaeb317 SHA1 ecc4a7b2f617951d369e6921c0f3f4694a32dbdb SHA256 c4c3f82ba600b012e7b4562576d492304a01d913fc565341da5d2a8c837adbb8 EBUILD consolekit-0.4.1.ebuild 2972 RMD160 1648925c2b711cf51bc874774ea7d5ea783ad60e SHA1 5992cd04c68009be7bf90a50e0d1bdb4899efd18 SHA256 79c062a5c916f369cc6d023024a1ee85f8515f7c36ea032d93e10b660bc1097f EBUILD consolekit-0.4.2-r1.ebuild 2557 RMD160 eb81a92e55110dc564fe523bc803c5b877a7e6b8 SHA1 b2a1f070c9165052ede192cf80b3d2c3e07c5cb6 SHA256 761e746972149273e34f057ef98e1dc58080823e2bb0254c3d7f11c4d86cf82d MISC ChangeLog 11445 RMD160 4f3d801646582ff827c8713efab0e90de99736c3 SHA1 3ce6695cae1d7fd937ec6871d3ed32c9b860bebe SHA256 a4c702774e30757da14d9c11c539a07544ddf82d84ff4483ded9f15d49f74a98 diff --git a/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild b/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild deleted file mode 100644 index 9eb25d7255f8..000000000000 --- a/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild,v 1.12 2010/05/09 18:10:04 armin76 Exp $ - -EAPI="3" - -inherit autotools eutils multilib pam - -MY_PN="ConsoleKit" -MY_PV="${PV//_pre*/}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Framework for defining and tracking users, login sessions and seats." -HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit" -SRC_URI="http://people.freedesktop.org/~mccann/dist/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="debug doc pam policykit" - -RDEPEND=">=dev-libs/glib-2.16 - >=dev-libs/dbus-glib-0.61 - >=x11-libs/libX11-1.0.0 - pam? ( virtual/pam ) - policykit? ( >=sys-auth/policykit-0.7 ) - elibc_glibc? ( !=sys-libs/glibc-2.4* ) - sys-libs/zlib" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-libs/libxslt - doc? ( app-text/xmlto )" - -S=${WORKDIR}/${MY_PN}-${MY_PV} - -src_prepare() { - # Fix directory leaks, bug #258685 - epatch "${FILESDIR}/${PN}-0.2.10-directory-leak.patch" - - # Clean up at_console compat files, bug #257761 - epatch "${FILESDIR}/${PN}-0.2.10-cleanup_console_tags.patch" - - # Add nox11 option to no interfere with Xsession script, bug #257763 - epatch "${FILESDIR}/${PN}-0.2.10-pam-add-nox11.patch" - - # Fix automagic dependency on policykit - epatch "${FILESDIR}/${PN}-0.2.10-polkit-automagic.patch" - - # Fix inability to shutdown/restart - epatch "${FILESDIR}/${P}-shutdown.patch" - - # Add SetIdleHint policy to handle new default deny on dbus - epatch "${FILESDIR}/${P}-allow-setidle.patch" - - epatch "${FILESDIR}"/${P}-skip_xmlto_validation.patch - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable doc docbook-docs) \ - $(use_enable pam pam-module) \ - $(use_enable policykit polkit) \ - --with-pam-module-dir=$(getpam_mod_dir) \ - --with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services/ \ - --localstatedir="${EPREFIX}"/var -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # crappy Redhat init script - rm -f "${ED}/etc/rc.d/init.d/ConsoleKit" - - # Portage barfs on .la files - rm -f "${ED}/$(get_libdir)/security/pam_ck_connector.la" - - # Gentoo style init script - newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit - - # Some PM drop empty dirs, bug #257164 - keepdir /usr/$(get_libdir)/ConsoleKit/run-session.d - keepdir /etc/ConsoleKit/run-session.d - keepdir /var/run/ConsoleKit - keepdir /var/log/ConsoleKit - - exeinto /etc/X11/xinit/xinitrc.d/ - doexe "${FILESDIR}/90-consolekit" || die "doexe failed" - - exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d/ - doexe "${FILESDIR}/pam-foreground-compat.ck" || die "doexe failed" -} - -pkg_postinst() { - ewarn - ewarn "You need to restart ConsoleKit to get the new features." - ewarn "This can be done with /etc/init.d/consolekit restart" - ewarn "but make sure you do this and then restart your session" - ewarn "otherwise you will get access denied for certain actions" -} diff --git a/sys-auth/consolekit/consolekit-0.4.1-r1.ebuild b/sys-auth/consolekit/consolekit-0.4.1-r1.ebuild deleted file mode 100644 index d3ff3037b782..000000000000 --- a/sys-auth/consolekit/consolekit-0.4.1-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.1-r1.ebuild,v 1.1 2010/08/21 09:35:16 ssuominen Exp $ - -EAPI="3" - -inherit autotools eutils multilib pam - -MY_PN="ConsoleKit" -MY_PV="${PV//_pre*/}" -MY_P="${MY_PN}-${MY_PV}" - -# FIXME: Report on upstream for patch about policies ? (probably upstream devs wanted this behaviour as default...) -DESCRIPTION="Framework for defining and tracking users, login sessions and seats." -HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit" -SRC_URI="http://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="debug doc pam policykit" - -RDEPEND=">=dev-libs/glib-2.16 - >=dev-libs/dbus-glib-0.76 - >=x11-libs/libX11-1.0.0 - pam? ( virtual/pam ) - policykit? ( >=sys-auth/polkit-0.92 ) - elibc_glibc? ( !=sys-libs/glibc-2.4* ) - sys-libs/zlib" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-libs/libxslt - doc? ( app-text/xmlto )" - -S=${WORKDIR}/${MY_PN}-${MY_PV} - -src_prepare() { - # Clean up at_console compat files, bug #257761 - epatch "${FILESDIR}"/${PN}-0.2.10-cleanup_console_tags.patch - - # Fix automagic dependency on policykit - epatch "${FILESDIR}"/${PN}-0.4.0-polkit-automagic.patch - - # Fix multilib support - epatch "${FILESDIR}"/${PN}-0.4.0-multilib.patch - - # Be able to shutdown or reboot even without polkit or RBAC supports - epatch "${FILESDIR}"/${P}-shutdown-reboot-without-policies.patch - - epatch "${FILESDIR}"/${P}-reorder-initialization.patch #333349 - epatch "${FILESDIR}"/${P}-nodaemon.patch - - eautoreconf -} - -src_configure() { - econf \ - XMLTO_FLAGS="--skip-validation" \ - $(use_enable debug) \ - $(use_enable doc docbook-docs) \ - $(use_enable pam pam-module) \ - $(use_enable policykit polkit) \ - --with-pam-module-dir=$(getpam_mod_dir) \ - --with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services/ \ - --localstatedir="${EPREFIX}"/var -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # crappy Redhat init script - rm -f "${ED}/etc/rc.d/init.d/ConsoleKit" - - # Portage barfs on .la files - rm -f "${ED}/$(get_libdir)/security/pam_ck_connector.la" - - # Gentoo style init script - newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit - - # Some PM drop empty dirs, bug #257164 - keepdir /usr/$(get_libdir)/ConsoleKit/run-session.d - keepdir /etc/ConsoleKit/run-session.d - keepdir /var/run/ConsoleKit - keepdir /var/log/ConsoleKit - - exeinto /etc/X11/xinit/xinitrc.d/ - doexe "${FILESDIR}/90-consolekit" || die "doexe failed" - - exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d/ - doexe "${FILESDIR}/pam-foreground-compat.ck" || die "doexe failed" -} - -pkg_postinst() { - ewarn - ewarn "You need to restart ConsoleKit to get the new features." - ewarn "This can be done with /etc/init.d/consolekit restart" - ewarn "but make sure you do this and then restart your session" - ewarn "otherwise you will get access denied for certain actions" -} 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, |