[gentoo-commits] repo/gentoo:master commit in: net-irc/bip/, net-irc/bip/files/

[Michael Palimaka]

commit:     7277d55009938e328281b61b502722ea59d1f342
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 18:22:34 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 18:22:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7277d550

net-irc/bip: remove old

Package-Manager: portage-2.2.26

 net-irc/bip/Manifest                        |   1 -
 net-irc/bip/bip-0.8.8-r1.ebuild             |  72 -----------------
 net-irc/bip/files/bip-0.8.8-configure.patch |  50 ------------
 net-irc/bip/files/bip-CVE-2012-0806.patch   | 121 ----------------------------
 4 files changed, 244 deletions(-)

diff --git a/net-irc/bip/Manifest b/net-irc/bip/Manifest
index 7f1005f..7e8596b 100644
--- a/net-irc/bip/Manifest
+++ b/net-irc/bip/Manifest
@@ -1,2 +1 @@
-DIST bip-0.8.8.tar.gz 220232 SHA256 7ca3fb96f5ee6b76eb398d7ea45344ea24855344ced11632241a33353bba05d7 SHA512 acd62a61379290088320567b299b9d2e236c24aea7c83c4bfb7dedba9727868fb931d7e2eb663c9041794c26583bcc923072049cb42eef0d13702f284bae2b34 WHIRLPOOL b2e5f7a1328832fce7b3c7eb706ec87e7eb023043e714dbc554126730d2e9dc37af2d127e15ef024fff1e95b9dd22351cd48b3b115b58b9fd9ecbdd92f20cda1
 DIST bip-0.8.9.tar.gz 256711 SHA256 3c950f71ef91c8b686e6835f9b722aa7ccb88d3da4ec1af19617354fd3132461 SHA512 572adb6e0982d74a39b0380ef6af51ba7f55b880f78e110b93e09616e6345bb4a9a60475df644ec891cae368287d502ba00bbf734370ba50c57b29de6934c138 WHIRLPOOL ffad5a0a525a09e6d31537dd4238353ac820a874f18a9590f039419e9d2b7aff4f92a1882f02db450e9e88957adbc4bc4eb993fbff01f7327bcdd02d0b1b6e6d

diff --git a/net-irc/bip/bip-0.8.8-r1.ebuild b/net-irc/bip/bip-0.8.8-r1.ebuild
deleted file mode 100644
index 86fc9b0..0000000
--- a/net-irc/bip/bip-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-inherit eutils autotools
-
-DESCRIPTION="Multiuser IRC proxy with SSL support"
-HOMEPAGE="http://bip.milkypond.org/"
-SRC_URI="ftp://ftp.duckcorp.org/bip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug freenode noctcp ssl vim-syntax oidentd"
-
-DEPEND="sys-devel/flex
-	virtual/yacc
-	ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-	vim-syntax? (
-		|| ( app-editors/vim app-editors/gvim ) )
-	oidentd? ( >=net-misc/oidentd-2.0 )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-configure.patch" || die
-	epatch "${FILESDIR}/${PN}-CVE-2012-0806.patch" || die
-
-	eautoreconf
-
-	if use noctcp; then
-		sed -i -e '/irc_privmsg_check_ctcp(server, line);/s:^://:' src/irc.c || die
-	fi
-
-	if use freenode; then
-		epatch "${FILESDIR}/${PN}-freenode.patch" || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_enable debug) \
-		$(use_enable oidentd)
-}
-
-src_compile() {
-	# Parallel make fails.
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dobin src/bip src/bipmkpw || die "dobin failed"
-
-	dodoc AUTHORS ChangeLog README NEWS TODO || die "dodoc failed"
-	newdoc samples/bip.conf bip.conf.sample || die "newdoc failed"
-	doman bip.1 bip.conf.5 bipmkpw.1 || die "doman failed"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins samples/bip.vim || die "doins failed"
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/bip.vim || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	elog 'The default configuration file is "~/.bip/bip.conf"'
-	elog "You can find a sample configuration file in"
-	elog "/usr/share/doc/${PF}/bip.conf.sample"
-}

diff --git a/net-irc/bip/files/bip-0.8.8-configure.patch b/net-irc/bip/files/bip-0.8.8-configure.patch
deleted file mode 100644
index 592bdc6..0000000
--- a/net-irc/bip/files/bip-0.8.8-configure.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit 559fa7ed44238e811ac0c11321ed021c35cba2be
-Author: Pierre-Louis Bonicoli <pierre-louis.bonicoli@×××.fr>
-Date:   Wed Sep 14 06:30:09 2011 +0200
-
-    don't override user var. Thanks to Alex Legler
-    
-    Based on gentoo-x86/net-irc/bip/files/bip-configure.patch
-    See http://www.gnu.org/software/autoconf/manual/automake.html#User-Variables
-    If user doesn't specify CFLAGS, default value is "-Wall -Wextra -g -O2".
-
-diff --git a/Makefile.am b/Makefile.am
-index c2dae4d..f17c314 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -13,13 +13,8 @@ src_bip_SOURCES = src/conf.y src/lex.l \
- src_bipmkpw_SOURCES = src/bipmkpw.c src/md5.c src/util.c
- AM_YFLAGS= -d
- BUILT_SOURCES = src/conf.c src/conf.h src/lex.c
--if DEBUG
--	AM_CFLAGS+=-Wall -g
--	AM_LDFLAGS+=-g
--else
--	AM_CFLAGS+=-Wall
--endif
- 
-+AM_CFLAGS=-Wall -Wextra
- 
- dist_man_MANS = bip.1 bip.conf.5 bipmkpw.1
- 
-diff --git a/configure.ac b/configure.ac
-index 005e697..5740a39 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -44,16 +44,12 @@ AC_ARG_ENABLE([pie], AS_HELP_STRING([--disable-pie], [Do not build a position in
- 
- AM_CONDITIONAL(DEBUG, test x$enable_debug = xyes)
- AS_IF([test "x$enable_debug" = "xyes"], [
--	CFLAGS="-O0 -g -W -Wall"
--	LDFLAGS="-g"
- 	AC_CHECK_FUNC(backtrace_symbols_fd, [
- 		AC_DEFINE(HAVE_BACKTRACE, [], [Use glibc backtrace on fatal()])
- 		LDFLAGS="-rdynamic $LDFLAGS"
- 		backtrace="(with backtrace)"
- 	])
- ], [
--	CFLAGS="-O2 -g -W -Wall"
--	LDFLAGS="-g"
- 	enable_debug=no
- ])
- 

diff --git a/net-irc/bip/files/bip-CVE-2012-0806.patch b/net-irc/bip/files/bip-CVE-2012-0806.patch
deleted file mode 100644
index 6ea26ae..0000000
--- a/net-irc/bip/files/bip-CVE-2012-0806.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-commit 222a33cb84a2e52ad55a88900b7895bf9dd0262c
-Author: Pierre-Louis Bonicoli <pierre-louis.bonicoli@×××.fr>
-Date:   Sat Jan 7 11:41:02 2012 +0100
-
-    Buffer Overflow: check against the implicit size of select() arrays
-    
-    Reported by Julien Tinnes (Fix #269)
-    exit is called when the listening socket can not be created
-
-diff --git a/src/bip.c b/src/bip.c
-index d46ee2b..b4ac706 100644
---- a/src/bip.c
-+++ b/src/bip.c
-@@ -1311,7 +1311,7 @@ int main(int argc, char **argv)
- 	close(fd);
- 
- 	bip.listener = listen_new(conf_ip, conf_port, conf_css);
--	if (!bip.listener)
-+	if (!bip.listener || bip.listener->connected == CONN_ERROR)
- 		fatal("Could not create listening socket");
- 
- 	for (;;) {
-diff --git a/src/connection.c b/src/connection.c
-index 07ab431..5c4c24a 100644
---- a/src/connection.c
-+++ b/src/connection.c
-@@ -124,6 +124,18 @@ static void connect_trynext(connection_t *cn)
- 			continue;
- 		}
- 
-+		if (cn->handle >= FD_SETSIZE) {
-+			mylog(LOG_WARN, "too many fd used, close socket %d",
-+					cn->handle);
-+
-+			if (close(cn->handle) == -1)
-+				mylog(LOG_WARN, "Error on socket close: %s",
-+						strerror(errno));
-+
-+			cn->handle = -1;
-+			break;
-+		}
-+
- 		socket_set_nonblock(cn->handle);
- 
- 		if (cn->connecting_data->src) {
-@@ -789,13 +801,8 @@ list_t *wait_event(list_t *cn_list, int *msec, int *nc)
- 		/*
- 		 * This shouldn't happen ! just in case...
- 		 */
--		if (cn->handle < 0) {
--			mylog(LOG_WARN, "wait_event invalid socket %d",
--					cn->handle);
--			if (cn_is_connected(cn))
--				cn->connected = CONN_ERROR;
--			continue;
--		}
-+		if (cn->handle < 0 || cn->handle >= FD_SETSIZE)
-+			fatal("wait_event invalid socket %d", cn->handle);
- 
- 		/* exceptions are OOB and disconnections */
- 		FD_SET(cn->handle, &fds_except);
-@@ -966,6 +973,18 @@ static void create_listening_socket(char *hostname, char *port,
- 			continue;
- 		}
- 
-+		if (cn->handle >= FD_SETSIZE) {
-+			mylog(LOG_WARN, "too many fd used, close listening socket %d",
-+					cn->handle);
-+
-+			if (close(cn->handle) == -1)
-+				mylog(LOG_WARN, "Error on socket close: %s",
-+						strerror(errno));
-+
-+			cn->handle = -1;
-+			break;
-+		}
-+
- 		if (setsockopt(cn->handle, SOL_SOCKET, SO_REUSEADDR,
- 					(char *)&multi_client,
- 					sizeof(multi_client)) < 0) {
-@@ -1113,10 +1132,21 @@ connection_t *accept_new(connection_t *cn)
- 
- 	mylog(LOG_DEBUG, "Trying to accept new client on %d", cn->handle);
- 	err = accept(cn->handle, &sa, &sa_len);
-+
- 	if (err < 0) {
--		mylog(LOG_ERROR, "accept failed: %s", strerror(errno));
-+		fatal("accept failed: %s", strerror(errno));
-+	}
-+
-+	if (err >= FD_SETSIZE) {
-+		mylog(LOG_WARN, "too many client connected, close %d", err);
-+
-+		if (close(err) == -1)
-+			mylog(LOG_WARN, "Error on socket close: %s",
-+					strerror(errno));
-+
- 		return NULL;
- 	}
-+
- 	socket_set_nonblock(err);
- 
- 	conn = connection_init(cn->anti_flood, cn->ssl, cn->timeout, 0);
-diff --git a/src/irc.c b/src/irc.c
-index ebc1b34..147a315 100644
---- a/src/irc.c
-+++ b/src/irc.c
-@@ -2439,9 +2439,10 @@ void bip_on_event(bip_t *bip, connection_t *conn)
- 
- 	if (conn == bip->listener) {
- 		struct link_client *n = irc_accept_new(conn);
--		assert(n);
--		list_add_last(&bip->conn_list, CONN(n));
--		list_add_last(&bip->connecting_client_list, n);
-+		if (n) {
-+			list_add_last(&bip->conn_list, CONN(n));
-+			list_add_last(&bip->connecting_client_list, n);
-+		}
- 		return;
- 	}
-