summaryrefslogtreecommitdiff
path: root/x11/qt3-libs
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2006-10-23 14:54:11 +0000
committeradam <adam@pkgsrc.org>2006-10-23 14:54:11 +0000
commite95c1cfe642c87dd97aaff6022d1d989f52c496a (patch)
tree7fd9d529e09e8cc99c7779cd4754d5a9e9f23cdb /x11/qt3-libs
parent2fb07aa62f19e58a20428c7ce710aee6e9b2adae (diff)
downloadpkgsrc-e95c1cfe642c87dd97aaff6022d1d989f52c496a.tar.gz
Changes 3.3.7:
* Fixed security flaw in the way Qt handles pixmap images
Diffstat (limited to 'x11/qt3-libs')
-rw-r--r--x11/qt3-libs/Makefile3
-rw-r--r--x11/qt3-libs/distinfo10
-rw-r--r--x11/qt3-libs/patches/patch-ja8
3 files changed, 10 insertions, 11 deletions
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;