Add patch to fix security bug #159658.

Package-Manager: portage-2.1.2_rc4-r7

5 files changed, 150 insertions, 10 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index b03b948ce13f..e87bf26e0078 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdenetwork
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.235 2006/12/29 19:34:36 flameeyes Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.236 2007/01/11 13:38:28 flameeyes Exp $
+
+*kdenetwork-3.5.5-r2 (11 Jan 2007)
+
+  11 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/post-3.5.5-kdenetwork-ksirc.diff, +kdenetwork-3.5.5-r2.ebuild:
+  Add patch to fix security bug #159658.
 
   29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/kdenetwork-3.5.5-linux-headers-2.6.18.patch,
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index a2b83732da0b..5c32cc774584 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -45,6 +45,10 @@ AUX lisa.conf 452 RMD160 810ec2446ed1c366df69b5ecbfb77b3fc55f05fe SHA1 4616b8e40
 MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
 RMD160 810ec2446ed1c366df69b5ecbfb77b3fc55f05fe files/lisa.conf 452
 SHA256 e2192aa98a6f8306e0b628a32b85a67ccd2e61c5c0f6f49af7d709eac65db9e1 files/lisa.conf 452
+AUX post-3.5.5-kdenetwork-ksirc.diff 945 RMD160 f61594e4c08fbadf94b444a63cdf4c686523a24e SHA1 5b99a1003845f3e0863157048657688c39dec27a SHA256 1e6f289682d85a6612c3f6da59df97b91cf6a99605bc88f39a685335fc949fb2
+MD5 72897a581daa9f71bdf61238f4c3e693 files/post-3.5.5-kdenetwork-ksirc.diff 945
+RMD160 f61594e4c08fbadf94b444a63cdf4c686523a24e files/post-3.5.5-kdenetwork-ksirc.diff 945
+SHA256 1e6f289682d85a6612c3f6da59df97b91cf6a99605bc88f39a685335fc949fb2 files/post-3.5.5-kdenetwork-ksirc.diff 945
 AUX reslisa 549 RMD160 74d8eeaf4aa1165a98de69f2cdec48c270183708 SHA1 b95fdb05a9768030215ce80ba2da4bb9b0733554 SHA256 59ff67eb6d87cbef4d6c6e4f8a7984329d4689d50178870b88e207f86edb3bbe
 MD5 28c3ba792f8a0ce436216062cefa7908 files/reslisa 549
 RMD160 74d8eeaf4aa1165a98de69f2cdec48c270183708 files/reslisa 549
@@ -68,10 +72,14 @@ EBUILD kdenetwork-3.5.5-r1.ebuild 2522 RMD160 926e16c15095a2108c75cad91da7766fda
 MD5 ff8afd5dfe3281644105e1015db834c4 kdenetwork-3.5.5-r1.ebuild 2522
 RMD160 926e16c15095a2108c75cad91da7766fda95ca46 kdenetwork-3.5.5-r1.ebuild 2522
 SHA256 0068cd3ec3b8e348837fce08987653e2a5a0c45515418b6d7cddd3cf3a865075 kdenetwork-3.5.5-r1.ebuild 2522
-MISC ChangeLog 31779 RMD160 658889fd38f7a1c7898725721cb2eaac693bf77e SHA1 e683b6d21196777dfc79776d26cd275a58d970b4 SHA256 0b2f89047889250cd96dda156f4ff433ff26484e999437dedaeef39e79d9f383
-MD5 76a6213935b8b85616e01f5051ff27e7 ChangeLog 31779
-RMD160 658889fd38f7a1c7898725721cb2eaac693bf77e ChangeLog 31779
-SHA256 0b2f89047889250cd96dda156f4ff433ff26484e999437dedaeef39e79d9f383 ChangeLog 31779
+EBUILD kdenetwork-3.5.5-r2.ebuild 2575 RMD160 1c84251fef05c7640691e71a12583c611e8e167c SHA1 086cbe82c04a5b8d898d8c173372b64e86a70ec9 SHA256 a0832356bc8e929007849f67e2b6c9e6a5e527334eff6bf207d2c0d09197ab16
+MD5 5c04244bc7c60a651a2e2c6517ddfa3d kdenetwork-3.5.5-r2.ebuild 2575
+RMD160 1c84251fef05c7640691e71a12583c611e8e167c kdenetwork-3.5.5-r2.ebuild 2575
+SHA256 a0832356bc8e929007849f67e2b6c9e6a5e527334eff6bf207d2c0d09197ab16 kdenetwork-3.5.5-r2.ebuild 2575
+MISC ChangeLog 31982 RMD160 cc367612b25cd66eeb294960dd807795a177c180 SHA1 2749fe7b23e3194fbf5901dc6a999057365bec3e SHA256 10931323b929ff94b07d44e24a6f317d2296569dcff5d348ad5267d1091f645b
+MD5 358adb8f4118d5d3d0b6c1ceee3ca7a0 ChangeLog 31982
+RMD160 cc367612b25cd66eeb294960dd807795a177c180 ChangeLog 31982
+SHA256 10931323b929ff94b07d44e24a6f317d2296569dcff5d348ad5267d1091f645b ChangeLog 31982
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -82,10 +90,13 @@ SHA256 62e96a8a0d7a0612c90f34910550fd8cc4fa7dba4d787baafbf765e03edc995b files/di
 MD5 45b1745fd4f181a722520c1c0d8109df files/digest-kdenetwork-3.5.5-r1 533
 RMD160 8df6da27490a6e4ead003e4844d161332b84c178 files/digest-kdenetwork-3.5.5-r1 533
 SHA256 59d2b99e43fa26211edb734d620ed0b5b040082147055efd44504be0a40ddd80 files/digest-kdenetwork-3.5.5-r1 533
+MD5 45b1745fd4f181a722520c1c0d8109df files/digest-kdenetwork-3.5.5-r2 533
+RMD160 8df6da27490a6e4ead003e4844d161332b84c178 files/digest-kdenetwork-3.5.5-r2 533
+SHA256 59d2b99e43fa26211edb734d620ed0b5b040082147055efd44504be0a40ddd80 files/digest-kdenetwork-3.5.5-r2 533
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFlW3UAiZjviIA2XgRAtt0AJ9aGCAgNi2G7MuFRFb7LZheqmr0sACg3u/G
-xer7XfKrFi+Ou6vTPBYa9dc=
-=kBvS
+iD8DBQFFpj3bAiZjviIA2XgRAo4mAJ0ajUXUVieB+s2S7PiGTRM8KcJsYQCdE39p
+JmTNqX7O4/+We5gQgWF3uq4=
+=M/dQ
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.5.5-r2 b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.5-r2
new file mode 100644
index 000000000000..e013575200c5
--- /dev/null
+++ b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.5-r2
@@ -0,0 +1,6 @@
+MD5 07d313f91154d3c2f4620b921277fdc8 kdenetwork-3.5-patchset-01.tar.bz2 2986
+RMD160 288113734e7767a7526f4b9311c1985ac8aa91bf kdenetwork-3.5-patchset-01.tar.bz2 2986
+SHA256 0bbde1adaa4e8fff02c1f1fd6ceb66ec9af14dd19ff64567ab0fd03926d7d05b kdenetwork-3.5-patchset-01.tar.bz2 2986
+MD5 a6e642c070cbd50d4a817f6588bf8e46 kdenetwork-3.5.5.tar.bz2 9235564
+RMD160 3e757d10ee5bf24b2ccf131e693fb614b9fdb9f4 kdenetwork-3.5.5.tar.bz2 9235564
+SHA256 c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f kdenetwork-3.5.5.tar.bz2 9235564
diff --git a/kde-base/kdenetwork/files/post-3.5.5-kdenetwork-ksirc.diff b/kde-base/kdenetwork/files/post-3.5.5-kdenetwork-ksirc.diff
new file mode 100644
index 000000000000..cd0b5699c94f
--- /dev/null
+++ b/kde-base/kdenetwork/files/post-3.5.5-kdenetwork-ksirc.diff
@@ -0,0 +1,27 @@
+--- ksirc/iocontroller.cpp
++++ ksirc/iocontroller.cpp
+@@ -237,7 +237,7 @@
+ 
+     if((line.length() > 0) && (line[0] == '~')){
+       pos3 = line.find('~', 1);
+-      if(pos3 > 0){
++      if(pos3 > 1){
+ 	name = line.mid(1,pos3-1).lower();
+ 	name = name.lower();
+ 	line.remove(0, pos3+1);
+@@ -266,13 +266,13 @@
+         if(ksopts->autoCreateWin == TRUE && line[0] != '`' && line[1] != '#' && line[1] != '&' && noticeCreate) {
+ 	    //kdDebug(5008) << "Creating window for: " << qsname << " because of: " << line.data() << endl;
+ 	    ksircproc->new_toplevel(KSircChannel(ksircproc->serverName(), qsname));
+-	    assert(ksircproc->TopList[qsname] != 0x0);
+         }
+-        else{
++        if (!ksircproc->TopList[qsname]) {
+             qsname = "!default";
+             if(line[0] == '`')
+                 qsname = "!discard";
+         }
++        assert(ksircproc->TopList[qsname]);
+     }
+ 
+     ksircproc->TopList[qsname]->sirc_receive(line);
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild
new file mode 100644
index 000000000000..f38747d4951f
--- /dev/null
+++ b/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild,v 1.1 2007/01/11 13:38:28 flameeyes Exp $
+
+inherit kde-dist eutils flag-o-matic
+
+DESCRIPTION="KDE network applications: Kopete, KPPP, KGet,..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="jingle kdehiddenvisibility rdesktop sametime slp ssl wifi"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdenetwork-3.5-patchset-01.tar.bz2"
+
+BOTH_DEPEND="~kde-base/kdebase-${PV}
+	dev-libs/libxslt
+	dev-libs/libxml2
+	net-dns/libidn
+	>=dev-libs/glib-2
+	app-crypt/qca
+	sametime? ( =net-libs/meanwhile-1.0* )
+	slp? ( net-libs/openslp )
+	wifi? ( net-wireless/wireless-tools )
+	|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		) <virtual/x11-7 )
+	kernel_linux? ( virtual/opengl )"
+
+RDEPEND="${BOTH_DEPEND}
+	rdesktop? ( >=net-misc/rdesktop-1.4.1 )
+	dev-lang/perl
+	ssl? ( dev-perl/IO-Socket-SSL
+		app-crypt/qca-tls )"
+
+DEPEND="${BOTH_DEPEND}
+	kernel_linux? ( virtual/os-headers )
+	|| ( (
+			x11-proto/videoproto
+			x11-proto/xproto
+			kernel_linux? ( x11-libs/libXv )
+			x11-proto/scrnsaverproto
+		) <virtual/x11-7 )
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/kopete-3.5.5-icqfix.patch
+	${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch
+	${FILESDIR}/post-3.5.5-kdenetwork-ksirc.diff"
+
+pkg_setup() {
+	if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then
+		eerror "To support Video4Linux webcams in this package is required to have"
+		eerror "=x11-libs/qt-3* compiled with OpenGL support."
+		eerror "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+		die "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+	fi
+}
+
+src_compile() {
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
+	local myconf="--with-libidn
+				  $(use_enable sametime sametime-plugin)
+				  $(use_enable slp) $(use_with wifi) $(use_enable jingle)
+				  --without-xmms --without-external-libgadu"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	chmod u+s "${D}/${KDEDIR}/bin/reslisa"
+
+	# empty config file needed for lisa to work with default settings
+	dodir /etc
+	touch "${D}/etc/lisarc"
+
+	# lisa, reslisa initscripts
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" "${WORKDIR}/patches/lisa" > "${T}/lisa"
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" "${WORKDIR}/patches/reslisa" > "${T}/reslisa"
+	exeinto /etc/init.d
+	doexe "${T}/lisa" "${T}/reslisa"
+
+	insinto /etc/conf.d
+	newins "${WORKDIR}/patches/lisa.conf" lisa
+	newins "${WORKDIR}/patches/reslisa.conf" reslisa
+}