rpms/libxcb/devel import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 libxcb-1.1-abstract-socket.patch, 1.1, 1.2 libxcb.spec, 1.7, 1.8 sources, 1.3, 1.4

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/libxcb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26794/devel

Modified Files:
	.cvsignore libxcb-1.1-abstract-socket.patch libxcb.spec 
	sources 
Added Files:
	import.log 
Log Message:
libxcb 1.1.91



--- NEW FILE import.log ---
libxcb-1_1_91-1_fc10:HEAD:libxcb-1.1.91-1.fc10.src.rpm:1221155742


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Nov 2007 15:36:24 -0000	1.3
+++ .cvsignore	11 Sep 2008 18:00:15 -0000	1.4
@@ -1 +1 @@
-libxcb-1.1.tar.bz2
+libxcb-1.1.91.tar.bz2

libxcb-1.1-abstract-socket.patch:

Index: libxcb-1.1-abstract-socket.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/libxcb-1.1-abstract-socket.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libxcb-1.1-abstract-socket.patch	12 Nov 2007 15:36:24 -0000	1.1
+++ libxcb-1.1-abstract-socket.patch	11 Sep 2008 18:00:15 -0000	1.2
@@ -1,27 +1,26 @@
-diff -up libxcb-1.1/src/xcb_util.c.abstract libxcb-1.1/src/xcb_util.c
---- libxcb-1.1/src/xcb_util.c.abstract	2007-10-23 12:44:59.000000000 -0400
-+++ libxcb-1.1/src/xcb_util.c	2007-11-12 10:32:37.000000000 -0500
-@@ -249,13 +249,22 @@ static int _xcb_open_unix(char *protocol
+diff -up libxcb-1.1.91/src/xcb_util.c.abstract libxcb-1.1.91/src/xcb_util.c
+--- libxcb-1.1.91/src/xcb_util.c.abstract	2008-07-13 07:42:41.000000000 -0400
++++ libxcb-1.1.91/src/xcb_util.c	2008-09-10 17:23:10.000000000 -0400
+@@ -36,6 +36,7 @@
+ #endif
+ #include <netdb.h>
+ #include <errno.h>
++#include <stddef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -251,6 +252,14 @@ static int _xcb_open_unix(char *protocol
      if (protocol && strcmp("unix",protocol))
          return -1;
  
--    strcpy(addr.sun_path, file);
 +    memset(&addr, 0, sizeof(addr));
 +    addr.sun_family = AF_UNIX;
- 
-     fd = socket(AF_UNIX, SOCK_STREAM, 0);
-     if(fd == -1)
-         return -1;
 +
 +    /* try the abstract socket first */
 +    strcpy(addr.sun_path + 1, file);
-+    if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) != -1)
++    if(connect(fd, (struct sockaddr *) &addr, strlen(file) + 1 + offsetof(struct sockaddr_un, sun_path)) != -1)
 +        return fd;
 +
-+    strcpy(addr.sun_path, file);
-     if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
-         return -1;
-+
-     return fd;
- }
- 
+     strcpy(addr.sun_path, file);
+     addr.sun_family = AF_UNIX;
+ #if HAVE_SOCKADDR_SUN_LEN


Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/libxcb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libxcb.spec	22 Apr 2008 16:53:59 -0000	1.7
+++ libxcb.spec	11 Sep 2008 18:00:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libxcb
-Version:        1.1
-Release:        4%{?dist}
+Version:        1.1.91
+Release:        1%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -18,6 +18,7 @@
 BuildRequires:  graphviz
 BuildRequires:  libXau-devel
 BuildRequires:  libxslt
+BuildRequires:	python
 BuildRequires:  xcb-proto >= 1.1
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  xorg-x11-util-macros
@@ -82,6 +83,9 @@
 %{_datadir}/doc/%{name}-%{version}
 
 %changelog
+* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 1.1.91-1
+- libxcb 1.1.91
+
 * Tue Apr 22 2008 Adam Jackson <ajax at redhat.com> 1.1-4
 - libxcb-1.1-sloppy-lock.patch: Turn sloppy locking on all the time.  I'm
   tired of fighting it. (#390261)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Nov 2007 15:36:24 -0000	1.3
+++ sources	11 Sep 2008 18:00:15 -0000	1.4
@@ -1 +1 @@
-9310b02433273d75d42f10da3c7455aa  libxcb-1.1.tar.bz2
+aeee03318a5716aa14f91af33c4abe37  libxcb-1.1.91.tar.bz2