Add two patches for KDE security update

10 files changed, 205 insertions, 9 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 654161c17719..6defa75a306e 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,10 +1,20 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.137 2004/05/15 15:27:20 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.138 2004/05/17 13:09:23 caleb Exp $
 
   15 May 2004; Jason Wever <weeve@gentoo.org> kdelibs-3.2.2.ebuild:
   Stable on sparc.
 
+*kdelibs-3.1.5-r1 (17 May 2004)
+
+  17 May 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.5-r1.ebuild,
+  kdelibs-3.1.5.ebuild, kdelibs-3.2.2-r1.ebuild,
+  files/post-3.1.5-kdelibs-kapplication.patch,
+  files/post-3.1.5-kdelibs-ktelnetservice.patch,
+  files/post-3.2.2-kdelibs-kapplication.patch,
+  files/post-3.2.2-kdelibs-ktelnetservice.patch:
+  Add two patches for KDE security update, 3.2.2 and 3.1.5
+
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kdelibs-3.1.5.ebuild,
   kdelibs-3.2.0.ebuild, kdelibs-3.2.2.ebuild:
   Add inherit eutils
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index d2fbd9e668e0..870008698feb 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,14 +1,20 @@
-MD5 1909648d87380693587ed16aa3d76cc8 ChangeLog 21948
-MD5 cb394e670a76abe6f9553a35509bb9c6 kdelibs-3.1.5.ebuild 1941
 MD5 0375e76855d5d9edd629617a65c591e7 kdelibs-3.2.0.ebuild 2425
+MD5 8b8359c7ad25484c9665f14e95a13693 kdelibs-3.2.2.ebuild 2501
+MD5 003eda9dc9f1851eaa468cbd48fc370e kdelibs-3.1.5-r1.ebuild 2059
+MD5 578c1d395e705054fbf0485c4671fb47 kdelibs-3.2.2-r1.ebuild 2622
 MD5 cedfff3fb87b78788e9e47d7c4a75de9 kdelibs-3.2.1.ebuild 2421
+MD5 05e498badfd3885a6d09326ded4b6ac9 ChangeLog 22354
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 8b8359c7ad25484c9665f14e95a13693 kdelibs-3.2.2.ebuild 2501
+MD5 52e0e955204a77781505d33b9a3c341d files/post-3.2.2-kdelibs-ktelnetservice.patch 974
+MD5 285676023bab94666dfec728231cfcd1 files/kdelibs-3.2.2-su.cpp.diff 383
 MD5 3f21fc4e8ddbf79459bfa8f2df1a5e15 files/animated-gif-fix.patch 317
-MD5 1e53bd5071cc4fe6ba67fda7252a1cf2 files/digest-kdelibs-3.1.5 68
 MD5 ee0b53e6fbaea17ae3543638dc09ca34 files/digest-kdelibs-3.2.0 68
 MD5 2c0a17ac5767265af5bcfb2f892f66ec files/digest-kdelibs-3.2.1 68
-MD5 285676023bab94666dfec728231cfcd1 files/kdelibs-3.2.2-su.cpp.diff 383
+MD5 6176dc207f5ba91edee9b04ab111afe5 files/digest-kdelibs-3.2.2 68
 MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.5-kjs-alphaev6-gcc3-workaround.patch 477
+MD5 7cebc1abb3141287db618486fd679b32 files/post-3.2.2-kdelibs-kapplication.patch 882
 MD5 76ef4c7d472a5e3659219ee223f12cb5 files/qt-3.3-printfix.patch 333
-MD5 6176dc207f5ba91edee9b04ab111afe5 files/digest-kdelibs-3.2.2 68
+MD5 bde52aa0bba055c4f678540ec20bfe5a files/post-3.1.5-kdelibs-ktelnetservice.patch 968
+MD5 8fea98dc672d5c85b217bcb8bcec9214 files/post-3.1.5-kdelibs-kapplication.patch 653
+MD5 1e53bd5071cc4fe6ba67fda7252a1cf2 files/digest-kdelibs-3.1.5-r1 68
+MD5 6176dc207f5ba91edee9b04ab111afe5 files/digest-kdelibs-3.2.2-r1 68
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1.5 b/kde-base/kdelibs/files/digest-kdelibs-3.1.5-r1
index c5a8b320325e..c5a8b320325e 100644
--- a/kde-base/kdelibs/files/digest-kdelibs-3.1.5
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.1.5-r1
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.2-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.2.2-r1
new file mode 100644
index 000000000000..9eda8dfa8d5a
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.2.2-r1
@@ -0,0 +1 @@
+MD5 76c656fb4ec7f1ca073f52fad2b8898b kdelibs-3.2.2.tar.bz2 12716460
diff --git a/kde-base/kdelibs/files/post-3.1.5-kdelibs-kapplication.patch b/kde-base/kdelibs/files/post-3.1.5-kdelibs-kapplication.patch
new file mode 100644
index 000000000000..5faf96350812
--- /dev/null
+++ b/kde-base/kdelibs/files/post-3.1.5-kdelibs-kapplication.patch
@@ -0,0 +1,11 @@
+--- kdecore/kapplication.cpp	11 Jan 2004 15:45:02 -0000	1.545.2.21
++++ kdecore/kapplication.cpp	14 May 2004 12:27:23 -0000
+@@ -1907,7 +1907,7 @@ void KApplication::invokeMailer(const QS
+ 
+    if (command.isEmpty() || command == QString::fromLatin1("kmail")
+        || command.right(6) == "/kmail")
+-     command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A %t");
++     command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
+ 
+    // TODO: Take care of the preferred terminal app (instead of hardcoding
+    // Konsole), this will probably require a rewrite of the configurable
diff --git a/kde-base/kdelibs/files/post-3.1.5-kdelibs-ktelnetservice.patch b/kde-base/kdelibs/files/post-3.1.5-kdelibs-ktelnetservice.patch
new file mode 100644
index 000000000000..af7855465949
--- /dev/null
+++ b/kde-base/kdelibs/files/post-3.1.5-kdelibs-ktelnetservice.patch
@@ -0,0 +1,29 @@
+Index: ktelnetservice.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/kio/misc/ktelnetservice.cpp,v
+retrieving revision 1.3.2.2
+diff -u -p -r1.3.2.2 ktelnetservice.cpp
+--- kio/misc/ktelnetservice.cpp	31 Mar 2003 09:13:55 -0000	1.3.2.2
++++ kio/misc/ktelnetservice.cpp	13 May 2004 15:12:00 -0000
+@@ -68,10 +68,19 @@ int main(int argc, char **argv)
+ 		cmd << url.user();
+ 	}
+ 
++        QString host;
+         if (!url.host().isEmpty())
+-           cmd << url.host(); // telnet://host
++           host = url.host(); // telnet://host
+         else if (!url.path().isEmpty())
+-           cmd << url.path(); // telnet:host
++           host = url.path(); // telnet:host
++
++        if (host.isEmpty() || host.startsWith("-"))
++        {
++            kdError() << "Invalid hostname " << host << endl;
++            return 2;
++        }
++
++        cmd << host;
+         
+ 	if (url.port())
+ 		cmd << QString::number(url.port());
diff --git a/kde-base/kdelibs/files/post-3.2.2-kdelibs-kapplication.patch b/kde-base/kdelibs/files/post-3.2.2-kdelibs-kapplication.patch
new file mode 100644
index 000000000000..395ad8509056
--- /dev/null
+++ b/kde-base/kdelibs/files/post-3.2.2-kdelibs-kapplication.patch
@@ -0,0 +1,16 @@
+Index: kapplication.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/kdecore/kapplication.cpp,v
+retrieving revision 1.637.2.8
+diff -u -p -r1.637.2.8 kapplication.cpp
+--- kdelibs/kdecore/kapplication.cpp	8 Apr 2004 09:56:28 -0000	1.637.2.8
++++ kdelibs/kdecore/kapplication.cpp	14 May 2004 12:24:53 -0000
+@@ -2172,7 +2172,7 @@ void KApplication::invokeMailer(const QS
+ 
+    if (command.isEmpty() || command == QString::fromLatin1("kmail")
+        || command.endsWith("/kmail"))
+-     command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A %t");
++     command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
+ 
+    // TODO: Take care of the preferred terminal app (instead of hardcoding
+    // Konsole), this will probably require a rewrite of the configurable
diff --git a/kde-base/kdelibs/files/post-3.2.2-kdelibs-ktelnetservice.patch b/kde-base/kdelibs/files/post-3.2.2-kdelibs-ktelnetservice.patch
new file mode 100644
index 000000000000..f4dd743c13b0
--- /dev/null
+++ b/kde-base/kdelibs/files/post-3.2.2-kdelibs-ktelnetservice.patch
@@ -0,0 +1,29 @@
+Index: ktelnetservice.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/kio/misc/ktelnetservice.cpp,v
+retrieving revision 1.7.2.1
+diff -u -p -r1.7.2.1 ktelnetservice.cpp
+--- kio/misc/ktelnetservice.cpp	18 Feb 2004 11:42:12 -0000	1.7.2.1
++++ kio/misc/ktelnetservice.cpp	13 May 2004 15:12:14 -0000
+@@ -77,10 +77,19 @@ int main(int argc, char **argv)
+ 		cmd << url.user();
+ 	}
+ 
++        QString host;
+         if (!url.host().isEmpty())
+-           cmd << url.host(); // telnet://host
++           host = url.host(); // telnet://host
+         else if (!url.path().isEmpty())
+-           cmd << url.path(); // telnet:host
++           host = url.path(); // telnet:host
++
++        if (host.isEmpty() || host.startsWith("-"))
++        {
++            kdError() << "Invalid hostname " << host << endl;
++            return 2;
++        }
++
++        cmd << host;
+         
+ 	if (url.port()){
+             if ( url.protocol() == "ssh" )
diff --git a/kde-base/kdelibs/kdelibs-3.1.5.ebuild b/kde-base/kdelibs/kdelibs-3.1.5-r1.ebuild
index fb60003112e8..b0b23dbb75b2 100644
--- a/kde-base/kdelibs/kdelibs-3.1.5.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.5.ebuild,v 1.6 2004/04/27 21:31:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.5-r1.ebuild,v 1.1 2004/05/17 13:09:23 caleb Exp $
 inherit kde eutils
 #don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
 
@@ -46,8 +46,10 @@ set-kdedir $PV
 
 src_unpack() {
 	kde_src_unpack
-	kde_sandbox_patch ${S}/kio/misc/kpac
+	epatch ${FILESDIR}/post-3.1.5-kdelibs-kapplication.patch
+	epatch ${FILESDIR}/post-3.1.5-kdelibs-ktelnetservice.patch
 	use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch
+	kde_sandbox_patch ${S}/kio/misc/kpac
 }
 
 src_install() {
diff --git a/kde-base/kdelibs/kdelibs-3.2.2-r1.ebuild b/kde-base/kdelibs/kdelibs-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..a1e2910b4d6e
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.2.2-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.2-r1.ebuild,v 1.1 2004/05/17 13:09:23 caleb Exp $
+
+inherit kde eutils
+
+need-autoconf 2.5
+set-kdedir ${PV}
+
+DESCRIPTION="KDE libraries needed by all kde programs"
+HOMEPAGE="http//www.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.2"
+KEYWORDS="x86 ~ppc sparc ~alpha hppa ~amd64 ~ia64 ~mips"
+IUSE="alsa cups ipv6 ssl doc ldap"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+DEPEND=">=sys-devel/autoconf-2.58
+	>=sys-devel/automake-1.8
+	>=app-arch/bzip2-1.0.2
+	>=dev-libs/libxslt-1.0.31
+	>=dev-libs/libxml2-2.5.8
+	>=dev-libs/libpcre-3.9
+	ssl? ( >=dev-libs/openssl-0.9.6k )
+	alsa? ( media-libs/alsa-lib virtual/alsa )
+	cups? ( >=net-print/cups-1.1.19 )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	media-libs/tiff
+	>=app-admin/fam-2.6.10
+	virtual/ghostscript
+	media-libs/libart_lgpl
+	sys-devel/gettext
+	~kde-base/arts-1.2.2
+	>=x11-libs/qt-3.2.3"
+RDEPEND="${DEPEND}
+	app-text/sgml-common
+	cups? ( net-print/cups )
+	doc? ( app-doc/doxygen )
+	dev-lang/python"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/${P}-su.cpp.diff
+	epatch ${FILESDIR}/post-3.2.2-kdelibs-kapplication.patch
+	epatch ${FILESDIR}/post-3.2.2-kdelibs-ktelnetservice.patch
+}
+
+src_compile() {
+	kde_src_compile myconf
+
+	myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
+	myconf="$myconf `use_with alsa` `use_enable cups`"
+
+	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
+	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
+	use alsa	&& myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa"
+	use cups	&& myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups"
+
+	use x86 && myconf="$myconf --enable-fast-malloc=full"
+
+	kde_src_compile configure make
+
+	use doc && make apidox
+}
+
+src_install() {
+	kde_src_install
+	dohtml *.html
+
+	if use doc ; then
+		einfo "Copying API documentation..."
+		dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
+		cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	else
+		rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	fi
+
+	# needed to fix lib64 issues on amd64, see bug #45669
+	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
+
+}
+
+pkg_postinst() {
+	if use doc ; then
+		rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+		ln -sf $KDEDIR/share/doc/HTML/en/common \
+			$KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+	fi
+}