Add security patches for CVE-2007-5226, bug #194923

(Portage version: 2.1.3.13)

9 files changed, 77 insertions, 4 deletions

diff --git a/net-irc/dircproxy/ChangeLog b/net-irc/dircproxy/ChangeLog
index 73f6a92fec89..ce9f609ffa17 100644
--- a/net-irc/dircproxy/ChangeLog
+++ b/net-irc/dircproxy/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-irc/dircproxy
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/ChangeLog,v 1.18 2007/02/17 15:25:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/ChangeLog,v 1.19 2007/10/15 13:25:14 armin76 Exp $
+
+*dircproxy-1.2.0_beta2-r1 (15 Oct 2007)
+*dircproxy-1.1.0-r2 (15 Oct 2007)
+*dircproxy-1.0.5-r1 (15 Oct 2007)
+
+  15 Oct 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/1.0.5-CVE-2007-5226.patch, +files/1.2.0-CVE-2007-5226.patch,
+  +dircproxy-1.0.5-r1.ebuild, -dircproxy-1.1.0-r1.ebuild,
+  +dircproxy-1.1.0-r2.ebuild, -dircproxy-1.2.0_beta2.ebuild,
+  +dircproxy-1.2.0_beta2-r1.ebuild:
+  Add security patches for CVE-2007-5226, bug #194923
 
 *dircproxy-1.2.0_beta2 (17 Feb 2007)
 
diff --git a/net-irc/dircproxy/dircproxy-1.0.5-r1.ebuild b/net-irc/dircproxy/dircproxy-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..57a3ee9ec752
--- /dev/null
+++ b/net-irc/dircproxy/dircproxy-1.0.5-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.0.5-r1.ebuild,v 1.1 2007/10/15 13:25:14 armin76 Exp $
+
+inherit eutils
+
+DESCRIPTION="an IRC proxy server"
+HOMEPAGE="http://dircproxy.securiweb.net/"
+SRC_URI="http://dircproxy.securiweb.net/pub/1.0/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/dircproxy-gcc4.patch"
+	epatch "${FILESDIR}/${PV}-CVE-2007-5226.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog FAQ NEWS PROTOCOL README* INSTALL
+}
diff --git a/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild b/net-irc/dircproxy/dircproxy-1.1.0-r2.ebuild
index 89f007643d07..bfd4ad413626 100644
--- a/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild
+++ b/net-irc/dircproxy/dircproxy-1.1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild,v 1.6 2007/02/17 15:25:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.1.0-r2.ebuild,v 1.1 2007/10/15 13:25:14 armin76 Exp $
 
 inherit eutils
 
@@ -17,8 +17,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${PV}-less-lag-on-attach.patch
+	epatch "${FILESDIR}/${PV}-less-lag-on-attach.patch"
 	epatch "${FILESDIR}/${PN}-gcc4.patch"
+	epatch "${FILESDIR}/1.0.5-CVE-2007-5226.patch"
 }
 
 src_install() {
diff --git a/net-irc/dircproxy/dircproxy-1.2.0_beta2.ebuild b/net-irc/dircproxy/dircproxy-1.2.0_beta2-r1.ebuild
index d9f9143f4470..463e1b8ff39b 100644
--- a/net-irc/dircproxy/dircproxy-1.2.0_beta2.ebuild
+++ b/net-irc/dircproxy/dircproxy-1.2.0_beta2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.2.0_beta2.ebuild,v 1.1 2007/02/17 15:25:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.2.0_beta2-r1.ebuild,v 1.1 2007/10/15 13:25:14 armin76 Exp $
 
 inherit eutils
 
@@ -16,6 +16,13 @@ IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/1.2.0-CVE-2007-5226.patch"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog FAQ NEWS README* TODO INSTALL
diff --git a/net-irc/dircproxy/files/1.0.5-CVE-2007-5226.patch b/net-irc/dircproxy/files/1.0.5-CVE-2007-5226.patch
new file mode 100644
index 000000000000..1d9994228bd2
--- /dev/null
+++ b/net-irc/dircproxy/files/1.0.5-CVE-2007-5226.patch
@@ -0,0 +1,12 @@
+diff -u dircproxy-1.0.5/src/irc_server.c dircproxy-1.0.5/src/irc_server.c
+--- dircproxy-1.0.5/src/irc_server.c
++++ dircproxy-1.0.5/src/irc_server.c
+@@ -1078,7 +1078,7 @@
+       
+         if (!strcmp(cmsg.cmd, "ACTION")) {
+           if (p->conn_class->log_events & IRC_LOG_ACTION)
+-            irclog_ctcp(p, msg.params[0], msg.src.orig, "%s", cmsg.orig);
++            irclog_ctcp(p, (msg.params != NULL ) ? msg.params[0]: "none", msg.src.orig, "%s", cmsg.orig);
+ 
+         } else if (!strcmp(cmsg.cmd, "DCC")
+                    && p->conn_class->dcc_proxy_incoming) {
diff --git a/net-irc/dircproxy/files/1.2.0-CVE-2007-5226.patch b/net-irc/dircproxy/files/1.2.0-CVE-2007-5226.patch
new file mode 100644
index 000000000000..110edc399279
--- /dev/null
+++ b/net-irc/dircproxy/files/1.2.0-CVE-2007-5226.patch
@@ -0,0 +1,12 @@
+diff -urN dircproxy-1.2.0-beta2.orig/src/irc_server.c dircproxy-1.2.0-beta2/src/irc_server.c
+--- dircproxy-1.2.0-beta2.orig/src/irc_server.c	2006-10-07 17:07:08.000000000 -0400
++++ dircproxy-1.2.0-beta2/src/irc_server.c	2007-10-04 17:45:57.000000000 -0400
+@@ -1155,7 +1155,7 @@
+       
+         if (!strcmp(cmsg.cmd, "ACTION")) {
+           irclog_log(p, IRC_LOG_ACTION, logdest, msg.src.orig,
+-                     "%s", cmsg.paramstarts[0]);
++                     "%s", (cmsg.paramstarts != NULL) ?  cmsg.paramstarts[0]: "none");
+ 
+         } else if (!strcmp(cmsg.cmd, "DCC")
+                    && p->conn_class->dcc_proxy_incoming) {
diff --git a/net-irc/dircproxy/files/digest-dircproxy-1.0.5-r1 b/net-irc/dircproxy/files/digest-dircproxy-1.0.5-r1
new file mode 100644
index 000000000000..ef8a1784026b
--- /dev/null
+++ b/net-irc/dircproxy/files/digest-dircproxy-1.0.5-r1
@@ -0,0 +1,3 @@
+MD5 33b92e0f28530a5faa9fea801d1ad807 dircproxy-1.0.5.tar.gz 217965
+RMD160 8082fbe3c83b9e38eae9a2b48bf244e277b3e63b dircproxy-1.0.5.tar.gz 217965
+SHA256 caec20ed458a5606be8700400ecba27aff00ad6227ff0e8d4db1d3d5bf9f9d37 dircproxy-1.0.5.tar.gz 217965
diff --git a/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r1 b/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r2
index cea41304cdcf..cea41304cdcf 100644
--- a/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r1
+++ b/net-irc/dircproxy/files/digest-dircproxy-1.1.0-r2
diff --git a/net-irc/dircproxy/files/digest-dircproxy-1.2.0_beta2 b/net-irc/dircproxy/files/digest-dircproxy-1.2.0_beta2-r1
index c0c495826201..c0c495826201 100644
--- a/net-irc/dircproxy/files/digest-dircproxy-1.2.0_beta2
+++ b/net-irc/dircproxy/files/digest-dircproxy-1.2.0_beta2-r1