Version bump, add 'noctcp' option to disable automatic CTCP VERSION replies. Remove old version

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

4 files changed, 43 insertions, 33 deletions

diff --git a/net-irc/bip/ChangeLog b/net-irc/bip/ChangeLog
index 7ee7507d949f..8be6c0075ad1 100644
--- a/net-irc/bip/ChangeLog
+++ b/net-irc/bip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/bip
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bip/ChangeLog,v 1.8 2009/08/27 18:44:57 a3li Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bip/ChangeLog,v 1.9 2010/01/05 10:30:42 a3li Exp $
+
+*bip-0.8.4 (05 Jan 2010)
+
+  05 Jan 2010; Alex Legler <a3li@gentoo.org> -bip-0.8.1.ebuild,
+  +bip-0.8.4.ebuild, metadata.xml:
+  Version bump, add 'noctcp' option to disable automatic CTCP VERSION
+  replies. Remove old version
 
 *bip-0.8.2 (27 Aug 2009)
 
diff --git a/net-irc/bip/Manifest b/net-irc/bip/Manifest
index 0ea7765cbbaa..3c7db4b80d4f 100644
--- a/net-irc/bip/Manifest
+++ b/net-irc/bip/Manifest
@@ -3,16 +3,16 @@ Hash: SHA1
 
 AUX bip-configure-oidentd.patch 596 RMD160 650e5938226837fa357d3bb9f167b3ba357abe2b SHA1 cb3f2ec0735525869ead283b9a27a16f14898d37 SHA256 4905ac262ebde9216848e01ac63cb06ce60680bebdee3cc32815f91ff6b25b44
 AUX bip.vim 157 RMD160 b6b18f156f31ea515e271e7cec714d994c056a41 SHA1 7d0b4e3ddaf6dc5dae04ba1c853075f3ad3232fc SHA256 7c97eaef6d3b51d0e2f9572c919e25a5fc2f480a95469194b012fc507da55fc5
-DIST bip-0.8.1.tar.gz 203866 RMD160 700616f3ffa83007368204e06b260b13c5e66fc1 SHA1 29d73eda908bbe16981a2890cfe8d009ac31db5a SHA256 e464d8ab7c2a98c11a09d6acb166dd71c12245b651893d2a02ed0f57429d0bb8
 DIST bip-0.8.2.tar.gz 208502 RMD160 1299fea5f2c7d059eb80944ced58efc5dac2d5ec SHA1 a75da8be7f9984e02b61916e6a7d658bb1da1375 SHA256 3367f4e6a3a352fd756db478d4a92378e370318a4c961ae03b0a1b40f46a1cfd
-EBUILD bip-0.8.1.ebuild 1683 RMD160 c2da8bfd9a5a1bf635695f1f6700c175e54b5342 SHA1 92f416dfa0790d7f917834e06fc5af7458a6d004 SHA256 331808138d2a22a0f735d5a207c08c303ee958ca25bf0cac2d0933e6bfcf3b21
+DIST bip-0.8.4.tar.gz 218014 RMD160 b82370595a092dd6a57586355084a777ef04b034 SHA1 f5677004a1ce4eb86fa01c1d1f3a29d764ac5df6 SHA256 7636663137372e6890cd935112b285be904b376b86a4c7c164daa9981ccd4e2c
 EBUILD bip-0.8.2.ebuild 1683 RMD160 2812da4482cc9ae7aad07436580c762c1a3da09e SHA1 e32f4e038028ae293babdef0840a2139c2a887fd SHA256 e6cf338f969c00a819d36b61d8b66a77f2c5d9e944016932d39b24ccd3e7a94d
-MISC ChangeLog 1634 RMD160 2eefdbd19b4beb71722c6bf52ec0075f5b17c0b3 SHA1 a991f7edd393d2882405c2f19a3df798463b6350 SHA256 243c2913ed72914cfa9ad6ae1908aaa702c57b6901e366211c4e22f212414db5
-MISC metadata.xml 792 RMD160 6edf51a9060b7a6589b5afa18780b062d2ac4a8b SHA1 e4fb096d09c21b53af043b69ceacdf5ccaa250e4 SHA256 0a01e5c03d605abd17a77d33254bd1cc6b7c0bb6375687b503ad500e72eb26db
+EBUILD bip-0.8.4.ebuild 1669 RMD160 e095226c482c901b886a7f93a723c4ee768713e2 SHA1 e58ad23ee6f26efe3663683a59a68a136f82f9d9 SHA256 89ba93a82bf1db1afd02262c7f98cd97ad3044855ba2dbd37edc07ec21ebe153
+MISC ChangeLog 1860 RMD160 258543ebc457b85b6ef773f751894a627466f8ea SHA1 f9467fb7f46b3c2bdb8d74976f64b976a9328b3e SHA256 720ac1058accfa5ccb241ba1e3314b9734ba5e01832ef615bccd1787cd0c6e38
+MISC metadata.xml 961 RMD160 9b145b7463a51e606114346c73beec0192527a29 SHA1 26d1f99e90c2efaf13ec297c76472f98a1954a9d SHA256 eeb0927b5e09de3606394370aa1d1bc7ee7179d6a291fd04016a049a0e94aac5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkqW1DwACgkQaGsKqSU7eCSLEQCgnjonkWGE7ByhR8Rc7M3dxwQ+
-jlEAnRfesoUS4kvAdPlrxFIRP8UhtE+t
-=DhaS
+iEYEARECAAYFAktDFOIACgkQTEkQYPgooqFV0gCgn8+Ow8RABtlEWogmRbdYvVMD
+G3EAoMZR389KkFpwVHjC3yzFCkRyah8I
+=CUAk
 -----END PGP SIGNATURE-----
diff --git a/net-irc/bip/bip-0.8.1.ebuild b/net-irc/bip/bip-0.8.4.ebuild
index ea200bff9b55..6b143a57c479 100644
--- a/net-irc/bip/bip-0.8.1.ebuild
+++ b/net-irc/bip/bip-0.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bip/bip-0.8.1.ebuild,v 1.2 2009/08/27 18:44:57 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bip/bip-0.8.4.ebuild,v 1.1 2010/01/05 10:30:42 a3li Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://bip.t1r.net/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug ssl vim-syntax oidentd"
+IUSE="debug noctcp ssl vim-syntax oidentd"
 
 DEPEND="ssl? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}
@@ -22,16 +22,15 @@ RDEPEND="${DEPEND}
 	oidentd? ( >=net-misc/oidentd-2.0 )"
 
 src_prepare() {
-	# configure broken: --disable-oidentd enables it, too
-	epatch "${FILESDIR}/${PN}-configure-oidentd.patch"
+	use noctcp || return
 
-	eautoreconf
+	sed -i -e '/irc_privmsg_check_ctcp(server, line);/s:^://:' src/irc.c || die
 }
 
 src_configure() {
 	econf \
-		$(use_enable ssl openssl)\
-		$(use_enable debug)\
+		$(use_with ssl openssl) \
+		$(use_enable debug) \
 		$(use_enable oidentd)
 }
 
diff --git a/net-irc/bip/metadata.xml b/net-irc/bip/metadata.xml
index cd8b514bc13c..09a9076a4fa5 100644
--- a/net-irc/bip/metadata.xml
+++ b/net-irc/bip/metadata.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>no-herd</herd>
-  <maintainer>
-    <email>a3li@gentoo.org</email>
-  </maintainer>
-  <longdescription lang="en">
-    Bip is an IRC proxy, which means it keeps connected to your preferred
-    IRC servers, can store the logs for you, and even send them back to your IRC
-    client(s) upon connection. You may want to use bip to keep your logfiles (in a
-    unique format and on a unique computer) whatever your client is, when you
-    connect from multiple workstations, or when you simply want to have a playback
-    of what was said while you were away.
-  </longdescription>
-  <use>
-    <flag name="oidentd">Enable oidentd support</flag>
-  </use>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>a3li@gentoo.org</email>
+		<name>Alex Legler</name>
+	</maintainer>
+	<longdescription lang="en">
+		Bip is an IRC proxy, which means it keeps connected to your preferred
+		IRC servers, can store the logs for you, and even send them back to your IRC
+		client(s) upon connection. You may want to use bip to keep your logfiles (in a
+		unique format and on a unique computer) whatever your client is, when you
+		connect from multiple workstations, or when you simply want to have a playback
+		of what was said while you were away.
+	</longdescription>
+	<use>
+		<flag name="oidentd">Enable oidentd support</flag>
+		<flag name="noctcp">Disable the automatic CTCP VERSION reply which is often
+			exploited by malicious people to cause a DoS (reconnect due to flooding).
+		</flag>
+	</use>
 </pkgmetadata>