Remove vulnerable versions wrt bug 201687.

Package-Manager: portage-2.1.4

7 files changed, 19 insertions, 590 deletions

diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog
index 9941b6acce07..0943f8bad233 100644
--- a/net-nntp/inn/ChangeLog
+++ b/net-nntp/inn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nntp/inn
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.20 2008/01/25 22:05:29 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.21 2008/01/26 07:51:36 ulm Exp $
+
+  26 Jan 2008; Ulrich Mueller <ulm@gentoo.org> -files/2.4.1-berkdb.patch,
+  -inn-2.4.1.ebuild, -inn-2.4.3.ebuild:
+  Remove vulnerable versions wrt bug 201687.
 
   25 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> inn-2.4.3-r1.ebuild:
   Marked stable on amd64 as per bug 201687.
diff --git a/net-nntp/inn/Manifest b/net-nntp/inn/Manifest
index 3dff8148d82a..22caa2d735a1 100644
--- a/net-nntp/inn/Manifest
+++ b/net-nntp/inn/Manifest
@@ -1,7 +1,6 @@
-AUX 2.4.1-berkdb.patch 1393 RMD160 7a8a742865f1c2288f6639f529d44d82578c67d4 SHA1 47ccb08ddc42d1c1898f5ac9146cc2ce1f8b25b2 SHA256 8fc88519689f06d77180df69286c400b7e15003dc7e998774dee1cf56887f465
-MD5 69e1740d0d4d85a272e0491fa1a7ddb7 files/2.4.1-berkdb.patch 1393
-RMD160 7a8a742865f1c2288f6639f529d44d82578c67d4 files/2.4.1-berkdb.patch 1393
-SHA256 8fc88519689f06d77180df69286c400b7e15003dc7e998774dee1cf56887f465 files/2.4.1-berkdb.patch 1393
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX inn-2.4.3-berkdb45.patch 2389 RMD160 d0580cc8e2f1cdf60feacd597991edbfb412d3f8 SHA1 e3fe46034f4e0061276378a3e0c576b289876612 SHA256 2e762081a319a898135c98ae5a5f5e0fbcc8b25deeb65814c343a0a6683c62e2
 MD5 27562fa14e8edb492f53487c12e0f2f6 files/inn-2.4.3-berkdb45.patch 2389
 RMD160 d0580cc8e2f1cdf60feacd597991edbfb412d3f8 files/inn-2.4.3-berkdb45.patch 2389
@@ -14,35 +13,26 @@ AUX innd 503 RMD160 5631966614d5bb4e1c304195e1e796a1fbc9421e SHA1 85aa86e4fcca78
 MD5 c5a9ae6ae97f7cdd4254bf5413fc9e47 files/innd 503
 RMD160 5631966614d5bb4e1c304195e1e796a1fbc9421e files/innd 503
 SHA256 ab2082ee261d632dafeaaf9ebb459e5afe684597c67b860ca0a7a8ff3bf554ed files/innd 503
-DIST inn-2.4.1.tar.gz 1849845 RMD160 ce3271fec204a68e7eb0648d1afa176ba1d3e601 SHA1 f36267eca56a643a37ed6c2903cd6fbb71e407f5 SHA256 11effaebfe81f2755151a6e5acb0d1d747e7699d2e8e121e6ae04105f46954d7
 DIST inn-2.4.3.tar.gz 1871994 RMD160 f9465f3fe905d1173fb30c00d591ab8f9cbaecfc SHA1 95c30835b0990a3c432858948266dd4db639a3e1 SHA256 b69679ed4b79ed8384db50e43a09a7d52e4da51712235b912bcfae037e137bf2
-DIST inn_db4.tar.gz 644 RMD160 dca25ab3cc0a53c5ad418edea560ac8b01d89839 SHA1 246cf5285dfa703fa76b92aacab4434ad9ef517e SHA256 a58cbc7c5ca33f46150567ec7bb83ec5924d3434a581205128b193e20b48d1a1
-EBUILD inn-2.4.1.ebuild 8124 RMD160 1173e6df1d28e259e494ac057fd35b2198cc245e SHA1 fa57b9813f518fa0556eaabb9844105917d9bf29 SHA256 cd20e1aed285e200d981c2f7b7a470812f7dbf52cc2a18585b396761489cc3bc
-MD5 bc224d05b4de435e30682d3057ddcde2 inn-2.4.1.ebuild 8124
-RMD160 1173e6df1d28e259e494ac057fd35b2198cc245e inn-2.4.1.ebuild 8124
-SHA256 cd20e1aed285e200d981c2f7b7a470812f7dbf52cc2a18585b396761489cc3bc inn-2.4.1.ebuild 8124
 EBUILD inn-2.4.3-r1.ebuild 8196 RMD160 47b36a310676b233d73e8d07bb519f71e7924aa6 SHA1 1e577f457cd11e772c22745d306690c4fe6d9bc3 SHA256 e18d13f4f0be251ae1adea7a2389ff2cdab2a92fb0d8b7464991a060a37ac65e
 MD5 dd3ee89cf7e8395ec01d4605e112bbe2 inn-2.4.3-r1.ebuild 8196
 RMD160 47b36a310676b233d73e8d07bb519f71e7924aa6 inn-2.4.3-r1.ebuild 8196
 SHA256 e18d13f4f0be251ae1adea7a2389ff2cdab2a92fb0d8b7464991a060a37ac65e inn-2.4.3-r1.ebuild 8196
-EBUILD inn-2.4.3.ebuild 8210 RMD160 058f88e90a5d664723244b03e5fd981cb8008ed1 SHA1 16c5af08756cce3b15afa78fdef0d3095fb25515 SHA256 01d6af056258acb238b6c8b44a2eacf841a86a5d21750a1cecfe8af073b3e3f7
-MD5 589b2b697d7f59568359753eab72595b inn-2.4.3.ebuild 8210
-RMD160 058f88e90a5d664723244b03e5fd981cb8008ed1 inn-2.4.3.ebuild 8210
-SHA256 01d6af056258acb238b6c8b44a2eacf841a86a5d21750a1cecfe8af073b3e3f7 inn-2.4.3.ebuild 8210
-MISC ChangeLog 5350 RMD160 ebfc91c83569446b4cdf4a3979ac94892cce0ac4 SHA1 5d686abf1e6d6276e85e994c10b66da2e92f2da2 SHA256 2a89252f6f4d74b992bc2eb93d8ed9b64d60ff2cd5ce5c6b46e1703a0e32049f
-MD5 c3bd21745163a2780e53fcd6e54462e8 ChangeLog 5350
-RMD160 ebfc91c83569446b4cdf4a3979ac94892cce0ac4 ChangeLog 5350
-SHA256 2a89252f6f4d74b992bc2eb93d8ed9b64d60ff2cd5ce5c6b46e1703a0e32049f ChangeLog 5350
+MISC ChangeLog 5503 RMD160 6c9ed68d5d9b9ce1230d846187df5d95e7bbaf29 SHA1 b77f98bc147b6a8faca6bdbbdb8506650fa9de69 SHA256 ccb03b8f2d363e46705c11bf5926496fc2a0c8dfe2a846755bc593f630372a06
+MD5 f6f77f9511756302d4056058e22d6848 ChangeLog 5503
+RMD160 6c9ed68d5d9b9ce1230d846187df5d95e7bbaf29 ChangeLog 5503
+SHA256 ccb03b8f2d363e46705c11bf5926496fc2a0c8dfe2a846755bc593f630372a06 ChangeLog 5503
 MISC metadata.xml 161 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 SHA1 5d3eb0725c80eb73d935d7dfbd653a7c1a2103e7 SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153
 MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161
 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 metadata.xml 161
 SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153 metadata.xml 161
-MD5 0d0ed8ef41b656283b92f0cfd5205ec1 files/digest-inn-2.4.1 446
-RMD160 f1a316cf1cba2246e4207523b54c08291aa3f395 files/digest-inn-2.4.1 446
-SHA256 8d5c004b74cd268d44fabcf65b1cbc2bbeb257e1a6d3da184941941fc29efe51 files/digest-inn-2.4.1 446
-MD5 b2f700070372823c26def2b4b0260144 files/digest-inn-2.4.3 232
-RMD160 db230f307dac68998c3c462497ece2808908d8ba files/digest-inn-2.4.3 232
-SHA256 e984c0ba5b35e379d2c71f485b898a347dc7225df9b10da1fbaa735e226c5841 files/digest-inn-2.4.3 232
 MD5 b2f700070372823c26def2b4b0260144 files/digest-inn-2.4.3-r1 232
 RMD160 db230f307dac68998c3c462497ece2808908d8ba files/digest-inn-2.4.3-r1 232
 SHA256 e984c0ba5b35e379d2c71f485b898a347dc7225df9b10da1fbaa735e226c5841 files/digest-inn-2.4.3-r1 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.8 (GNU/Linux)
+
+iEYEARECAAYFAkea5q0ACgkQOeoy/oIi7uwwNACgsAs+4zmG2ApR3Xg7ixDvMqJH
+4HYAoIbSvm2iaZR4PtTo4Ox4q/DROnbX
+=JBhd
+-----END PGP SIGNATURE-----
diff --git a/net-nntp/inn/files/2.4.1-berkdb.patch b/net-nntp/inn/files/2.4.1-berkdb.patch
deleted file mode 100644
index f6ea97f7497a..000000000000
--- a/net-nntp/inn/files/2.4.1-berkdb.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Nur inn-2.4.1.orig/configure.in inn-2.4.1/configure.in
---- inn-2.4.1.orig/configure.in	2004-09-07 14:53:23.800246638 +0200
-+++ inn-2.4.1/configure.in	2004-09-07 14:55:04.045893609 +0200
-@@ -375,20 +375,20 @@
-         done
-     fi
-     if test x"$BERKELEY_DB_DIR" = xyes ; then
--        for v in db41 db4 db3 db2 ; do
-+        for v in 4.2 4.1 4 3 2 ; do
--            if test -d "/usr/local/include/$v" ; then
-+            if test -d "/usr/local/include/db$v" ; then
-                 BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
--                BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"
--                BERKELEY_DB_LIB="-l$v"
-+                BERKELEY_DB_CFLAGS="-I/usr/local/include/db$v"
-+                BERKELEY_DB_LIB="-ldb-$v"
-                 AC_MSG_RESULT(FreeBSD locations)
-                 break
-             fi
-         done
-         if test x"$BERKELEY_DB_LIB" = x ; then
--            for v in db41 db4 db3 db2 ; do
-+            for v in 4.2 4.1 4 3 2 ; do
--                if test -d "/usr/include/$v" ; then
-+                if test -d "/usr/include/db$v" ; then
--                    BERKELEY_DB_CFLAGS="-I/usr/include/$v"
--                    BERKELEY_DB_LIB="-l$v"
-+                    BERKELEY_DB_CFLAGS="-I/usr/include/db$v"
-+                    BERKELEY_DB_LIB="-ldb-$v"
-                     AC_MSG_RESULT(Linux locations)
-                     break
-                 fi
diff --git a/net-nntp/inn/files/digest-inn-2.4.1 b/net-nntp/inn/files/digest-inn-2.4.1
deleted file mode 100644
index 7e0828b71b94..000000000000
--- a/net-nntp/inn/files/digest-inn-2.4.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 bec635b6e70188071fdb539cd374f2ba inn-2.4.1.tar.gz 1849845
-RMD160 ce3271fec204a68e7eb0648d1afa176ba1d3e601 inn-2.4.1.tar.gz 1849845
-SHA256 11effaebfe81f2755151a6e5acb0d1d747e7699d2e8e121e6ae04105f46954d7 inn-2.4.1.tar.gz 1849845
-MD5 aa35f4496d180e372cfa4ecdb9864f03 inn_db4.tar.gz 644
-RMD160 dca25ab3cc0a53c5ad418edea560ac8b01d89839 inn_db4.tar.gz 644
-SHA256 a58cbc7c5ca33f46150567ec7bb83ec5924d3434a581205128b193e20b48d1a1 inn_db4.tar.gz 644
diff --git a/net-nntp/inn/files/digest-inn-2.4.3 b/net-nntp/inn/files/digest-inn-2.4.3
deleted file mode 100644
index 89aca2dab904..000000000000
--- a/net-nntp/inn/files/digest-inn-2.4.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6caa10909a7bf55fb91535685990aec9 inn-2.4.3.tar.gz 1871994
-RMD160 f9465f3fe905d1173fb30c00d591ab8f9cbaecfc inn-2.4.3.tar.gz 1871994
-SHA256 b69679ed4b79ed8384db50e43a09a7d52e4da51712235b912bcfae037e137bf2 inn-2.4.3.tar.gz 1871994
diff --git a/net-nntp/inn/inn-2.4.1.ebuild b/net-nntp/inn/inn-2.4.1.ebuild
deleted file mode 100644
index fd579b806d52..000000000000
--- a/net-nntp/inn/inn-2.4.1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.4.1.ebuild,v 1.6 2007/04/28 16:29:07 swegener Exp $
-
-inherit fixheadtails ssl-cert eutils libtool flag-o-matic
-
-DESCRIPTION="The Internet News daemon, fully featured NNTP server"
-HOMEPAGE="http://www.isc.org/products/INN"
-SRC_URI="ftp://ftp.isc.org/isc/inn/${P}.tar.gz
-	http://mauricem.com/inn_db4.tar.gz"
-SLOT="0"
-LICENSE="as-is BSD GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="ipv6 kerberos sasl ssl perl python berkdb inntaggedhash innkeywords"
-
-RDEPEND="virtual/mta
-	kerberos? ( virtual/krb5 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( dev-libs/openssl )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	berkdb? ( sys-libs/db )
-	virtual/gzip"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.13
-	sys-devel/libtool
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/2.4.1-berkdb.patch
-	epatch ${WORKDIR}/db_patch.patch
-
-	ht_fix_file configure.in support/fixscript.in
-
-	export WANT_AUTOCONF="2.1"
-	autoconf || die "autoconf failed"
-
-	sed -i \
-		-e "s/ -B .OLD//" \
-		Makefile.global.in \
-		control/Makefile \
-		doc/man/Makefile
-
-	elibtoolize || die "elibtoolize failed"
-}
-
-src_compile() {
-	append-ldflags $(bindnow-flags)
-
-	econf \
-		--prefix=/usr/lib/news \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-control-dir=/usr/lib/news/bin/control \
-		--with-etc-dir=/etc/news \
-		--with-filter-dir=/usr/lib/news/bin/filter \
-		--with-db-dir=/var/spool/news/db \
-		--with-doc-dir=/usr/share/doc/${PF} \
-		--with-spool-dir=/var/spool/news \
-		--with-log-dir=/var/log/news \
-		--with-run-dir=/var/run/news \
-		--with-tmp-path=/var/spool/news/tmp \
-		--enable-libtool \
-		--enable-setgid-inews \
-		--enable-uucp-rnews \
-		--without-tcl \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with kerberos kerberos /usr) \
-		$(use_with sasl) \
-		$(use_with ssl openssl) \
-		$(use_with berkdb berkeleydb) \
-		$(use_enable ipv6) \
-		$(use_enable !inntaggedhash largefiles) \
-		$(use_enable inntaggedhash tagged-hash) \
-		$(use_enable innkeywords keywords) \
-		|| die "econf failed"
-	emake -j1 P="" || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} P="" install || die "make install failed"
-
-	chown -R root:0 ${D}/usr/{lib/news/{lib,include},share/{doc,man}}
-	chmod 644 ${D}/etc/news/*
-	for file in control.ctl expire.ctl incoming.conf nntpsend.ctl passwd.nntp readers.conf
-	do
-		chmod 640 ${D}/etc/news/${file}
-	done
-
-	# Prevent old db/* files from being overwritten
-	dodir /usr/share/doc/${PF}/dbexamples
-	for db_file in active active.times distributions history newsgroups
-	do
-		if [ -f ${D}/var/spool/news/db/${db_file} ]
-		then
-			mv ${D}/var/spool/news/db/${db_file} ${D}/usr/share/doc/${PF}/dbexamples
-		fi
-	done
-
-	keepdir \
-		/var/{log,run}/news \
-		/var/spool/news/{,archive,articles,db,incoming{,/bad},innfeed,outgoing,overview,tmp}
-
-	dodoc ChangeLog MANIFEST README* doc/checklist
-	use ipv6 && dodoc doc/IPv6-info
-
-	# So other programs can build against INN. (eg. Suck)
-	insinto /usr/lib/news/include
-	doins include/*.h
-
-	doinitd ${FILESDIR}/innd innd
-
-	if use ssl
-	then
-		insinto /etc/news/cert
-
-		docert cert
-		fowners news:news /etc/news/cert/cert.{crt,csr,key,pem}
-
-		for cert in cert.{crt,csr,key,pem}
-		do
-			dosym "/etc/news/cert/${cert}" "/usr/lib/news/lib/${cert}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	for db_file in active active.times distributions history newsgroups
-	do
-		if [ -f ${ROOT}/usr/share/doc/${PF}/dbexamples/${db_file} \
-			-a ! -f ${ROOT}/var/spool/news/db/${db_file} ]
-		then
-			cp -p ${ROOT}/usr/share/doc/${PF}/dbexamples/${db_file} \
-				${ROOT}/var/spool/news/db/${db_file}
-			chmod 664 ${ROOT}/var/spool/news/db/${db_file}
-		fi
-	done
-
-	chown -R news:news ${ROOT}/var/{log,spool}/news
-
-	einfo "Do not forget to update your cron entries, and also run"
-	einfo "makedbz if you need to.  If this is a first-time installation"
-	einfo "a minimal active file has been installed.  You will need to"
-	einfo "touch history and run 'makedbz -i' to initialize the history"
-	einfo "database.  See INSTALL for more information."
-	einfo
-	einfo "You need to assign a real shell to the news user, or else"
-	einfo "starting inn will fail. You can use 'usermod -s /bin/bash news'"
-	einfo "for this."
-
-	if use ssl
-	then
-		einfo
-		einfo "You may want to start nnrpd manually for native ssl support."
-		einfo "If you choose to do so, automating this with a bootscript might"
-		einfo "also be a good choice."
-		einfo "Have a look at man nnrpd for valid parameters."
-	fi
-}
-
-pkg_postrm() {
-	einfo
-	einfo "If you want your newsspool or altered configuration files"
-	einfo "to be removed, please do so now manually."
-	einfo
-}
-
-pkg_config() {
-	NEWSSPOOL_DIR="${ROOT}/var/spool/news"
-	NEWS_SHELL="`awk -F':' '/^news:/ {print $7;}' ${ROOT}/etc/passwd`"
-	NEWS_ERRFLAG="0"
-
-	if [ "${NEWS_SHELL}" == "/bin/false" -o "${NEWS_SHELL}" == "/dev/null" ]
-	then
-		if [ ${UID} -eq 0 ]
-		then
-			einfo 'Changing shell to /bin/bash for user news...'
-			usermod -s /bin/bash news
-		else
-			NEWS_ERRFLAG=1
-			eerror ''
-			eerror 'Could not change shell for user news.'
-			eerror 'Please run "usermod -s /bin/bash news" as root.'
-		fi
-	else
-		einfo "Shell for user news unchanged ('${NEWS_SHELL}')."
-		if [ "${NEWS_SHELL}" != "/bin/sh" -a "${NEWS_SHELL}" != "/bin/bash" ]
-		then
-			ewarn "You might want to change it to '/bin/bash', though."
-		fi
-	fi
-
-	if [ ! -e "${NEWSSPOOL_DIR}/db/history}" ]
-	then
-		if [ ! -f "${NEWSSPOOL_DIR}/db/history.dir" \
-			-a ! -f "${NEWSSPOOL_DIR}/db/history.pag" \
-			-a ! -f "${NEWSSPOOL_DIR}/db/history.hash" \
-			-a ! -f "${NEWSSPOOL_DIR}/db/history.index" ]
-		then
-			einfo 'Building history database...'
-			touch "${NEWSSPOOL_DIR}/db/history"
-			chown news:news "${NEWSSPOOL_DIR}/db/history"
-			chmod 644 "${NEWSSPOOL_DIR}/db/history"
-			su - news -c "/usr/lib/news/bin/makedbz -i"
-			mv -f "${NEWSSPOOL_DIR}/db/history.n.dir" "${NEWSSPOOL_DIR}/db/history.dir"
-			[ -f "${NEWSSPOOL_DIR}/db/history.n.pag" ] && mv -f "${NEWSSPOOL_DIR}/db/history.n.pag" "${NEWSSPOOL_DIR}/db/history.pag"
-			[ -f "${NEWSSPOOL_DIR}/db/history.n.hash" ] && mv -f "${NEWSSPOOL_DIR}/db/history.n.hash" "${NEWSSPOOL_DIR}/db/history.hash"
-			[ -f "${NEWSSPOOL_DIR}/db/history.n.index" ] && mv -f "${NEWSSPOOL_DIR}/db/history.n.index" "${NEWSSPOOL_DIR}/db/history.index"
-			su - news -c "/usr/lib/news/bin/makehistory"
-		else
-			NEWS_ERRFLAG="1"
-			eerror
-			eerror "Your installation seems to be screwed up."
-			eerror "${NEWSSPOOL_DIR}/db/history does not exist, but there's"
-			eerror "one of the files history.dir, history.hash or history.index"
-			eerror "within ${NEWSSPOOL_DIR}/db."
-			eerror "Use your backup to restore the history database."
-		fi
-	else
-		einfo "${NEWSSPOOL_DIR}/db/history found. Leaving history database as it is."
-	fi
-
-	INNCFG_INODES="`sed -e '/innwatchspoolnodes/ ! d' /etc/news/inn.conf | sed -e 's/[^ ]*[ ]*\([^ ]*\)/\1/'`"
-	INNSPOOL_INODES="`df -Pi ${NEWSSPOOL_DIR} | sed -e 's/[^ ]*[ ]*\([^ ]*\).*/\1/' | sed -e '1 d'`"
-	if [ ${INNCFG_INODES} -gt ${INNSPOOL_INODES} ]
-	then
-		ewarn "Setting innwatchspoolinodes to zero, because the filesystem behind"
-		ewarn "$NEWSSPOOL_DIR works without inodes."
-		ewarn
-		cp /etc/news/inn.conf /etc/news/inn.conf.OLD
-		einfo "A copy of your old inn.conf has been saved to /etc/news/inn.conf.OLD."
-		sed -i -e '/innwatchspoolnodes/ s/\([^ ]*\)\([ ]*\).*/\1\20/' /etc/news/inn.conf
-		chown news:news /etc/news/inn.conf
-		chmod 644 /etc/news/inn.conf
-	fi
-
-	INNCHECK_LINES="`su - news -c "/usr/lib/news/bin/inncheck | wc -l"`"
-	if [ "${INNCHECK_LINES}" -gt 0 ]
-	then
-		NEWS_ERRFLAG="1"
-		ewarn "inncheck most certainly found an error."
-		ewarn "Please check its output:"
-		eerror "`su - news -c /usr/lib/news/bin/inncheck`"
-	fi
-
-	if [ "${NEWS_ERRFLAG}" -gt 0 ]
-	then
-		eerror
-		eerror "There were one or more errors/warnings checking your configuration."
-		eerror "Please read inn's documentation and fix them accordingly."
-	else
-		einfo
-		einfo "Inn configuration tests passed successfully."
-		einfo
-		ewarn "Please ensure you configured inn properly."
-	fi
-}
diff --git a/net-nntp/inn/inn-2.4.3.ebuild b/net-nntp/inn/inn-2.4.3.ebuild
deleted file mode 100644
index b040d7b8ef4a..000000000000
--- a/net-nntp/inn/inn-2.4.3.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.4.3.ebuild,v 1.10 2007/06/24 22:27:17 philantrop Exp $
-
-WANT_AUTOCONF="2.1"
-
-inherit fixheadtails ssl-cert eutils multilib libtool flag-o-matic autotools
-
-DESCRIPTION="The Internet News daemon, fully featured NNTP server"
-HOMEPAGE="http://www.isc.org/products/INN"
-SRC_URI="ftp://ftp.isc.org/isc/inn/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="as-is BSD GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE="ipv6 kerberos sasl ssl perl python berkdb inntaggedhash innkeywords"
-
-RDEPEND="virtual/mta
-	kerberos? ( virtual/krb5 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( dev-libs/openssl )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	berkdb? ( sys-libs/db )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	ht_fix_file configure.in support/fixscript.in
-
-	sed -i \
-		-e "s/ -B .OLD//" \
-		Makefile.global.in \
-		control/Makefile \
-		doc/man/Makefile
-
-	sed -i \
-		-e "s:@prefix@/lib:/etc/news/cert:" \
-		samples/sasl.conf.in
-
-	# Fixes compatibility problems with sys-libs/db-4.4 and 4.5,
-	# bug 174680.
-	epatch ${FILESDIR}/${P}-berkdb45.patch
-
-	# Fixes problems with the test suite.
-	epatch ${FILESDIR}/${P}-runtests.patch
-}
-
-src_compile() {
-	elibtoolize
-
-	filter-ldflags -Wl,--as-needed
-	append-ldflags $(bindnow-flags)
-
-	econf \
-		--prefix=/usr/$(get_libdir)/news \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-control-dir=/usr/$(get_libdir)/news/bin/control \
-		--with-etc-dir=/etc/news \
-		--with-filter-dir=/usr/$(get_libdir)/news/bin/filter \
-		--with-db-dir=/var/spool/news/db \
-		--with-doc-dir=/usr/share/doc/${PF} \
-		--with-spool-dir=/var/spool/news \
-		--with-log-dir=/var/log/news \
-		--with-run-dir=/var/run/news \
-		--with-tmp-path=/var/spool/news/tmp \
-		--enable-libtool \
-		--enable-setgid-inews \
-		--enable-uucp-rnews \
-		--without-tcl \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with kerberos kerberos /usr) \
-		$(use_with sasl) \
-		$(use_with ssl openssl) \
-		$(use_with berkdb berkeleydb /usr) \
-		$(use_enable ipv6) \
-		$(use_enable !inntaggedhash largefiles) \
-		$(use_enable inntaggedhash tagged-hash) \
-		$(use_enable innkeywords keywords) \
-		|| die "econf failed"
-	emake -j1 P="" || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}/" P="" SPECIAL="" install || die "make install failed"
-
-	chown -R root:0 "${D}"/usr/{$(get_libdir)/news/{lib,include},share/{doc,man}}
-	chmod 644 "${D}"/etc/news/*
-	for file in control.ctl expire.ctl incoming.conf nntpsend.ctl passwd.nntp readers.conf
-	do
-		chmod 640 "${D}"/etc/news/${file}
-	done
-
-	# Prevent old db/* files from being overwritten
-	insinto /usr/share/inn/dbexamples
-	newins site/active.minimal active
-	newins site/newsgroups.minimal newsgroups
-
-	keepdir \
-		/var/{log,run}/news \
-		/var/spool/news/{,archive,articles,db,incoming{,/bad},innfeed,outgoing,overview,tmp}
-
-	dodoc ChangeLog MANIFEST README* doc/checklist
-	use ipv6 && dodoc doc/IPv6-info
-
-	# So other programs can build against INN. (eg. Suck)
-	insinto /usr/$(get_libdir)/news/include
-	doins include/*.h
-
-	doinitd "${FILESDIR}"/innd innd
-
-	if use ssl
-	then
-		insinto /etc/news/cert
-		docert cert
-
-		fowners news:news /etc/news/cert/cert.{crt,csr,key,pem}
-	fi
-}
-
-pkg_postinst() {
-	for db_file in active newsgroups
-	do
-		[[ -f ${ROOT}/var/spool/news/db/${db_file} ]] && continue
-
-		if [[ -f ${ROOT}/usr/share/inn/dbexamples/${db_file} ]]
-		then
-			cp "${ROOT}"/usr/share/inn/dbexamples/${db_file} "${ROOT}"/var/spool/news/db/${db_file}
-		else
-			touch "${ROOT}"/var/spool/news/db/${db_file}
-		fi
-
-		chown news:news "${ROOT}"/var/spool/news/db/${db_file}
-		chmod 664 "${ROOT}"/var/spool/news/db/${db_file}
-	done
-
-	elog "Do not forget to update your cron entries, and also run"
-	elog "makedbz if you need to.  If this is a first-time installation"
-	elog "a minimal active file has been installed.  You will need to"
-	elog "touch history and run 'makedbz -i' to initialize the history"
-	elog "database.  See INSTALL for more information."
-	elog
-	elog "You need to assign a real shell to the news user, or else"
-	elog "starting inn will fail. You can use 'usermod -s /bin/bash news'"
-	elog "for this."
-
-	if use ssl
-	then
-		elog
-		elog "You may want to start nnrpd manually for native ssl support."
-		elog "If you choose to do so, automating this with a bootscript might"
-		elog "also be a good choice."
-		elog "Have a look at man nnrpd for valid parameters."
-		elog
-		elog "The certificate location in /etc/news/sasl.conf has been changed"
-		elog "to /etc/news/cert!"
-
-	fi
-}
-
-pkg_postrm() {
-	elog
-	elog "If you want your newsspool or altered configuration files"
-	elog "to be removed, please do so now manually."
-	elog
-}
-
-pkg_config() {
-	NEWSSPOOL_DIR="${ROOT}/var/spool/news"
-	NEWS_SHELL="`awk -F':' '/^news:/ {print $7;}' ${ROOT}/etc/passwd`"
-	NEWS_ERRFLAG="0"
-
-	if [[ ${NEWS_SHELL} == /bin/false || ${NEWS_SHELL} == /dev/null ]]
-	then
-		if [ ${UID} -eq 0 ]
-		then
-			einfo "Changing shell to /bin/bash for user news..."
-			usermod -s /bin/bash news
-		else
-			NEWS_ERRFLAG=1
-			eerror
-			eerror "Could not change shell for user news."
-			eerror "Please run 'usermod -s /bin/bash news' as root."
-		fi
-	else
-		einfo "Shell for user news unchanged ('${NEWS_SHELL}')."
-		if [[ ${NEWS_SHELL} != /bin/sh && ${NEWS_SHELL} != /bin/bash ]]
-		then
-			ewarn "You might want to change it to '/bin/bash', though."
-		fi
-	fi
-
-	if [[ ! -e ${NEWSSPOOL_DIR}/db/history ]]
-	then
-		if [[ ! -f ${NEWSSPOOL_DIR}/db/history.dir \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.pag \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.hash \
-			&& ! -f ${NEWSSPOOL_DIR}/db/history.index ]]
-		then
-			einfo "Building history database..."
-
-			touch "${NEWSSPOOL_DIR}"/db/history
-			chown news:news "${NEWSSPOOL_DIR}"/db/history
-			chmod 644 "${NEWSSPOOL_DIR}"/db/history
-
-			su - news -c "/usr/$(get_libdir)/news/bin/makedbz -i"
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.dir ]] && mv -f "${NEWSSPOOL_DIR}"/db/history.n.dir "${NEWSSPOOL_DIR}"/db/history.dir
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.pag ]] && mv -f "${NEWSSPOOL_DIR}"/db/history.n.pag "${NEWSSPOOL_DIR}"/db/history.pag
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.hash ]] && mv -f "${NEWSSPOOL_DIR}"/db/history.n.hash "${NEWSSPOOL_DIR}"/db/history.hash
-			[[ -f ${NEWSSPOOL_DIR}/db/history.n.index ]] && mv -f "${NEWSSPOOL_DIR}"/db/history.n.index "${NEWSSPOOL_DIR}"/db/history.index
-			su - news -c /usr/$(get_libdir)/news/bin/makehistory
-		else
-			NEWS_ERRFLAG="1"
-			eerror
-			eerror "Your installation seems to be screwed up."
-			eerror "${NEWSSPOOL_DIR}/db/history does not exist, but there's"
-			eerror "one of the files history.dir, history.hash or history.index"
-			eerror "within ${NEWSSPOOL_DIR}/db."
-			eerror "Use your backup to restore the history database."
-		fi
-	else
-		einfo "${NEWSSPOOL_DIR}/db/history found. Leaving history database as it is."
-	fi
-
-	INNCFG_INODES="$(sed -e '/innwatchspoolnodes/ ! d' /etc/news/inn.conf | sed -e 's/[^ ]*[ ]*\([^ ]*\)/\1/')"
-	INNSPOOL_INODES="$(df -Pi ${NEWSSPOOL_DIR} | sed -e 's/[^ ]*[ ]*\([^ ]*\).*/\1/' | sed -e '1 d')"
-	if [[ ${INNCFG_INODES} -gt ${INNSPOOL_INODES} ]]
-	then
-		ewarn "Setting innwatchspoolinodes to zero, because the filesystem behind"
-		ewarn "$NEWSSPOOL_DIR works without inodes."
-		ewarn
-		cp /etc/news/inn.conf /etc/news/inn.conf.OLD
-		einfo "A copy of your old inn.conf has been saved to /etc/news/inn.conf.OLD."
-		sed -i -e '/innwatchspoolnodes/ s/\([^ ]*\)\([ ]*\).*/\1\20/' /etc/news/inn.conf
-		chown news:news /etc/news/inn.conf
-		chmod 644 /etc/news/inn.conf
-	fi
-
-	INNCHECK_LINES="$(su - news -c "/usr/$(get_libdir)/news/bin/inncheck | wc -l")"
-	if [[ ${INNCHECK_LINES} -gt 0 ]]
-	then
-		NEWS_ERRFLAG="1"
-		ewarn "inncheck most certainly found an error."
-		ewarn "Please check its output:"
-		eerror "`su - news -c /usr/$(get_libdir)/news/bin/inncheck`"
-	fi
-
-	if [[ ${NEWS_ERRFLAG} -gt 0 ]]
-	then
-		eerror
-		eerror "There were one or more errors/warnings checking your configuration."
-		eerror "Please read inn's documentation and fix them accordingly."
-	else
-		einfo
-		einfo "Inn configuration tests passed successfully."
-		einfo
-		ewarn "Please ensure you configured inn properly."
-	fi
-}