From 0c6dcc850b5a5fa692bf1531c94efba47c7315b4 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 31 May 2013 08:28:47 +0000 Subject: Update to 1.1.4: This release provides the fixes for the recently announced security issues CVE-2013-1991 & CVE-2013-2000, along with a couple build fixes. Adam Jackson (1): configure: Remove AM_MAINTAINER_MODE Alan Coopersmith (7): Use _XEatDataWords to avoid overflow of rep.length shifting integer overflow in XDGAQueryModes() [CVE-2013-1991 1/2] buffer overflow in XDGAQueryModes() [CVE-2013-2000 1/2] integer overflow & underflow in XDGASetMode() [CVE-2013-1991 2/2] buffer overflow in XDGASetMode() [CVE-2013-2000 2/2] integer overflow in XDGAOpenFramebuffer() libXxf86dga 1.1.4 Colin Walters (1): autogen.sh: Implement GNOME Build API Jeremy Huddleston (2): Build fix when sizeof(off_t) > sizeof(void *) Include for uintptr_t --- x11/libXxf86dga/Makefile | 5 ++--- x11/libXxf86dga/distinfo | 9 ++++----- x11/libXxf86dga/patches/patch-src_XF86DGA2.c | 27 --------------------------- 3 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 x11/libXxf86dga/patches/patch-src_XF86DGA2.c (limited to 'x11') diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile index 6d4df7e21f2..a4fc4c0d7bd 100644 --- a/x11/libXxf86dga/Makefile +++ b/x11/libXxf86dga/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2012/10/29 05:06:36 asau Exp $ -# +# $NetBSD: Makefile,v 1.12 2013/05/31 08:28:47 wiz Exp $ -DISTNAME= libXxf86dga-1.1.3 +DISTNAME= libXxf86dga-1.1.4 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/libXxf86dga/distinfo b/x11/libXxf86dga/distinfo index 4f77a505b49..0a16ece1a93 100644 --- a/x11/libXxf86dga/distinfo +++ b/x11/libXxf86dga/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.6 2012/06/12 22:31:11 wiz Exp $ +$NetBSD: distinfo,v 1.7 2013/05/31 08:28:47 wiz Exp $ -SHA1 (libXxf86dga-1.1.3.tar.bz2) = 5af5d7d2f239b31035ae5b9d3e3718c833af8b56 -RMD160 (libXxf86dga-1.1.3.tar.bz2) = 7075d6db6fa256e9ee54de5b78a2a9ad685481ac -Size (libXxf86dga-1.1.3.tar.bz2) = 290347 bytes -SHA1 (patch-src_XF86DGA2.c) = 00132ac904c746b0f549faa352976e3dd912b8d4 +SHA1 (libXxf86dga-1.1.4.tar.bz2) = 51f2fc8d5d5fb398cf3c66735789feadb9aaeba9 +RMD160 (libXxf86dga-1.1.4.tar.bz2) = e34a3a3c1e15d2de2eb8e698fc5c244718b08700 +Size (libXxf86dga-1.1.4.tar.bz2) = 280216 bytes diff --git a/x11/libXxf86dga/patches/patch-src_XF86DGA2.c b/x11/libXxf86dga/patches/patch-src_XF86DGA2.c deleted file mode 100644 index fd88e4a673f..00000000000 --- a/x11/libXxf86dga/patches/patch-src_XF86DGA2.c +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-src_XF86DGA2.c,v 1.2 2012/06/12 22:31:11 wiz Exp $ - -From upstream. -First chunk: -http://cgit.freedesktop.org/xorg/lib/libXxf86dga/commit/?id=d4f89f7f42484963575b4c7d2fa694051e111e76 -Second chunk: -http://cgit.freedesktop.org/xorg/lib/libXxf86dga/commit/?id=56b5a5887349e9d0e1d28da157fe6441ca691f56 - ---- src/XF86DGA2.c.orig 2012-03-08 05:35:46.000000000 +0000 -+++ src/XF86DGA2.c -@@ -21,6 +21,7 @@ Copyright (c) 1995,1996 The XFree86 Pro - #include - #include - -+#include - - /* If you change this, change the Bases[] array below as well */ - #define MAX_HEADS 16 -@@ -928,7 +929,7 @@ DGAMapPhysical( - if ((pMap->fd = open(name, O_RDWR)) < 0) - return False; - pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, -- MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base); -+ MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base); - if (pMap->virtual == (void *)-1) - return False; - mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE); -- cgit v1.2.3