Add patch to fix security bug #159658.

(Portage version: 2.1.2_rc4-r7)

4 files changed, 55 insertions, 2 deletions

diff --git a/kde-base/ksirc/ChangeLog b/kde-base/ksirc/ChangeLog
index c68623539732..426d6d335929 100644
--- a/kde-base/ksirc/ChangeLog
+++ b/kde-base/ksirc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksirc
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirc/ChangeLog,v 1.61 2006/12/11 13:10:10 kloeri Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirc/ChangeLog,v 1.62 2007/01/11 13:30:55 flameeyes Exp $
+
+*ksirc-3.5.5-r1 (11 Jan 2007)
+
+  11 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/post-3.5.5-kdenetwork-ksirc.diff, +ksirc-3.5.5-r1.ebuild:
+  Add patch to fix security bug #159658.
 
   11 Dec 2006; <kloeri@gentoo.org> ksirc-3.5.5.ebuild:
   Stable on ia64.
diff --git a/kde-base/ksirc/files/digest-ksirc-3.5.5-r1 b/kde-base/ksirc/files/digest-ksirc-3.5.5-r1
new file mode 100644
index 000000000000..245473aa44de
--- /dev/null
+++ b/kde-base/ksirc/files/digest-ksirc-3.5.5-r1
@@ -0,0 +1,3 @@
+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/ksirc/files/post-3.5.5-kdenetwork-ksirc.diff b/kde-base/ksirc/files/post-3.5.5-kdenetwork-ksirc.diff
new file mode 100644
index 000000000000..cd0b5699c94f
--- /dev/null
+++ b/kde-base/ksirc/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/ksirc/ksirc-3.5.5-r1.ebuild b/kde-base/ksirc/ksirc-3.5.5-r1.ebuild
new file mode 100644
index 000000000000..8e613afa49ba
--- /dev/null
+++ b/kde-base/ksirc/ksirc-3.5.5-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirc/ksirc-3.5.5-r1.ebuild,v 1.1 2007/01/11 13:30:55 flameeyes Exp $
+
+KMNAME=kdenetwork
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE irc client"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="kdehiddenvisibility ssl"
+
+RDEPEND="dev-lang/perl
+	 ssl? ( dev-perl/IO-Socket-SSL )"
+
+PATCHES="${FILESDIR}/post-3.5.5-kdenetwork-ksirc.diff"