packages: xorg-app-xinit/xorg-app-xinit-consolekit-support.patch, xorg-app-...

qboosh qboosh at pld-linux.org
Sun Oct 31 11:18:29 CET 2010 

Author: qboosh                       Date: Sun Oct 31 10:18:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.3.0
- updated patches (ck functioning untested)

---- Files affected:
packages/xorg-app-xinit:
   xorg-app-xinit-consolekit-support.patch (1.2 -> 1.3) , xorg-app-xinit-xwrapper.patch (1.4 -> 1.5) , xorg-app-xinit.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: packages/xorg-app-xinit/xorg-app-xinit-consolekit-support.patch
diff -u packages/xorg-app-xinit/xorg-app-xinit-consolekit-support.patch:1.2 packages/xorg-app-xinit/xorg-app-xinit-consolekit-support.patch:1.3
--- packages/xorg-app-xinit/xorg-app-xinit-consolekit-support.patch:1.2	Thu May 27 09:29:24 2010
+++ packages/xorg-app-xinit/xorg-app-xinit-consolekit-support.patch	Sun Oct 31 11:18:23 2010
@@ -50,13 +50,11 @@
  #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>
+--- xinit-1.3.0/xinit.c.orig	2010-10-31 10:39:31.355103290 +0100
++++ xinit-1.3.0/xinit.c	2010-10-31 10:51:48.107104966 +0100
+@@ -41,6 +41,12 @@
+ #include <setjmp.h>
+ #include <stdarg.h>
  
 +#ifdef USE_CONKIT
 +#include <ck-connector.h>
@@ -64,11 +62,11 @@
 +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 __APPLE__
+ #include <AvailabilityMacros.h>
+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+@@ -395,6 +401,38 @@
+     return (serverpid != pidfound);
  }
  
 +
@@ -96,9 +94,8 @@
 +	 * 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;
++	if (setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie (ckc), TRUE) == -1)
++	    Fatal("unable to set XDG_SESSION_COOKIE");
 +out:
 +	;
 +}
@@ -107,78 +104,27 @@
  static int
  startServer(char *server[])
  {
-@@ -631,6 +670,12 @@ startServer(char *server[])
- 		break;
- 	}
- 
+@@ -568,6 +606,9 @@
+     if (clientpid == 0) {
+         set_environment();
+         setWindowPath();
 +#ifdef USE_CONKIT
-+	if (serverpid != -1 ) {
-+		register_new_session_with_console_kit ();
-+	}
++	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);
+         if (setuid(getuid()) == -1) {
+             Error("cannot change uid");
+@@ -612,6 +653,13 @@
+             Error("can't send HUP to process group %d", clientpid);
      }
  
-@@ -836,10 +895,18 @@ set_environment(void)
-     newPtr = newenviron;
-     *newPtr++ = displaybuf;
- 
 +#ifdef USE_CONKIT
-+    *newPtr++ = "XDG_SESSION_COOKIE=";
++    if (ckc != NULL) {
++	ck_connector_unref (ckc);
++	ckc = NULL;
++    }
 +#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;
- 	}
-     }
+     if (serverpid < 0)
+         return;
+ 

================================================================
Index: packages/xorg-app-xinit/xorg-app-xinit-xwrapper.patch
diff -u packages/xorg-app-xinit/xorg-app-xinit-xwrapper.patch:1.4 packages/xorg-app-xinit/xorg-app-xinit-xwrapper.patch:1.5
--- packages/xorg-app-xinit/xorg-app-xinit-xwrapper.patch:1.4	Sat Mar  8 02:32:27 2008
+++ packages/xorg-app-xinit/xorg-app-xinit-xwrapper.patch	Sun Oct 31 11:18:23 2010
@@ -20,25 +20,25 @@
  defaultclientargs=""
  defaultserverargs=""
  clientargs=""
---- xinit-1.0.8/xinit.c.orig	2008-03-06 23:08:48.000000000 +0100
-+++ xinit-1.0.8/xinit.c	2008-03-08 02:12:06.010657245 +0100
-@@ -166,6 +166,7 @@
- #define	OK_EXIT		0
- #define	ERR_EXIT	1
+--- xinit-1.3.0/xinit.c.orig	2010-06-12 03:14:10.000000000 +0200
++++ xinit-1.3.0/xinit.c	2010-10-31 10:38:50.551098261 +0100
+@@ -92,6 +92,7 @@
+ #define TRUE 1
+ #define FALSE 0
  
 +static char *default_wrapper = BINDIR "/Xwrapper";
  static char *default_server = "X";
- static char *default_display = ":0";		/* choose most efficient */
+ static char *default_display = ":0";        /* choose most efficient */
  static char *default_client[] = {"xterm", "-geometry", "+1+1", "-n", "login", NULL};
-@@ -374,7 +375,10 @@
- 	if (argc == 0 ||
- #ifndef __UNIXOS2__
- 	    (**argv != '/' && **argv != '.')) {
--		*sptr++ = default_server;
-+		if (access(default_wrapper, X_OK) == 0)
-+			*sptr++ = default_wrapper;
-+		else
-+			*sptr++ = default_server;
- #else
- 	    (**argv != '/' && **argv != '\\' && **argv != '.' &&
- 	     !(isalpha(**argv) && (*argv)[1]==':'))) {
+@@ -191,7 +192,10 @@
+      */
+     if (argc == 0 ||
+         (**argv != '/' && **argv != '.')) {
+-        *sptr++ = default_server;
++	if (access(default_wrapper, X_OK) == 0)
++	    *sptr++ = default_wrapper;
++	else
++            *sptr++ = default_server;
+     } else {
+         server_given = 1;
+         *sptr++ = *argv++;

================================================================
Index: packages/xorg-app-xinit/xorg-app-xinit.spec
diff -u packages/xorg-app-xinit/xorg-app-xinit.spec:1.28 packages/xorg-app-xinit/xorg-app-xinit.spec:1.29
--- packages/xorg-app-xinit/xorg-app-xinit.spec:1.28	Thu May 27 09:30:11 2010
+++ packages/xorg-app-xinit/xorg-app-xinit.spec	Sun Oct 31 11:18:23 2010
@@ -6,12 +6,12 @@
 Summary:	xinit application - X Window System initializer
 Summary(pl.UTF-8):	Aplikacja xinit do uruchamiania X Window System
 Name:		xorg-app-xinit
-Version:	1.2.1
+Version:	1.3.0
 Release:	1
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/app/xinit-%{version}.tar.bz2
-# Source0-md5:	56f2d202b3dc10fcd21931a67bb270f7
+# Source0-md5:	bc4e8b7d1919597cc37a0d24aa149dda
 Source1:	startx.1x.it
 Source2:	startx.1x.pl
 Source3:	xinit.1x.it
@@ -20,13 +20,13 @@
 Patch1:		%{name}-consolekit-support.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	ConsoleKit-devel
-BuildRequires:	autoconf >= 2.57
+BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
 BuildRequires:	cpp
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-proto-inputproto-devel
-BuildRequires:	xorg-util-util-macros >= 1.3
+BuildRequires:	xorg-util-util-macros >= 1.8
 Requires:	/etc/X11/xinit/xinitrc
 Requires:	xorg-app-xauth
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -112,6 +112,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2010/10/31 10:18:23  qboosh
+- updated to 1.3.0
+- updated patches (ck functioning untested)
+
 Revision 1.28  2010/05/27 07:30:11  qboosh
 - util-macros version
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-app-xinit/xorg-app-xinit-consolekit-support.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-app-xinit/xorg-app-xinit-xwrapper.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-app-xinit/xorg-app-xinit.spec?r1=1.28&r2=1.29&f=u

More information about the pld-cvs-commit mailing list