[arch-commits] Commit in libxcb/repos (6 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Mon Mar 12 20:52:27 UTC 2012
Date: Monday, March 12, 2012 @ 16:52:27
Author: andyrtr
Revision: 153294
db-move: moved libxcb from [testing] to [extra] (x86_64)
Added:
libxcb/repos/extra-x86_64/PKGBUILD
(from rev 153285, libxcb/repos/testing-x86_64/PKGBUILD)
libxcb/repos/extra-x86_64/libxcb-1.1-no-pthread-stubs.patch
(from rev 153285, libxcb/repos/testing-x86_64/libxcb-1.1-no-pthread-stubs.patch)
Deleted:
libxcb/repos/extra-x86_64/PKGBUILD
libxcb/repos/extra-x86_64/libxcb-1.1-no-pthread-stubs.patch
libxcb/repos/extra-x86_64/xcb_auth-fix-memory-leak.patch
libxcb/repos/testing-x86_64/
-----------------------------------+
PKGBUILD | 68 ++++++++++++++++--------------------
libxcb-1.1-no-pthread-stubs.patch | 23 +++++-------
xcb_auth-fix-memory-leak.patch | 38 --------------------
3 files changed, 43 insertions(+), 86 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-03-12 20:52:25 UTC (rev 153293)
+++ extra-x86_64/PKGBUILD 2012-03-12 20:52:27 UTC (rev 153294)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgname=libxcb
-pkgver=1.7
-pkgrel=2
-pkgdesc="X11 client-side library"
-arch=(i686 x86_64)
-url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.6' 'libxdmcp' 'libxau')
-makedepends=('pkgconfig' 'libxslt' 'python2')
-conflicts=('libx11<1.1.99.2')
-options=('!libtool')
-license=('custom')
-source=(${url}/dist/${pkgname}-${pkgver}.tar.bz2
- xcb_auth-fix-memory-leak.patch
- libxcb-1.1-no-pthread-stubs.patch)
-sha1sums=('7540f0587907bce421914f0ddb813810cb2f36f8'
- '0c9246fd2ea270bfa06cb8ef93df2f8227d83c2a'
- '3455e84642283bc91c8313af319002a20bbcbdf4')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch"
- patch -Np1 -i "${srcdir}/xcb_auth-fix-memory-leak.patch"
- libtoolize --force --copy
- aclocal
- autoconf
- automake --add-missing
- PYTHON=python2 ./configure --prefix=/usr --enable-xinput
- make
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: libxcb/repos/extra-x86_64/PKGBUILD (from rev 153285, libxcb/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-03-12 20:52:27 UTC (rev 153294)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=libxcb
+pkgver=1.8.1
+pkgrel=1
+pkgdesc="X11 client-side library"
+arch=(i686 x86_64)
+url="http://xcb.freedesktop.org/"
+depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau')
+makedepends=('pkgconfig' 'libxslt' 'python2')
+options=('!libtool')
+license=('custom')
+source=($url/dist/$pkgname-$pkgver.tar.bz2
+ libxcb-1.1-no-pthread-stubs.patch)
+sha1sums=('98199b6054750a06cddd4e77baa4354af547ce6f'
+ 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
+ PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
+ install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
+}
Deleted: extra-x86_64/libxcb-1.1-no-pthread-stubs.patch
===================================================================
--- extra-x86_64/libxcb-1.1-no-pthread-stubs.patch 2012-03-12 20:52:25 UTC (rev 153293)
+++ extra-x86_64/libxcb-1.1-no-pthread-stubs.patch 2012-03-12 20:52:27 UTC (rev 153294)
@@ -1,12 +0,0 @@
-diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac
---- libxcb-1.1/configure.ac.pthread-stubs 2007-11-04 18:17:11.000000000 -0500
-+++ libxcb-1.1/configure.ac 2007-11-12 10:27:06.000000000 -0500
-@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT)
-
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
-
- have_xdmcp="no"
Copied: libxcb/repos/extra-x86_64/libxcb-1.1-no-pthread-stubs.patch (from rev 153285, libxcb/repos/testing-x86_64/libxcb-1.1-no-pthread-stubs.patch)
===================================================================
--- extra-x86_64/libxcb-1.1-no-pthread-stubs.patch (rev 0)
+++ extra-x86_64/libxcb-1.1-no-pthread-stubs.patch 2012-03-12 20:52:27 UTC (rev 153294)
@@ -0,0 +1,11 @@
+--- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100
++++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100
+@@ -35,7 +35,7 @@
+
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7)
+-NEEDED="pthread-stubs xau >= 0.99.2"
++NEEDED="xau >= 0.99.2"
+ PKG_CHECK_MODULES(NEEDED, $NEEDED)
+
+ have_xdmcp="no"
Deleted: extra-x86_64/xcb_auth-fix-memory-leak.patch
===================================================================
--- extra-x86_64/xcb_auth-fix-memory-leak.patch 2012-03-12 20:52:25 UTC (rev 153293)
+++ extra-x86_64/xcb_auth-fix-memory-leak.patch 2012-03-12 20:52:27 UTC (rev 153294)
@@ -1,38 +0,0 @@
-From 5755582444ad0ba79e661ab3173cc38e9e588d83 Mon Sep 17 00:00:00 2001
-From: Nick Bowler <nbowler at draconx.ca>
-Date: Thu, 11 Nov 2010 01:49:41 +0000
-Subject: xcb_auth: Fix memory leak in _xcb_get_auth_info.
-
-If the initial get_peer_sock_name(getpeername ...) succeeds, the
-pointer to allocated memory is overwritten by the later call to
-get_peer_sock_name(getsockname ...). Fix that up by freeing
-the allocated memory before overwriting the pointer.
-
-Signed-off-by: Nick Bowler <nbowler at draconx.ca>
-Signed-off-by: Julien Danjou <julien at danjou.info>
----
-diff --git a/src/xcb_auth.c b/src/xcb_auth.c
-index 1af27fc..4839b78 100644
---- a/src/xcb_auth.c
-+++ b/src/xcb_auth.c
-@@ -327,10 +327,15 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display)
- if (!info->namelen)
- goto no_auth; /* out of memory */
-
-- if (!gotsockname && (sockname = get_peer_sock_name(getsockname, fd)) == NULL)
-+ if (!gotsockname)
- {
-- free(info->name);
-- goto no_auth; /* can only authenticate sockets */
-+ free(sockname);
-+
-+ if ((sockname = get_peer_sock_name(getsockname, fd)) == NULL)
-+ {
-+ free(info->name);
-+ goto no_auth; /* can only authenticate sockets */
-+ }
- }
-
- ret = compute_auth(info, authptr, sockname);
---
-cgit v0.8.3-6-g21f6
More information about the arch-commits
mailing list