Update kdbg to 1.2.8

* Fixed security flaw regarding the program specific debugger command.

4 files changed, 41 insertions, 42 deletions

diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index c5fef75c117..202c1ad3f8c 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2003/07/17 21:31:12 grant Exp $
+# $NetBSD: Makefile,v 1.38 2003/07/30 15:19:21 markd Exp $
 
-DISTNAME=	kdbg-1.2.7
-PKGREVISION=	2
+DISTNAME=	kdbg-1.2.8
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kdbg/} \
 		ftp://ftp.eudaptics.com/pub/people/jsixt/
@@ -21,6 +20,6 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--with-kde-version=3
 
-.include "../../x11/kde3/buildlink2.mk"
+.include "../../meta-pkgs/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdbg/PLIST b/devel/kdbg/PLIST
index c710a73f96f..105d3312424 100644
--- a/devel/kdbg/PLIST
+++ b/devel/kdbg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/10/15 03:37:00 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/07/30 15:19:21 markd Exp $
 bin/kdbg
 share/doc/kde/HTML/de/kdbg/argspwdenv.html
 share/doc/kde/HTML/de/kdbg/breakptlist.html
@@ -111,26 +111,26 @@ share/kde/locale/sr/LC_MESSAGES/kdbg.mo
 share/kde/locale/sv/LC_MESSAGES/kdbg.mo
 share/kde/locale/tr/LC_MESSAGES/kdbg.mo
 share/kde/locale/zh_CN.GB2312/LC_MESSAGES/kdbg.mo
-@dirrm share/kde/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/kde/locale/tr/LC_MESSAGES
-@dirrm share/kde/locale/sv/LC_MESSAGES
-@dirrm share/kde/locale/sr/LC_MESSAGES
-@dirrm share/kde/locale/sk/LC_MESSAGES
-@dirrm share/kde/locale/ru/LC_MESSAGES
-@dirrm share/kde/locale/ro/LC_MESSAGES
-@dirrm share/kde/locale/pt/LC_MESSAGES
-@dirrm share/kde/locale/pl/LC_MESSAGES
-@dirrm share/kde/locale/no_NY/LC_MESSAGES
-@dirrm share/kde/locale/no/LC_MESSAGES
-@dirrm share/kde/locale/ja/LC_MESSAGES
-@dirrm share/kde/locale/it/LC_MESSAGES
-@dirrm share/kde/locale/hu/LC_MESSAGES
-@dirrm share/kde/locale/hr/LC_MESSAGES
-@dirrm share/kde/locale/fr/LC_MESSAGES
-@dirrm share/kde/locale/es/LC_MESSAGES
-@dirrm share/kde/locale/de/LC_MESSAGES
-@dirrm share/kde/locale/da/LC_MESSAGES
-@dirrm share/kde/locale/cs/LC_MESSAGES
+@comment dirrm share/kde/locale/zh_CN.GB2312/LC_MESSAGES
+@comment dirrm share/kde/locale/tr/LC_MESSAGES
+@comment dirrm share/kde/locale/sv/LC_MESSAGES
+@comment dirrm share/kde/locale/sr/LC_MESSAGES
+@comment dirrm share/kde/locale/sk/LC_MESSAGES
+@comment dirrm share/kde/locale/ru/LC_MESSAGES
+@comment dirrm share/kde/locale/ro/LC_MESSAGES
+@comment dirrm share/kde/locale/pt/LC_MESSAGES
+@comment dirrm share/kde/locale/pl/LC_MESSAGES
+@comment dirrm share/kde/locale/no_NY/LC_MESSAGES
+@comment dirrm share/kde/locale/no/LC_MESSAGES
+@comment dirrm share/kde/locale/ja/LC_MESSAGES
+@comment dirrm share/kde/locale/it/LC_MESSAGES
+@comment dirrm share/kde/locale/hu/LC_MESSAGES
+@comment dirrm share/kde/locale/hr/LC_MESSAGES
+@comment dirrm share/kde/locale/fr/LC_MESSAGES
+@comment dirrm share/kde/locale/es/LC_MESSAGES
+@comment dirrm share/kde/locale/de/LC_MESSAGES
+@comment dirrm share/kde/locale/da/LC_MESSAGES
+@comment dirrm share/kde/locale/cs/LC_MESSAGES
 @comment dirrm share/kde/icons/locolor/32x32/apps
 @comment dirrm share/kde/icons/locolor/16x16/apps
 @comment dirrm share/kde/icons/hicolor/32x32/apps
diff --git a/devel/kdbg/distinfo b/devel/kdbg/distinfo
index e882b593307..ba4cec466ad 100644
--- a/devel/kdbg/distinfo
+++ b/devel/kdbg/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2003/03/18 17:00:37 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2003/07/30 15:19:21 markd Exp $
 
-SHA1 (kdbg-1.2.7.tar.gz) = bc79c4573b45d0875848dbd56fddf26214241f5b
-Size (kdbg-1.2.7.tar.gz) = 526415 bytes
-SHA1 (patch-aa) = 4f9f0f8288a0ed36852cf1100c148543a29183db
+SHA1 (kdbg-1.2.8.tar.gz) = 99cfcb19d48b1ca2acf75122cbe9e77780350ac9
+Size (kdbg-1.2.8.tar.gz) = 533368 bytes
+SHA1 (patch-aa) = 2111d0df9bbed2d8df245407f95ba1d8c4e44ab6
 SHA1 (patch-ac) = ef7ae69e39d01db396da61cc2231b282095cd20d
diff --git a/devel/kdbg/patches/patch-aa b/devel/kdbg/patches/patch-aa
index 9bdf89dd95c..7c5c2f944c8 100644
--- a/devel/kdbg/patches/patch-aa
+++ b/devel/kdbg/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.7 2003/03/18 17:00:37 jmmv Exp $
+$NetBSD: patch-aa,v 1.8 2003/07/30 15:19:22 markd Exp $
 
---- configure.orig	2003-03-18 17:35:40.000000000 +0000
+--- configure.orig	2003-06-10 07:49:15.000000000 +1200
 +++ configure
-@@ -7766,7 +7766,7 @@ ac_ldflags_safe="$LDFLAGS"
+@@ -11557,7 +11557,7 @@ fi
+ test=NONE
+ qt_libdir=NONE
+ for dir in $qt_libdirs; do
+-  try=`ls -1 $dir/libqt*.{so,a} 2> /dev/null`
++  try=`ls -1 $dir/libqt*.so $dir/libqt*.a 2> /dev/null`
+   if test -n "$try"; then qt_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
+ done
+ 
+@@ -11577,7 +11577,7 @@ ac_ldflags_safe="$LDFLAGS"
  ac_libs_safe="$LIBS"
  
  CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
@@ -11,16 +20,7 @@ $NetBSD: patch-aa,v 1.7 2003/03/18 17:00:37 jmmv Exp $
  LIBS="$LIBS $LIBQT"
  
  
-@@ -7887,7 +7887,7 @@ ac_libs_safe="$LIBS"
- 
- CXXFLAGS="$CXXFLAGS -I$qt_includes"
- LDFLAGS="$X_LDFLAGS"
--LIBS="-lqt -lXext -lX11 $LIBSOCKET"
-+LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
- LD_LIBRARY_PATH=
- export LD_LIBRARY_PATH
- LIBRARY_PATH=
-@@ -10432,6 +10432,7 @@ fi
+@@ -14170,6 +14170,7 @@ fi
  
  
  CXXFLAGS="$ac_cxxflags_safe"