[pkgsrc/pkgsrc-2007Q2]: pkgsrc/x11 Pullup ticket 2183 - requested by markd

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6880b414411e
branches:  pkgsrc-2007Q2
changeset: 530504:6880b414411e
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Tue Sep 04 12:46:44 2007 +0000

description:
Pullup ticket 2183 - requested by markd
security fix for konqueror

- pkgsrc/x11/kdebase3/Makefile                          1.131
- pkgsrc/x11/kdebase3/distinfo                          1.98
- pkgsrc/x11/kdelibs3/Makefile                          1.126
- pkgsrc/x11/kdelibs3/distinfo                          1.87

   Module Name: pkgsrc
   Committed By:        markd
   Date:                Sun Sep  2 04:34:00 UTC 2007

   Modified Files:
           pkgsrc/x11/kdebase3: Makefile distinfo
           pkgsrc/x11/kdelibs3: Makefile distinfo

   Log Message:
   The Konqueror address bar is vulnerable to spoofing attacks
   that are based on embedding white spaces in the url. In addition
   the address bar could be tricked to show an URL which it is
   intending to visit for a short amount of time instead of the
   current URL.
   http://www.kde.org/info/security/advisory-20070816-1.txt
   Bump PKGREVISION for kdelibs3 and kdebase3

diffstat:

 x11/kdebase3/Makefile |  8 ++++++--
 x11/kdebase3/distinfo |  5 ++++-
 x11/kdelibs3/Makefile |  9 +++++----
 x11/kdelibs3/distinfo |  5 ++++-
 4 files changed, 19 insertions(+), 8 deletions(-)

diffs (76 lines):

diff -r 4330f550898d -r 6880b414411e x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile     Tue Sep 04 01:36:19 2007 +0000
+++ b/x11/kdebase3/Makefile     Tue Sep 04 12:46:44 2007 +0000
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.130 2007/06/15 18:15:21 jlam Exp $
+# $NetBSD: Makefile,v 1.130.2.1 2007/09/04 12:46:46 ghen Exp $
 
 DISTNAME=      kdebase-${_KDE_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 COMMENT=       Base modules for the KDE 3 integrated X11 desktop
 
+PATCH_SITES=   ftp://ftp.kde.org/pub/kde/security_patches/ \
+               http://mirrors.isc.org/pub/kde/security_patches/
+PATCHFILES=    post-3.5.7-kdebase-konqueror.diff
+
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
diff -r 4330f550898d -r 6880b414411e x11/kdebase3/distinfo
--- a/x11/kdebase3/distinfo     Tue Sep 04 01:36:19 2007 +0000
+++ b/x11/kdebase3/distinfo     Tue Sep 04 12:46:44 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.97 2007/06/08 12:35:37 markd Exp $
+$NetBSD: distinfo,v 1.97.2.1 2007/09/04 12:46:46 ghen Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -12,6 +12,9 @@
 SHA1 (kdebase-3.5.7.tar.bz2) = 833a35e4bbec2852f0f5267e680590be0c986594
 RMD160 (kdebase-3.5.7.tar.bz2) = f43070b5428c3099c0abceed56041e5b4ff3c656
 Size (kdebase-3.5.7.tar.bz2) = 24395088 bytes
+SHA1 (post-3.5.7-kdebase-konqueror.diff) = 3868392701ebe9fce14567a1f52d458d00f31287
+RMD160 (post-3.5.7-kdebase-konqueror.diff) = bb59c1e78e5709d72b123c5b3b5a538fc09f564e
+Size (post-3.5.7-kdebase-konqueror.diff) = 1901 bytes
 SHA1 (patch-aa) = 96c587d930dd9f25ed722e759fb2127a8ec14de4
 SHA1 (patch-ab) = 353de4dfb9f465ad5c3349f65854726fdb52dbed
 SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb
diff -r 4330f550898d -r 6880b414411e x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile     Tue Sep 04 01:36:19 2007 +0000
+++ b/x11/kdelibs3/Makefile     Tue Sep 04 12:46:44 2007 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.125 2007/05/23 12:57:37 markd Exp $
+# $NetBSD: Makefile,v 1.125.2.1 2007/09/04 12:46:44 ghen Exp $
 
 DISTNAME=      kdelibs-${_KDE_VERSION}
+PKGREVISION=   1
 CATEGORIES=    x11
 COMMENT=       Support libraries for the KDE integrated X11 desktop
 
-#PATCH_SITES=  ftp://ftp.kde.org/pub/kde/security_patches/ \
-#              http://mirrors.isc.org/pub/kde/security_patches/
-#PATCHFILES=   post-3.5.6-kdelibs.diff CVE-2007-1564-kdelibs-3.5.6.diff
+PATCH_SITES=   ftp://ftp.kde.org/pub/kde/security_patches/ \
+               http://mirrors.isc.org/pub/kde/security_patches/
+PATCHFILES=    post-3.5.7-kdelibs-kdecore.diff
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
diff -r 4330f550898d -r 6880b414411e x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo     Tue Sep 04 01:36:19 2007 +0000
+++ b/x11/kdelibs3/distinfo     Tue Sep 04 12:46:44 2007 +0000
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.86 2007/05/23 12:57:45 markd Exp $
+$NetBSD: distinfo,v 1.86.2.1 2007/09/04 12:46:45 ghen Exp $
 
 SHA1 (kdelibs-3.5.7.tar.bz2) = 45f278311f20d2eb317f2175259f861c0bcf17a9
 RMD160 (kdelibs-3.5.7.tar.bz2) = 006c57ef85956ed3903749cace254bdfdf2f347e
 Size (kdelibs-3.5.7.tar.bz2) = 15576038 bytes
+SHA1 (post-3.5.7-kdelibs-kdecore.diff) = 2952806f4ad8a31b82cd2795cad95b73822a663b
+RMD160 (post-3.5.7-kdelibs-kdecore.diff) = d182fcf910ec66a1df85f10ba7b0fd7e9d46357d
+Size (post-3.5.7-kdelibs-kdecore.diff) = 2849 bytes
 SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779
 SHA1 (patch-ab) = 3a79b3e7fadef1a93a5490b716dace60f3de30a1
 SHA1 (patch-ac) = f4a8fc2bfcf8a414e690eafd51607250b9f51890