From: Diego Elio Pettenò Date: Thu, 11 Jan 2007 13:30:55 +0000 (+0000) Subject: Add patch to fix security bug #159658. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e30e274081385a229085adc865fe14bd92661ef7;p=gentoo.git Add patch to fix security bug #159658. Package-Manager: portage-2.1.2_rc4-r7 --- 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ò + +files/post-3.5.5-kdenetwork-ksirc.diff, +ksirc-3.5.5-r1.ebuild: + Add patch to fix security bug #159658. 11 Dec 2006; ksirc-3.5.5.ebuild: Stable on ia64. diff --git a/kde-base/ksirc/Manifest b/kde-base/ksirc/Manifest index 383ff38ee04b..f837ba141c4a 100644 --- a/kde-base/ksirc/Manifest +++ b/kde-base/ksirc/Manifest @@ -1,17 +1,28 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +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 DIST kdenetwork-3.5.2.tar.bz2 7524328 RMD160 7c924c66fb71af001795f55be47a9e75405742ca SHA1 7c013939cce68c31f51d66143dc2092db7db2cbd SHA256 e716de377d254fb666417a54407ff3e99c407d0507c13cda8077367f1b8b43eb DIST kdenetwork-3.5.5.tar.bz2 9235564 RMD160 3e757d10ee5bf24b2ccf131e693fb614b9fdb9f4 SHA1 a95bac9de9770f551870fb73ce456d779ba36878 SHA256 c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f EBUILD ksirc-3.5.2.ebuild 483 RMD160 0d89d839c3ad60d275776a19cfb8bed60d116af0 SHA1 e3548a750dbfb154d606912ee5ebd53a02f2aafd SHA256 911f5eb0c6441051c2e585942b2f8aa3dcacf17c5f04e310b86c94ca1def5970 MD5 01cc2cc6a80dace3f5244eb6839f6489 ksirc-3.5.2.ebuild 483 RMD160 0d89d839c3ad60d275776a19cfb8bed60d116af0 ksirc-3.5.2.ebuild 483 SHA256 911f5eb0c6441051c2e585942b2f8aa3dcacf17c5f04e310b86c94ca1def5970 ksirc-3.5.2.ebuild 483 +EBUILD ksirc-3.5.5-r1.ebuild 548 RMD160 f3048d38b455b3cbb5a11e99b997f2a1a946c19b SHA1 6b2cafa20d5ab0154b6b9c393d072d7db1f7885d SHA256 9d1ebdfb21d856534a431868ed6ab372da352dc021739fd10aaa3e757a563e03 +MD5 16ec48fbea635918de56a32129523f4c ksirc-3.5.5-r1.ebuild 548 +RMD160 f3048d38b455b3cbb5a11e99b997f2a1a946c19b ksirc-3.5.5-r1.ebuild 548 +SHA256 9d1ebdfb21d856534a431868ed6ab372da352dc021739fd10aaa3e757a563e03 ksirc-3.5.5-r1.ebuild 548 EBUILD ksirc-3.5.5.ebuild 479 RMD160 06b8024d7b9a48174baeede8942416dcca1b3272 SHA1 d2d974a6382c6fcac29a675886f01140639f5186 SHA256 e1c42446637983f19bf5a6c1723bbbe9c440ee5faa83e1502aab0ab54304707c MD5 c498ffe669fca3a004d4a7258b1cf104 ksirc-3.5.5.ebuild 479 RMD160 06b8024d7b9a48174baeede8942416dcca1b3272 ksirc-3.5.5.ebuild 479 SHA256 e1c42446637983f19bf5a6c1723bbbe9c440ee5faa83e1502aab0ab54304707c ksirc-3.5.5.ebuild 479 -MISC ChangeLog 7158 RMD160 ae91765cc0af74c1f5bb83536ff6c559cdc8cded SHA1 061977444a02676dc770bfc0ec9806de9b226c0b SHA256 2ff9bf7c3b9b412430457bc434bca25408812567db44d674472eaefc258b706d -MD5 922418a73f7266098e862d6cfd7a6042 ChangeLog 7158 -RMD160 ae91765cc0af74c1f5bb83536ff6c559cdc8cded ChangeLog 7158 -SHA256 2ff9bf7c3b9b412430457bc434bca25408812567db44d674472eaefc258b706d ChangeLog 7158 +MISC ChangeLog 7354 RMD160 bcfdb0657a610f08eb89139f9aacf8d04fd52010 SHA1 f1086b80cfdc6c2c1b2ef9c801c193a87e11b5dd SHA256 d94c410cc44a2b937622c924616dcb179d4d201ad6fad3556d8b1f0264b57b67 +MD5 b8ae1f4bbe4664fe2c5f72c3d77e8343 ChangeLog 7354 +RMD160 bcfdb0657a610f08eb89139f9aacf8d04fd52010 ChangeLog 7354 +SHA256 d94c410cc44a2b937622c924616dcb179d4d201ad6fad3556d8b1f0264b57b67 ChangeLog 7354 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -22,3 +33,13 @@ SHA256 62e96a8a0d7a0612c90f34910550fd8cc4fa7dba4d787baafbf765e03edc995b files/di MD5 1ebf1c8fa2263113c04677eb11e7f627 files/digest-ksirc-3.5.5 256 RMD160 76a9cb82198bc9155818fd606697461973f2c319 files/digest-ksirc-3.5.5 256 SHA256 64b6a68abeb7c279962ba59f88e31312dc4d1a4481371fd6cd87cb9f8f7a2730 files/digest-ksirc-3.5.5 256 +MD5 1ebf1c8fa2263113c04677eb11e7f627 files/digest-ksirc-3.5.5-r1 256 +RMD160 76a9cb82198bc9155818fd606697461973f2c319 files/digest-ksirc-3.5.5-r1 256 +SHA256 64b6a68abeb7c279962ba59f88e31312dc4d1a4481371fd6cd87cb9f8f7a2730 files/digest-ksirc-3.5.5-r1 256 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFFpjwXAiZjviIA2XgRAi+eAKCkMgt+fPYdHSfQCxbMsAqG1Y1c1wCfV1AE +OiFG/Z9qapnJBIdt0VwOaxc= +=a7A6 +-----END PGP SIGNATURE----- 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"