Add a new revision to 1.0.5 with consolekit support. This is use.masked on s390 and x86-fbsd until we get consolekit working on those two.

Package-Manager: portage-2.1.3.9

5 files changed, 284 insertions, 5 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 8138e7676a30..016cec5305aa 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.99 2007/09/10 03:13:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.100 2007/09/10 18:42:06 steev Exp $
+
+*xinit-1.0.5-r1 (10 Sep 2007)
+
+  10 Sep 2007; Steev Klimaszewski <steev@gentoo.org>
+  +files/xinit-1.0.4-console-kit.patch, +xinit-1.0.5-r1.ebuild:
+  Add the patch from fdo bugzilla 12378 with useflag of hal rather than
+  consoleki, added as a revision bump to 1.0.5. This adds consolekit support
+  to xinit. Also requires dbus be build with the X useflag to properly work."
 
   10 Sep 2007; Jeroen Roovers <jer@gentoo.org> xinit-1.0.4.ebuild:
   Stable for HPPA (bug #191615).
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 1b3ab6c39e05..3457b1276c11 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -46,6 +46,10 @@ AUX xinit-1.0.2-setuid.diff 544 RMD160 62daa9092848c2886ae6ca159cd0188078d1da77
 MD5 1377016ad0dd0e127419e4452d66a8ef files/xinit-1.0.2-setuid.diff 544
 RMD160 62daa9092848c2886ae6ca159cd0188078d1da77 files/xinit-1.0.2-setuid.diff 544
 SHA256 665a12f7d7a0da742fbfb4b2270ce8482b25ae268b8dc1de483de8ad25b55f31 files/xinit-1.0.2-setuid.diff 544
+AUX xinit-1.0.4-console-kit.patch 4956 RMD160 286437f158d6a9ec588377b01d2b336d391bff37 SHA1 8d1ef61ec11bdf0308474560f0ed5156a6714d5f SHA256 65fd0800ccdecca979c8943755c5656fd022b54a160b32489ad95495521949e4
+MD5 e3765c9d58f8d0d40cd814283bbe4e74 files/xinit-1.0.4-console-kit.patch 4956
+RMD160 286437f158d6a9ec588377b01d2b336d391bff37 files/xinit-1.0.4-console-kit.patch 4956
+SHA256 65fd0800ccdecca979c8943755c5656fd022b54a160b32489ad95495521949e4 files/xinit-1.0.4-console-kit.patch 4956
 AUX xinitrc 1059 RMD160 3f3ae64f6056055d3d42e471a5dd4263aa1b66db SHA1 edd6919448086273a73b1de897afe93e01b046c8 SHA256 53871c9c3198b38d73b08da3837d1331240a5d45e987a5b8135e7116c02d8eff
 MD5 42da076fe0af42da30ca06db97f985c7 files/xinitrc 1059
 RMD160 3f3ae64f6056055d3d42e471a5dd4263aa1b66db files/xinitrc 1059
@@ -82,14 +86,18 @@ EBUILD xinit-1.0.4.ebuild 1329 RMD160 4e950adbb6663a94f00eeda365e6872534c26444 S
 MD5 b16a86030844afb016be3629bc5414d9 xinit-1.0.4.ebuild 1329
 RMD160 4e950adbb6663a94f00eeda365e6872534c26444 xinit-1.0.4.ebuild 1329
 SHA256 660abed7cdf4a5e8cc8d5b7ce696e4c5c4252ac23417f6acb323edbe157612c9 xinit-1.0.4.ebuild 1329
+EBUILD xinit-1.0.5-r1.ebuild 1671 RMD160 165dbf2aeb996a08ce52c7240986c611fcd51f9b SHA1 ece12da3a51d1936d2f0ca79b67006143c25cbf7 SHA256 2dd6e967ec36e8b5412081a1a223d19a013f409c02832b699cf1f38e95b9228a
+MD5 78845db1c3a820c2b50cbd09e3129951 xinit-1.0.5-r1.ebuild 1671
+RMD160 165dbf2aeb996a08ce52c7240986c611fcd51f9b xinit-1.0.5-r1.ebuild 1671
+SHA256 2dd6e967ec36e8b5412081a1a223d19a013f409c02832b699cf1f38e95b9228a xinit-1.0.5-r1.ebuild 1671
 EBUILD xinit-1.0.5.ebuild 1347 RMD160 ec4facab355f21cc0024ceb8fcf8a3f6eb9fe93a SHA1 9d7231f4af6de65fa1ac39d6edf2c00aaa944f30 SHA256 b0db843011bd8f0bdbf5ced1c1ea8f2e873949bc812fa8e1d7aa7caba93fad3b
 MD5 7a0959aa5fd5bcc8642a231d777c089f xinit-1.0.5.ebuild 1347
 RMD160 ec4facab355f21cc0024ceb8fcf8a3f6eb9fe93a xinit-1.0.5.ebuild 1347
 SHA256 b0db843011bd8f0bdbf5ced1c1ea8f2e873949bc812fa8e1d7aa7caba93fad3b xinit-1.0.5.ebuild 1347
-MISC ChangeLog 15510 RMD160 c44ca3e0ea7caf609c5cfb605ac43dd754f32246 SHA1 851cd386eb043ab38e3e6f0873227a32aa982f30 SHA256 5f401c6ae18f194740817a6112b6dd4ae5f9da821f8d0568aee68077aeba5ae3
-MD5 7f93fc210e1379d65cae01b72cd482fc ChangeLog 15510
-RMD160 c44ca3e0ea7caf609c5cfb605ac43dd754f32246 ChangeLog 15510
-SHA256 5f401c6ae18f194740817a6112b6dd4ae5f9da821f8d0568aee68077aeba5ae3 ChangeLog 15510
+MISC ChangeLog 15889 RMD160 f6baad6dd26ee4a9cee15f40567cbbdee4ff6f30 SHA1 a247ea780a404e23d859307703a88e124af30f98 SHA256 9df18131f930b87caf7abea902f0c477753f25d3402baafd58fb06e90e7e57aa
+MD5 3e17d0b7c9ce98b450c02518cf2ef255 ChangeLog 15889
+RMD160 f6baad6dd26ee4a9cee15f40567cbbdee4ff6f30 ChangeLog 15889
+SHA256 9df18131f930b87caf7abea902f0c477753f25d3402baafd58fb06e90e7e57aa ChangeLog 15889
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -115,3 +123,6 @@ SHA256 9232f41ed855c86ed71c95e580340c1b865ee6e1e9a548bf5c098eebaaf04ff6 files/di
 MD5 5222117bd1e59dd288e0db4cfc5f72e6 files/digest-xinit-1.0.5 238
 RMD160 57dea650c2000957b4d74f7bc2a8995ef0373031 files/digest-xinit-1.0.5 238
 SHA256 29a4fe681a6f9fc87e3ee93fa3827d85ad73aaeefa916b08a6ec90f16ec42606 files/digest-xinit-1.0.5 238
+MD5 5222117bd1e59dd288e0db4cfc5f72e6 files/digest-xinit-1.0.5-r1 238
+RMD160 57dea650c2000957b4d74f7bc2a8995ef0373031 files/digest-xinit-1.0.5-r1 238
+SHA256 29a4fe681a6f9fc87e3ee93fa3827d85ad73aaeefa916b08a6ec90f16ec42606 files/digest-xinit-1.0.5-r1 238
diff --git a/x11-apps/xinit/files/digest-xinit-1.0.5-r1 b/x11-apps/xinit/files/digest-xinit-1.0.5-r1
new file mode 100644
index 000000000000..4cf812d44311
--- /dev/null
+++ b/x11-apps/xinit/files/digest-xinit-1.0.5-r1
@@ -0,0 +1,3 @@
+MD5 9a2aad51042141a0e6ad066015397595 xinit-1.0.5.tar.bz2 106673
+RMD160 3e28f5b5404751934c274cfc81d3b85c71d72e9e xinit-1.0.5.tar.bz2 106673
+SHA256 95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d xinit-1.0.5.tar.bz2 106673
diff --git a/x11-apps/xinit/files/xinit-1.0.4-console-kit.patch b/x11-apps/xinit/files/xinit-1.0.4-console-kit.patch
new file mode 100644
index 000000000000..645e4e532ffb
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.0.4-console-kit.patch
@@ -0,0 +1,197 @@
+diff --git a/Makefile.am b/Makefile.am
+index babc2f3..9b912a3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,8 +24,8 @@ XINITDIR = $(libdir)/X11/xinit
+ bin_PROGRAMS = xinit
+ bin_SCRIPTS = startx
+ 
+-xinit_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
+-xinit_LDADD = $(XINIT_LIBS)
++xinit_CFLAGS = $(XINIT_CFLAGS) $(CK_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
++xinit_LDADD = $(XINIT_LIBS) $(CK_LIBS)
+ 
+ xinit_SOURCES =	\
+         xinit.c
+diff --git a/configure.ac b/configure.ac
+index 1aee1d2..5775db3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,6 +47,7 @@ DEFAULT_XMODMAP=xmodmap
+ DEFAULT_TWM=twm
+ DEFAULT_XCLOCK=xclock
+ DEFAULT_XTERM=xterm
++DEFAULT_CK=yes
+ # You always want to specify the full path to the X server
+ DEFAULT_XSERVER=${bindir}/X
+ DEFAULT_XAUTH=xauth
+@@ -104,6 +105,20 @@ esac
+ AC_SUBST(XINIT_CFLAGS)
+ AC_SUBST(XINIT_LIBS)
+ 
++# Check for ConsoleKit
++AC_ARG_WITH(consolekit,
++	 AS_HELP_STRING([--with-consolekit], [Use ConsoleKit in xinit]),
++	[CK="$withval"],
++	[CK="$DEFAULT_CK"])
++if test "x$CK" != xno ; then
++	PKG_CHECK_MODULES(CK, ck-connector,
++		have_conkit=yes,
++		[have_conkit=no; echo no])
++	if test "x$have_conkit" = xyes ; then
++		AC_DEFINE(USE_CONKIT, 1, [Define if you have ConsoleKit])
++	fi
++fi
++
+ AC_PATH_PROGS(MCOOKIE, [mcookie], [$MCOOKIE],
+   [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/local/bin])
+ if test "x$MCOOKIE" != x ; then
+diff --git a/startx.cpp b/startx.cpp
+index 42421ef..998c7f8 100644
+--- a/startx.cpp
++++ b/startx.cpp
+@@ -222,6 +222,12 @@ EOF
+     fi
+ done
+ 
++if [ x"$display" != x ]; then
++    export DISPLAY=$display
++else
++    export DISPLAY=:0
++fi
++
+ #if defined(__SCO__) || defined(__UNIXWARE__)
+ if [ "$REMOTE_SERVER" = "TRUE" ]; then
+         exec SHELL_CMD ${client}
+diff --git a/xinit.c b/xinit.c
+index 46dee54..c2c4527 100644
+--- a/xinit.c
++++ b/xinit.c
+@@ -39,6 +39,12 @@ in this Software without prior written authorization from The Open Group.
+ #include <ctype.h>
+ #include <stdint.h>
+ 
++#ifdef USE_CONKIT
++#include <ck-connector.h>
++#include <X11/Xatom.h>
++static CkConnector *ckc = NULL;
++#endif /* USE_CONKIT */
++
+ #ifdef X_POSIX_C_SOURCE
+ #define _POSIX_C_SOURCE X_POSIX_C_SOURCE
+ #include <signal.h>
+@@ -521,6 +527,39 @@ processTimeout(int timeout, char *string)
+ 	return( serverpid != pidfound );
+ }
+ 
++
++#ifdef USE_CONKIT
++static void
++register_new_session_with_console_kit (void)
++{
++	static char conkitbuf[256];
++	DBusError   error;
++
++	ckc = ck_connector_new ();
++	if (ckc == NULL) {
++		Error ("Cannot register with ConsoleKit: OOM creating CkConnector\n");
++		goto out;
++	}
++
++	dbus_error_init (&error);
++	if (!ck_connector_open_session (ckc, &error)) {
++		Error ("Cannot register with ConsoleKit: %s: %s\n", error.name, error.message);
++		goto out;
++	}
++
++	/* If we managed to register with ConsoleKit, put the
++	 * environment variable XDG_SESSION_COOKIE=cookie as second
++	 * element in newenviron. See set_environment() where we
++	 * earlier have made sure there is room...
++	 */
++	conkitbuf[sizeof (conkitbuf) - 1] = '\0';
++	snprintf (conkitbuf, sizeof (conkitbuf) - 1, "XDG_SESSION_COOKIE=%s", ck_connector_get_cookie (ckc));
++	newenviron[1] = conkitbuf;
++out:
++	;
++}
++#endif /* USE_CONKIT */
++
+ static int
+ startServer(char *server[])
+ {
+@@ -631,6 +670,12 @@ startServer(char *server[])
+ 		break;
+ 	}
+ 
++#ifdef USE_CONKIT
++	if (serverpid != -1 ) {
++		register_new_session_with_console_kit ();
++	}
++#endif /* USE_CONKIT */
++
+ 	return(serverpid);
+ }
+ 
+@@ -775,6 +820,13 @@ shutdown(void)
+ 				clientpid);
+ 	}
+ 
++#ifdef USE_CONKIT
++	if (ckc != NULL) {
++		ck_connector_unref (ckc);
++		ckc = NULL;
++	}
++#endif
++
+ 	if (serverpid < 0)
+ 		return;
+ 	errno = 0;
+@@ -811,6 +863,13 @@ shutdown(void)
+  * make a new copy of environment that has room for DISPLAY
+  */
+ 
++
++#ifdef USE_CONKIT
++#define NUM_EXTRA_ENV_VARS 4
++#else
++#define NUM_EXTRA_ENV_VARS 3
++#endif
++
+ static void 
+ set_environment(void)
+ {
+@@ -822,11 +881,11 @@ set_environment(void)
+     for (oldPtr = environ; *oldPtr; oldPtr++) ;
+ 
+     nenvvars = (oldPtr - environ);
+-    newenviron = (char **) malloc ((nenvvars + 3) * sizeof(char **));
++    newenviron = (char **) malloc ((nenvvars + NUM_EXTRA_ENV_VARS) * sizeof(char **));
+     if (!newenviron) {
+ 	fprintf (stderr,
+ 		 "%s:  unable to allocate %d pointers for environment\n",
+-		 program, nenvvars + 3);
++		 program, nenvvars + NUM_EXTRA_ENV_VARS);
+ 	exit (1);
+     }
+ 
+@@ -836,10 +895,18 @@ set_environment(void)
+     newPtr = newenviron;
+     *newPtr++ = displaybuf;
+ 
++#ifdef USE_CONKIT
++    *newPtr++ = "XDG_SESSION_COOKIE=";
++#endif
++
+     /* copy pointers to other variables */
+     for (oldPtr = environ; *oldPtr; oldPtr++) {
+ 	if (strncmp (*oldPtr, "DISPLAY=", 8) != 0
+-	 && strncmp (*oldPtr, "WINDOWPATH=", 11) != 0) {
++	 && strncmp (*oldPtr, "WINDOWPATH=", 11) != 0
++#ifdef USE_CONKIT
++	 && strncmp (*oldPtr, "XDG_SESSION_COOKIE=", 19) != 0
++#endif
++	 ) {
+ 	    *newPtr++ = *oldPtr;
+ 	}
+     }
diff --git a/x11-apps/xinit/xinit-1.0.5-r1.ebuild b/x11-apps/xinit/xinit-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..9e0c26051b91
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.0.5-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.5-r1.ebuild,v 1.1 2007/09/10 18:42:06 steev Exp $
+
+# Must be before x-modular eclass is inherited
+# This is enabled due to modified Makefile.am from the patches
+SNAPSHOT="yes"
+
+inherit x-modular pam
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="hal minimal"
+
+RDEPEND="x11-apps/xauth
+	x11-libs/libX11
+	hal? ( sys-auth/consolekit )"
+DEPEND="${RDEPEND}"
+PDEPEND="!minimal? ( x11-wm/twm
+				x11-apps/xclock
+				x11-apps/xrdb
+				x11-apps/xsm
+				x11-terms/xterm )"
+
+PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
+	${FILESDIR}/gentoo-startx-customization-1.0.4.patch
+	${FILESDIR}/xinit-1.0.4-console-kit.patch"
+
+CONFIGURE_OPTIONS="$(use_with hal consolekit)"
+
+pkg_setup() {
+	if ! built_with_use sys-apps/dbus X ; then
+		eerror "You MUST build sys-apps/dbus with the X USE flag enabled."
+		die "You MUST build sys-apps/dbus with the X USE flag enabled."
+	fi
+}
+
+src_unpack() {
+	x-modular_unpack_source
+	x-modular_patch_source
+
+	sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" ${S}/Makefile.am
+
+	x-modular_reconf_source
+}
+
+src_install() {
+	x-modular_src_install
+	exeinto /etc/X11
+	doexe ${FILESDIR}/chooser.sh ${FILESDIR}/startDM.sh
+	exeinto /etc/X11/Sessions
+	doexe ${FILESDIR}/Xsession
+	exeinto /etc/X11/xinit
+	doexe ${FILESDIR}/xinitrc
+	newinitd ${FILESDIR}/xdm.initd-1 xdm
+	newconfd ${FILESDIR}/xdm.confd-1 xdm
+	newpamd ${FILESDIR}/xserver.pamd xserver
+}