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

(Portage version: 2.2_rc59/cvs/Linux x86_64)

3 files changed, 35 insertions, 25 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/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>