[pkgsrc/pkgsrc-2006Q3]: pkgsrc/x11 Pullup ticket 1880 - requested by drochner

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e59decc78eb
branches:  pkgsrc-2006Q3
changeset: 519168:8e59decc78eb
user:      salo <salo%pkgsrc.org@localhost>
date:      Sun Nov 05 01:09:16 2006 +0000

description:
Pullup ticket 1880 - requested by drochner
security update for qt3

Revisions pulled up:
- pkgsrc/x11/qt3/Makefile.common                1.21
- pkgsrc/x11/qt3-docs/Makefile                  1.23
- pkgsrc/x11/qt3-libs/Makefile                  1.56, 1.57
- pkgsrc/x11/qt3-libs/distinfo                  1.39, 1.40, 1.41
- pkgsrc/x11/qt3-mysql/Makefile                 1.21
- pkgsrc/x11/qt3-tools/Makefile                 1.50

   Module Name:         pkgsrc
   Committed By:        drochner
   Date:                Thu Oct 19 12:58:12 UTC 2006

   Modified Files:
        pkgsrc/x11/qt3-libs: Makefile distinfo
   Added Files:
        pkgsrc/x11/qt3-libs/patches: patch-ja

   Log Message:
   Add a patch for CVE-2006-4811 (integer overflow in image handling).
   The patch was proposed in
   http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=210742, but this is
   appearently not what Redhat does -- they have an update for kdelibs, but
   don't tell details.
   The patch helps for me, so put it in, at least until we know more.
---
   Module Name:         pkgsrc
   Committed By:        adam
   Date:                Mon Oct 23 14:54:11 UTC 2006

   Modified Files:
        pkgsrc/x11/qt3: Makefile.common
        pkgsrc/x11/qt3-docs: Makefile
        pkgsrc/x11/qt3-libs: Makefile distinfo
        pkgsrc/x11/qt3-libs/patches: patch-ja
        pkgsrc/x11/qt3-mysql: Makefile
        pkgsrc/x11/qt3-tools: Makefile

   Log Message:
   Changes 3.3.7:
   * Fixed security flaw in the way Qt handles pixmap images
---
   Module Name:         pkgsrc
   Committed By:        drochner
   Date:                Mon Oct 23 15:18:15 UTC 2006

   Modified Files:
        pkgsrc/x11/qt3-libs: distinfo
   Removed Files:
        pkgsrc/x11/qt3-libs/patches: patch-ja

   Log Message:
   patch-ja did contain a fix against the pixmap image security flaw;
   it is superseded by a somewhat different version in official qt-3.3.7 now

diffstat:

 x11/qt3-docs/Makefile   |  3 +--
 x11/qt3-libs/Makefile   |  3 +--
 x11/qt3-libs/distinfo   |  8 ++++----
 x11/qt3-mysql/Makefile  |  3 +--
 x11/qt3-tools/Makefile  |  3 +--
 x11/qt3/Makefile.common |  4 ++--
 6 files changed, 10 insertions(+), 14 deletions(-)

diffs (85 lines):

diff -r 23842571cc30 -r 8e59decc78eb x11/qt3-docs/Makefile
--- a/x11/qt3-docs/Makefile     Sat Nov 04 22:57:08 2006 +0000
+++ b/x11/qt3-docs/Makefile     Sun Nov 05 01:09:16 2006 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2006/04/17 13:47:00 wiz Exp $
+# $NetBSD: Makefile,v 1.22.4.1 2006/11/05 01:09:17 salo 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 -r 23842571cc30 -r 8e59decc78eb x11/qt3-libs/Makefile
--- a/x11/qt3-libs/Makefile     Sat Nov 04 22:57:08 2006 +0000
+++ b/x11/qt3-libs/Makefile     Sun Nov 05 01:09:16 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2006/07/26 13:30:24 joerg Exp $
+# $NetBSD: Makefile,v 1.55.2.1 2006/11/05 01:09:17 salo Exp $
 
 PKGNAME=       qt3-libs-${QTVERSION}
-PKGREVISION=   2
 MAINTAINER=    adam%NetBSD.org@localhost
 COMMENT=       C++ X GUI toolkit
 
diff -r 23842571cc30 -r 8e59decc78eb x11/qt3-libs/distinfo
--- a/x11/qt3-libs/distinfo     Sat Nov 04 22:57:08 2006 +0000
+++ b/x11/qt3-libs/distinfo     Sun Nov 05 01:09:16 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.38 2006/07/27 11:54:09 joerg Exp $
+$NetBSD: distinfo,v 1.38.2.1 2006/11/05 01:09:17 salo 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
diff -r 23842571cc30 -r 8e59decc78eb x11/qt3-mysql/Makefile
--- a/x11/qt3-mysql/Makefile    Sat Nov 04 22:57:08 2006 +0000
+++ b/x11/qt3-mysql/Makefile    Sun Nov 05 01:09:16 2006 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2006/04/17 13:47:00 wiz Exp $
+# $NetBSD: Makefile,v 1.20.4.1 2006/11/05 01:09:17 salo Exp $
 
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=               qt3-mysql-${QTVERSION}
-PKGREVISION=           1
 COMMENT=               QT mysql driver
 
 CONFIGURE_ARGS+=       -I${QTDIR}/include \
diff -r 23842571cc30 -r 8e59decc78eb x11/qt3-tools/Makefile
--- a/x11/qt3-tools/Makefile    Sat Nov 04 22:57:08 2006 +0000
+++ b/x11/qt3-tools/Makefile    Sun Nov 05 01:09:16 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/07/23 14:47:14 rillig Exp $
+# $NetBSD: Makefile,v 1.49.2.1 2006/11/05 01:09:17 salo Exp $
 
 .include "../../mk/bsd.prefs.mk"
 # XXX: hack - work round an ICE with GCC 3.3 on sparc
@@ -9,7 +9,6 @@
 .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 -r 23842571cc30 -r 8e59decc78eb x11/qt3/Makefile.common
--- a/x11/qt3/Makefile.common   Sat Nov 04 22:57:08 2006 +0000
+++ b/x11/qt3/Makefile.common   Sun Nov 05 01:09:16 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.19 2006/03/31 14:38:02 drochner Exp $
+# $NetBSD: Makefile.common,v 1.19.4.1 2006/11/05 01:09:16 salo Exp $
 
-QTVERSION=     3.3.6
+QTVERSION=     3.3.7
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.trolltech.com/products/qt.html