[Pkg-kde-commits] rev 813 - trunk/packages/kdelibs/debian/patches

[Adeodato Simó]

Author: dato-guest
Date: 2005-03-16 23:28:10 +0100 (Wed, 16 Mar 2005)
New Revision: 813

Added:
   trunk/packages/kdelibs/debian/patches/21_post-3.3.2-kdelibs-dcop.diff
Log:
Adding the missing patch that was uploaded with kdelibs 3.3.2-4.


Added: trunk/packages/kdelibs/debian/patches/21_post-3.3.2-kdelibs-dcop.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/21_post-3.3.2-kdelibs-dcop.diff	2005-03-15 15:53:25 UTC (rev 812)
+++ trunk/packages/kdelibs/debian/patches/21_post-3.3.2-kdelibs-dcop.diff	2005-03-16 22:28:10 UTC (rev 813)
@@ -0,0 +1,56 @@
+Index: kdelibs/dcop/dcopserver.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/dcop/dcopserver.cpp,v
+retrieving revision 1.170.2.1
+diff -u -p -r1.170.2.1 dcopserver.cpp
+--- kdelibs/dcop/dcopserver.cpp	6 Aug 2004 11:18:23 -0000	1.170.2.1
++++ kdelibs/dcop/dcopserver.cpp	2 Mar 2005 13:09:38 -0000
+@@ -952,7 +952,7 @@ DCOPServer::DCOPServer(bool _suicide)
+ 	}
+ 
+     char errormsg[256];
+-    int orig_umask = umask(0); /*old libICE's don't reset the umask() they set */
++    int orig_umask = umask(077); /*old libICE's don't reset the umask() they set */
+     if (!IceListenForConnections (&numTransports, &listenObjs,
+ 				  256, errormsg))
+ 	{
+Index: dcop/KDE-ICE/Xtranssock.c
+===================================================================
+RCS file: /home/kde/kdelibs/dcop/KDE-ICE/Xtranssock.c,v
+retrieving revision 1.10
+diff -u -p -r1.10 Xtranssock.c
+--- kdelibs/dcop/KDE-ICE/Xtranssock.c	2 Jun 2004 20:28:25 -0000	1.10
++++ kdelibs/dcop/KDE-ICE/Xtranssock.c	2 Mar 2005 13:09:38 -0000
+@@ -940,6 +940,7 @@ TRANS(SocketUNIXCreateListener) (XtransC
+ #endif
+ 
+     unlink (sockname.sun_path);
++    (void) umask (oldUmask);
+ 
+     if ((status = TRANS(SocketCreateListener) (ciptr,
+ 	(struct sockaddr *) &sockname, namelen)) < 0)
+@@ -947,7 +948,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
+ 	PRMSG (1,
+     "SocketUNIXCreateListener: ...SocketCreateListener() failed\n",
+ 	    0, 0, 0);
+-	(void) umask (oldUmask);
+ 	return status;
+     }
+ 
+@@ -965,7 +965,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
+         PRMSG (1,
+         "SocketUNIXCreateListener: Can't allocate space for the addr\n",
+ 	    0, 0, 0);
+-	(void) umask (oldUmask);
+         return TRANS_CREATE_LISTENER_FAILED;
+     }
+ 
+@@ -973,8 +972,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
+     ciptr->addrlen = namelen;
+     memcpy (ciptr->addr, &sockname, ciptr->addrlen);
+ 
+-    (void) umask (oldUmask);
+-
+     return 0;
+ }
+