From e95c1cfe642c87dd97aaff6022d1d989f52c496a Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 23 Oct 2006 14:54:11 +0000 Subject: Changes 3.3.7: * Fixed security flaw in the way Qt handles pixmap images --- x11/qt3-docs/Makefile | 3 +-- x11/qt3-libs/Makefile | 3 +-- x11/qt3-libs/distinfo | 10 +++++----- x11/qt3-libs/patches/patch-ja | 8 ++++---- x11/qt3-mysql/Makefile | 3 +-- x11/qt3-tools/Makefile | 3 +-- x11/qt3/Makefile.common | 4 ++-- 7 files changed, 15 insertions(+), 19 deletions(-) diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile index 7267a2fc56f..9e0c3b8451a 100644 --- a/x11/qt3-docs/Makefile +++ b/x11/qt3-docs/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2006/04/17 13:47:00 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2006/10/23 14:54:11 adam Exp $ .include "../../x11/qt3-libs/Makefile.common" PKGNAME= qt3-docs-${QTVERSION} -PKGREVISION= 1 COMMENT= Documentation for the QT C++ X GUI toolkit BUILD_QT3= yes diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index b1021a6624d..85395d534bf 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.56 2006/10/19 12:58:12 drochner Exp $ +# $NetBSD: Makefile,v 1.57 2006/10/23 14:54:11 adam Exp $ PKGNAME= qt3-libs-${QTVERSION} -PKGREVISION= 3 MAINTAINER= adam@NetBSD.org COMMENT= C++ X GUI toolkit diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index 32da854b038..5a16cd4070b 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.39 2006/10/19 12:58:12 drochner Exp $ +$NetBSD: distinfo,v 1.40 2006/10/23 14:54:11 adam Exp $ -SHA1 (qt-x11-free-3.3.6.tar.bz2) = bbb075054b8a2923a8a7f5afff1c4c7a8bf5a946 -RMD160 (qt-x11-free-3.3.6.tar.bz2) = 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 -Size (qt-x11-free-3.3.6.tar.bz2) = 14565843 bytes +SHA1 (qt-x11-free-3.3.7.tar.bz2) = 824a4a69f78450e0c32b6c4bca17ef5d07a3b58d +RMD160 (qt-x11-free-3.3.7.tar.bz2) = 64924ae987799b580cbae1c644b877812b86bc1d +Size (qt-x11-free-3.3.7.tar.bz2) = 14564513 bytes SHA1 (patch-aa) = 0247c3694db7bf29556e00809b5d7f26817f3055 SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75 SHA1 (patch-ac) = 1914c348846ae2ab0358e554d29ba49a0be90d52 @@ -22,4 +22,4 @@ SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41 SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830 SHA1 (patch-ia) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 SHA1 (patch-ib) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 -SHA1 (patch-ja) = e56e1b092effb53937035f3004c563ad6fd87f89 +SHA1 (patch-ja) = c04be87cd4a8bb3b9f6f32ea37a11c1b15803a21 diff --git a/x11/qt3-libs/patches/patch-ja b/x11/qt3-libs/patches/patch-ja index e1c7c0ee366..1a465562e0a 100644 --- a/x11/qt3-libs/patches/patch-ja +++ b/x11/qt3-libs/patches/patch-ja @@ -1,8 +1,8 @@ -$NetBSD: patch-ja,v 1.1 2006/10/19 12:58:12 drochner Exp $ +$NetBSD: patch-ja,v 1.2 2006/10/23 14:54:11 adam Exp $ ---- src/kernel/qpixmap_x11.cpp.orig 2006-10-19 13:06:42.000000000 +0200 +--- src/kernel/qpixmap_x11.cpp.orig 2006-10-19 16:25:12.000000000 +0200 +++ src/kernel/qpixmap_x11.cpp -@@ -1757,6 +1757,12 @@ QPixmap QPixmap::xForm( const QWMatrix & +@@ -1766,6 +1766,12 @@ QPixmap QPixmap::xForm( const QWMatrix & dbpl = ((w*bpp+31)/32)*4; dbytes = dbpl*h; @@ -15,7 +15,7 @@ $NetBSD: patch-ja,v 1.1 2006/10/19 12:58:12 drochner Exp $ #if defined(QT_MITSHM) if ( use_mitshm ) { dptr = (uchar *)xshmimg->data; -@@ -1866,6 +1872,11 @@ QPixmap QPixmap::xForm( const QWMatrix & +@@ -1875,6 +1881,11 @@ QPixmap QPixmap::xForm( const QWMatrix & sptr = (uchar *) axi->data; bpp = axi->bits_per_pixel; dbytes = dbpl * h; diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile index 0de1abc44da..849313f0e37 100644 --- a/x11/qt3-mysql/Makefile +++ b/x11/qt3-mysql/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2006/04/17 13:47:00 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2006/10/23 14:54:11 adam Exp $ .include "../../x11/qt3-libs/Makefile.common" PKGNAME= qt3-mysql-${QTVERSION} -PKGREVISION= 1 COMMENT= QT mysql driver CONFIGURE_ARGS+= -I${QTDIR}/include \ diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile index 81959ec922d..acb74a74b67 100644 --- a/x11/qt3-tools/Makefile +++ b/x11/qt3-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2006/07/23 14:47:14 rillig Exp $ +# $NetBSD: Makefile,v 1.50 2006/10/23 14:54:11 adam Exp $ .include "../../mk/bsd.prefs.mk" # XXX: hack - work round an ICE with GCC 3.3 on sparc @@ -9,7 +9,6 @@ GCC_REQD+= 3.4 .include "../../x11/qt3-libs/Makefile.common" PKGNAME= qt3-tools-${QTVERSION} -PKGREVISION= 1 COMMENT= QT GUI (WYSIWYG) builder and other tools DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common index 5c04f2c61eb..f8e47ded9d5 100644 --- a/x11/qt3/Makefile.common +++ b/x11/qt3/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.20 2006/10/04 22:06:57 wiz Exp $ +# $NetBSD: Makefile.common,v 1.21 2006/10/23 14:54:11 adam Exp $ -QTVERSION= 3.3.6 +QTVERSION= 3.3.7 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.trolltech.com/products/qt/ -- cgit v1.2.3