diff --git a/.cvsignore b/.cvsignore index ac1cadf..9f9c45a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libxcb-1.1.tar.bz2 +libxcb-1.1.91.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..4c8a23e --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +libxcb-1_1_91-1_fc10:HEAD:libxcb-1.1.91-1.fc10.src.rpm:1221155742 diff --git a/libxcb-1.1-abstract-socket.patch b/libxcb-1.1-abstract-socket.patch index 7d01a6c..612dc9b 100644 --- a/libxcb-1.1-abstract-socket.patch +++ b/libxcb-1.1-abstract-socket.patch @@ -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 + #include ++#include + #include + #include + #include +@@ -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 diff --git a/libxcb.spec b/libxcb.spec index 663a452..71794bf 100644 --- a/libxcb.spec +++ b/libxcb.spec @@ -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: doxygen 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 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/doc/%{name}-%{version} %changelog +* Wed Sep 10 2008 Adam Jackson 1.1.91-1 +- libxcb 1.1.91 + * Tue Apr 22 2008 Adam Jackson 1.1-4 - libxcb-1.1-sloppy-lock.patch: Turn sloppy locking on all the time. I'm tired of fighting it. (#390261) diff --git a/sources b/sources index 901aa20..8045056 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9310b02433273d75d42f10da3c7455aa libxcb-1.1.tar.bz2 +aeee03318a5716aa14f91af33c4abe37 libxcb-1.1.91.tar.bz2