znc: EAPI 2, fixed security bug #323965

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 108 insertions, 15 deletions

diff --git a/net-irc/znc/ChangeLog b/net-irc/znc/ChangeLog
index 641185962a7f..6b665aee1059 100644
--- a/net-irc/znc/ChangeLog
+++ b/net-irc/znc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/znc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.34 2010/06/07 09:27:08 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.35 2010/06/14 17:03:57 wired Exp $
+
+*znc-0.090-r1 (14 Jun 2010)
+
+  14 Jun 2010; Alex Alexander <wired@gentoo.org> +znc-0.090-r1.ebuild,
+  +files/znc-0.090-null-pointer-dereference-fix.patch:
+  EAPI 2, fixed security bug #323965
 
 *znc-0.090 (07 Jun 2010)
 
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index abcb7c47b340..61f1588a6670 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX znc-0.090-null-pointer-dereference-fix.patch 1254 RMD160 da43163ccacf0b3983d53c920921346943ad9b91 SHA1 902b55de4052848d1907e2bebcb82407ee6e06c0 SHA256 3ce1a31adeff6bbefb1f6e43531243617429cd1d9783a99b70c61f60efe945b1
 DIST znc-0.066.tar.gz 387205 RMD160 299ad25a9631da8a0b674b97c8520ac21659c9b1 SHA1 660f0694cda42f594dca7f2286dc460b1c0a3b65 SHA256 a49f5cc43a087a3f9c9a44f95897043e794e17449c7d449ef3320874a1e03cd3
 DIST znc-0.074.tar.gz 401554 RMD160 1640b5c779aa23993c15df5e67d1443d0e0175e5 SHA1 52b49047f57e6f65af6c3e59e019bb3537fbec36 SHA256 40a655833a095b9131b86c9d9ffdeaf25676076ec3239a81ae274694a67762a7
 DIST znc-0.076.tar.gz 430534 RMD160 f53bed098a2905243d348f362cbaee5f124a3188 SHA1 dc30f2ec8c87571aa446a31cd99e0719c07a240d SHA256 12b969483eed637be09f3196f1bbf835bb0d25260266802035ab071ff59c986a
@@ -12,23 +13,24 @@ EBUILD znc-0.074.ebuild 1182 RMD160 9dfae6da7144194624a8b20a7f4f07ec7c1d40fa SHA
 EBUILD znc-0.076.ebuild 1184 RMD160 83549c9b62a2bfcc2649c7c13d7a0af13a79b822 SHA1 0c6385f4465769df2bc3883f1393394b3a6bf720 SHA256 cc86e5a9d208f363c4d0f5c6fdaaafb6f779445894b1eb321436d1336ecd4e27
 EBUILD znc-0.078.ebuild 1211 RMD160 ce384059d135126ddbfb77f4baa87470ebbc4954 SHA1 22ff96f8c1d463ac8f0f4bd14e53ce4fded9086e SHA256 59623360b0cdb33a92dc8c41f4b34ce3550193237c4bb0e0398a3d49a160bccb
 EBUILD znc-0.080.ebuild 1214 RMD160 1a808245f900b52dd47fa513eaa4e9d2c21eea3e SHA1 474e68177e3a0ecb424a92a541d882c2ca096171 SHA256 523a0cf27c589584c5a8279fa224f32e90b57ef325091236cbaf1c8d1e776c6e
+EBUILD znc-0.090-r1.ebuild 1304 RMD160 40b994cb0d663e6a55ad5e1778495efb3497adfd SHA1 1504b52aa3081ed3bcb91549f27794a765466993 SHA256 22be32152b71925d17f870785ea9eef24d65fe6d5b2e5fb762808156caaa597f
 EBUILD znc-0.090.ebuild 1227 RMD160 b8d93c2c498de35ef298d4d8b37347cef8cb0d79 SHA1 c25da37962c13c97cd799a520854cfa3a6070645 SHA256 7b33231f341e8e68cdcecc45d64faa10e246801586a8ecbdb49296d69619de46
-MISC ChangeLog 4381 RMD160 5ed1d546a8297cf8cf80bf236c07b42df4d4287d SHA1 333fa3e745a1b6e0dfe36d2e298b5f7e5a66bc08 SHA256 daf1abbdc9496fb29b583d7fe9a80e64f4d03ab9b3a345fcdf0a0599d7faff01
+MISC ChangeLog 4574 RMD160 0c05f22a49c9d9e4bdfd7e69b5589263bbda681f SHA1 3d02a318e5e4be5eb49d85e3bd4829a6eb2309b8 SHA256 7eb447a177348b212b405950fa532c2e028b164c58486943cdbf4325ca8c6d5c
 MISC metadata.xml 460 RMD160 887b50fc0cc4634d83bf7ad7010a95100d1f4755 SHA1 64e45d8e6a9259fa251e381e39cc8912aef07013 SHA256 f801819d67e3d3090dc3908071323cb3439904509c6f7542b19042f6c79e8378
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iQIcBAEBCAAGBQJMDLwbAAoJEDZF8K7rm0r6RB0P/1fwQ8xMTkPwD3bisAu+LNxd
-FOI1/mqTRy4BBOzM3EjaUercyy8RGVCq499BfLNfHKlRFmILl/q4hYgsmEPCQ2Xc
-69+gmc3nGfqY+FQhKeLEF/hsu4agRJmLkRa9X13ZMAxrITJ6dYTXPDiBZQf5oKLo
-Wwla0r4Dq7LhM7Sf8LAvteNtrxOmQakoWa8UPLNmiOMiIuIztclJ6Iuo8KEG45mI
-xcOHS+zJL0ZmftMBx7xcS2SpgDdp3DIA7Fyu/kaN2qxw3qryWbB9QBWis+l8L1hx
-iRLr6yVhqO22egqTVp4O8LtXU1EmXNl3Zdbrr2aXliM/cgCUE/XR0ZMSWiMIkD09
-Fh+Nd+cZ7ddtmLsq5MD3kbrIbpBt4tEeaD25ByXgjZKgQejuG89OdVENNxz9gk3n
-WXddqXETIsks91z8QAZIh0iH4HnfJBIlFchYHp2fe1YzAc8Mj9H8OVPbzz6t0vIW
-5v7ukDqL/xh740SC0o4KIGBvkY5nKuaLO8OvNxv/VWq2YaJSdrsvwheTuXcOI7Hz
-jJEfNTFUQ2PGz2z1KTX4Lrubq/ytt3Vfl3QKXeZfQhEQWH0yQWw39h8pA2F/MOew
-piuOUd4xirxBz7BLw0q1xV+H0F3SVHAB9oZ4KnolC5MWQNYkM3SpksjIOtmRdHSN
-zb/6zqRR/E5kOlzCykmZ
-=imzx
+iQIcBAEBCAAGBQJMFmGLAAoJEDZF8K7rm0r67E8P/i0Hccqy5HtG2qiIC5RiuWGl
+xb19+QcHyttfdxo08XEf1GcTi5QqRgAeDKDaR3yWhvXpdYohGiz48m0UIV/Fj28U
+RwsRmYHanZBNKbpRDVhEAtRgYFOqzv0ZOZpQw4tiI34zYgOoJlOoB0oc0gcV2h2T
+C9u/qgifnRjZzJTNlFRPnm4ItUxgZpAt5pFy9RrNlls3l9nuXZUwnA5Ig2ylPRka
+xzfsDHsu/t5XwPbvTBT7FqqSTBcmDjYUpvfZFR7eSmmB+p6S7CCt6OQDKWUGOQW6
+QN/xh4E75sL5mDbHgHZbRdeK4y0cTsn/KkAZ8LdD6EUZodqJEYd1SvjmdBmHlfCB
+Go2YuXMrsYlM1h+wcgxnnCfMpFsHeWyPf2GkqW/CfRp+leTsg/+cGfleZyF3GKcj
+QBQwQ4IisbcEw098fjgzvjEwZUzEoiRaoqbCWD4j9JbvdudBHW3HyFb9Lb9zcZ4W
+wVSFcnzunDQ3P4+MDmElr3vby4ONqHecl0yVf+o7XTaHbBZ+wlcuieTPUDiW7Lw0
+mG64OHnkt26ZxQE5dcdtdfOo4UE+xBDZGLAaJ00TFwdtOw9n+wpfLG1FQFWGumbH
+VlvN+MTLltA1oUSGmdelUUhWA1UXX2ubmB1MzObp5qLKRGqXzxeUktzHFLxtrD0e
+jgcyaY4+C8GLeQQLXavp
+=Nwgo
 -----END PGP SIGNATURE-----
diff --git a/net-irc/znc/files/znc-0.090-null-pointer-dereference-fix.patch b/net-irc/znc/files/znc-0.090-null-pointer-dereference-fix.patch
new file mode 100644
index 000000000000..c41e1fe9ed7b
--- /dev/null
+++ b/net-irc/znc/files/znc-0.090-null-pointer-dereference-fix.patch
@@ -0,0 +1,31 @@
+--- trunk/znc.cpp	2010/06/13 07:58:28	2025
++++ trunk/znc.cpp	2010/06/13 17:14:52	2026
+@@ -1927,18 +1927,18 @@
+ 	}
+ 
+ 	for (CSockManager::const_iterator it = m_Manager.begin(); it != m_Manager.end(); ++it) {
++		CUser *pUser = NULL;
+ 		if ((*it)->GetSockName().Left(5) == "IRC::") {
+-			CIRCSock *p = (CIRCSock *) *it;
+-			ret[p->GetUser()->GetUserName()].first  += p->GetBytesRead();
+-			ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten();
+-			uiUsers_in  += p->GetBytesRead();
+-			uiUsers_out += p->GetBytesWritten();
++			pUser = ((CIRCSock *) *it)->GetUser();
+ 		} else if ((*it)->GetSockName().Left(5) == "USR::") {
+-			CClient *p = (CClient *) *it;
+-			ret[p->GetUser()->GetUserName()].first  += p->GetBytesRead();
+-			ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten();
+-			uiUsers_in  += p->GetBytesRead();
+-			uiUsers_out += p->GetBytesWritten();
++			pUser = ((CClient*) *it)->GetUser();
++		}
++
++		if (pUser) {
++			ret[pUser->GetUserName()].first  += (*it)->GetBytesRead();
++			ret[pUser->GetUserName()].second += (*it)->GetBytesWritten();
++			uiUsers_in  += (*it)->GetBytesRead();
++			uiUsers_out += (*it)->GetBytesWritten();
+ 		} else {
+ 			uiZNC_in  += (*it)->GetBytesRead();
+ 			uiZNC_out += (*it)->GetBytesWritten();
diff --git a/net-irc/znc/znc-0.090-r1.ebuild b/net-irc/znc/znc-0.090-r1.ebuild
new file mode 100644
index 000000000000..2d73b03936ae
--- /dev/null
+++ b/net-irc/znc/znc-0.090-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/znc-0.090-r1.ebuild,v 1.1 2010/06/14 17:03:57 wired Exp $
+
+EAPI=2
+
+inherit base
+
+DESCRIPTION="An advanced IRC Bouncer"
+HOMEPAGE="http://znc.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ares debug extras ipv6 perl ssl sasl tcl"
+
+DEPEND="
+	ares? ( net-dns/c-ares )
+	perl? ( dev-lang/perl )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	tcl? ( dev-lang/tcl )
+"
+RDEPEND="${DEPEND}"
+
+# bug 323965
+PATCHES=( "${FILESDIR}/${P}-null-pointer-dereference-fix.patch" )
+
+src_configure() {
+	econf \
+		$(use_enable ares c-ares) \
+		$(use_enable debug) \
+		$(use_enable extras extra) \
+		$(use_enable ipv6) \
+		$(use_enable perl) \
+		$(use_enable sasl) \
+		$(use_enable ssl openssl) \
+		$(use_enable tcl tcl) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed."
+	dodoc AUTHORS README || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elog
+	elog "Run 'znc --makeconf' as the user you want to run ZNC as"
+	elog "to make a configuration file"
+	elog "If you are using SSL you should also run 'znc --makepem'"
+	elog
+}