libxcb 1.1.91

This commit is contained in:
Adam Jackson 2008-09-11 18:00:15 +00:00
parent db30cb0b81
commit d7bc8d0a15
5 changed files with 25 additions and 21 deletions

View File

@ -1 +1 @@
libxcb-1.1.tar.bz2 libxcb-1.1.91.tar.bz2

1
import.log Normal file
View File

@ -0,0 +1 @@
libxcb-1_1_91-1_fc10:HEAD:libxcb-1.1.91-1.fc10.src.rpm:1221155742

View File

@ -1,27 +1,26 @@
diff -up libxcb-1.1/src/xcb_util.c.abstract libxcb-1.1/src/xcb_util.c diff -up libxcb-1.1.91/src/xcb_util.c.abstract libxcb-1.1.91/src/xcb_util.c
--- libxcb-1.1/src/xcb_util.c.abstract 2007-10-23 12:44:59.000000000 -0400 --- libxcb-1.1.91/src/xcb_util.c.abstract 2008-07-13 07:42:41.000000000 -0400
+++ libxcb-1.1/src/xcb_util.c 2007-11-12 10:32:37.000000000 -0500 +++ libxcb-1.1.91/src/xcb_util.c 2008-09-10 17:23:10.000000000 -0400
@@ -249,13 +249,22 @@ static int _xcb_open_unix(char *protocol @@ -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)) if (protocol && strcmp("unix",protocol))
return -1; return -1;
- strcpy(addr.sun_path, file);
+ memset(&addr, 0, sizeof(addr)); + memset(&addr, 0, sizeof(addr));
+ addr.sun_family = AF_UNIX; + addr.sun_family = AF_UNIX;
fd = socket(AF_UNIX, SOCK_STREAM, 0);
if(fd == -1)
return -1;
+ +
+ /* try the abstract socket first */ + /* try the abstract socket first */
+ strcpy(addr.sun_path + 1, file); + 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; + return fd;
+ +
+ strcpy(addr.sun_path, file); strcpy(addr.sun_path, file);
if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) addr.sun_family = AF_UNIX;
return -1; #if HAVE_SOCKADDR_SUN_LEN
+
return fd;
}

View File

@ -1,6 +1,6 @@
Name: libxcb Name: libxcb
Version: 1.1 Version: 1.1.91
Release: 4%{?dist} Release: 1%{?dist}
Summary: A C binding to the X11 protocol Summary: A C binding to the X11 protocol
Group: System Environment/Libraries Group: System Environment/Libraries
@ -18,6 +18,7 @@ BuildRequires: doxygen
BuildRequires: graphviz BuildRequires: graphviz
BuildRequires: libXau-devel BuildRequires: libXau-devel
BuildRequires: libxslt BuildRequires: libxslt
BuildRequires: python
BuildRequires: xcb-proto >= 1.1 BuildRequires: xcb-proto >= 1.1
BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-proto-devel
BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-util-macros
@ -82,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/doc/%{name}-%{version} %{_datadir}/doc/%{name}-%{version}
%changelog %changelog
* Wed Sep 10 2008 Adam Jackson <ajax@redhat.com> 1.1.91-1
- libxcb 1.1.91
* Tue Apr 22 2008 Adam Jackson <ajax@redhat.com> 1.1-4 * Tue Apr 22 2008 Adam Jackson <ajax@redhat.com> 1.1-4
- libxcb-1.1-sloppy-lock.patch: Turn sloppy locking on all the time. I'm - libxcb-1.1-sloppy-lock.patch: Turn sloppy locking on all the time. I'm
tired of fighting it. (#390261) tired of fighting it. (#390261)

View File

@ -1 +1 @@
9310b02433273d75d42f10da3c7455aa libxcb-1.1.tar.bz2 aeee03318a5716aa14f91af33c4abe37 libxcb-1.1.91.tar.bz2