rpms/xorg-x11-xtrans-devel/F-9 xtrans-1.1-abstract.patch, NONE, 1.1 xorg-x11-xtrans-devel.spec, 1.24, 1.25

Bill Nottingham (notting) fedora-extras-commits at redhat.com
Tue May 6 18:07:38 UTC 2008


Author: notting

Update of /cvs/extras/rpms/xorg-x11-xtrans-devel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31636/F-9

Modified Files:
	xorg-x11-xtrans-devel.spec 
Added Files:
	xtrans-1.1-abstract.patch 
Log Message:
You do not need to mkdir for abstract sockets. Don't bail if it fails. Heck,
don't even try. (#445303)


xtrans-1.1-abstract.patch:

--- NEW FILE xtrans-1.1-abstract.patch ---
diff -up xtrans-1.1/Xtranssock.c.foo xtrans-1.1/Xtranssock.c
--- xtrans-1.1/Xtranssock.c.foo	2008-05-06 13:48:07.000000000 -0400
+++ xtrans-1.1/Xtranssock.c	2008-05-06 13:47:51.000000000 -0400
@@ -1148,7 +1148,7 @@ TRANS(SocketUNIXCreateListener) (XtransC
 #else
     mode = 0777;
 #endif
-    if (trans_mkdir(UNIX_DIR, mode) == -1) {
+    if (!abstract && trans_mkdir(UNIX_DIR, mode) == -1) {
 	PRMSG (1, "SocketUNIXCreateListener: mkdir(%s) failed, errno = %d\n",
 	       UNIX_DIR, errno, 0);
 	(void) umask (oldUmask);


Index: xorg-x11-xtrans-devel.spec
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-xtrans-devel/F-9/xorg-x11-xtrans-devel.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-xtrans-devel.spec	6 Mar 2008 02:08:29 -0000	1.24
+++ xorg-x11-xtrans-devel.spec	6 May 2008 18:06:57 -0000	1.25
@@ -26,6 +26,7 @@
 %prep
 %setup -q -n xtrans-%{version}
 %patch1 -p1 -b .my-name-is-unix
+%patch2 -p1 -b .abstract-doesn't-need-mkdir
 
 %build
 
@@ -59,6 +60,10 @@
 %{_datadir}/aclocal/xtrans.m4
 
 %changelog
+* Tue May 06 2008 Bill Nottingham <notting at redhat.com> 1.1-2
+- xtrans-1.1-abstract.patch: Don't worry about making /tmp/.X11-unix
+  (or failure to do so) if you're using an abstract socket (#445303)
+
 * Wed Mar 05 2008 Adam Jackson <ajax at redhat.com> 1.1-1
 - xtrans 1.1
 




More information about the scm-commits mailing list