From 21e9f13b6e163f37f0281950c5108d2a75fb2ec1 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 30 May 2013 16:53:47 +0000
Subject: Update to 1.9.1:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix python code to work with python-3
* Security fix for integer overflow in read_packet() [CVE-2013-2064]

Alan Coopersmith (2):
      integer overflow in read_packet() [CVE-2013-2064]
      libxcb 1.9.1

Christian König (1):
      whitespace fix in xcb_take_socket

Chí-Thanh Christopher Nguyễn (2):
      c-client.py: Fix python-3 AttributeError: 'dict' object has no attribute 'iteritems'
      c_client.py: Fix python-3 invalid except statement

Colin Walters (1):
      autogen.sh: Implement GNOME Build API
---
 x11/libxcb/Makefile         |  5 ++---
 x11/libxcb/distinfo         | 11 +++++------
 x11/libxcb/patches/patch-aa |  8 ++++----
 x11/libxcb/patches/patch-ab | 13 -------------
 4 files changed, 11 insertions(+), 26 deletions(-)
 delete mode 100644 x11/libxcb/patches/patch-ab

(limited to 'x11')

diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 52a953739b4..2d54ae15e46 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2013/05/10 22:40:31 riastradh Exp $
-#
+# $NetBSD: Makefile,v 1.22 2013/05/30 16:53:47 wiz Exp $
 
-DISTNAME=	libxcb-1.9
+DISTNAME=	libxcb-1.9.1
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo
index 9427688d035..2f2f041cebe 100644
--- a/x11/libxcb/distinfo
+++ b/x11/libxcb/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2012/10/07 22:09:47 wiz Exp $
+$NetBSD: distinfo,v 1.11 2013/05/30 16:53:47 wiz Exp $
 
-SHA1 (libxcb-1.9.tar.bz2) = ad2fb95eeec41ba3d39502a4f7460c3b64fdf061
-RMD160 (libxcb-1.9.tar.bz2) = 8558eee4a0f550e019c30388bf6d0feddaaaac0c
-Size (libxcb-1.9.tar.bz2) = 387612 bytes
-SHA1 (patch-aa) = f099c6a56e965950e38cd451595a8c897fd824d1
-SHA1 (patch-ab) = 5b4ec005b76dd10730edb6acb9f6b9dd48ef9b2e
+SHA1 (libxcb-1.9.1.tar.bz2) = bf786bb7b9089102b73753135e061c87dc8e8685
+RMD160 (libxcb-1.9.1.tar.bz2) = ab86e167f8cfea581b881d5bf79f36fc0ebafe6f
+Size (libxcb-1.9.1.tar.bz2) = 373312 bytes
+SHA1 (patch-aa) = 3a4880259cd0f9658142a871e11f5a1793696c76
 SHA1 (patch-ai) = 637affb3aa2f7d40e0aada4dadab8c695ea74b6f
diff --git a/x11/libxcb/patches/patch-aa b/x11/libxcb/patches/patch-aa
index 490ceaacbe5..c5d20041178 100644
--- a/x11/libxcb/patches/patch-aa
+++ b/x11/libxcb/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2010/09/10 19:13:52 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2013/05/30 16:53:47 wiz Exp $
 
---- configure.orig	2010-09-06 16:16:29.000000000 +0000
+--- configure.orig	2013-05-30 15:38:09.000000000 +0000
 +++ configure
-@@ -11827,7 +11827,7 @@ else
+@@ -13120,7 +13120,7 @@ else
  $as_echo "yes" >&6; }
- 
+ 	:
  fi
 -NEEDED="pthread-stubs xau >= 0.99.2"
 +NEEDED="xau >= 0.99.2"
diff --git a/x11/libxcb/patches/patch-ab b/x11/libxcb/patches/patch-ab
deleted file mode 100644
index b283b3737b9..00000000000
--- a/x11/libxcb/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2012/06/03 17:29:41 wiz Exp $
-
---- configure.ac.orig	2012-03-09 14:38:38.000000000 +0000
-+++ configure.ac
-@@ -35,7 +35,7 @@ AC_SUBST(HTML_CHECK_RESULT)
- 
- # 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"
-- 
cgit v1.2.3