Bump to 2.5.0. Restricting tests. Fixes #230527

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

3 files changed, 268 insertions, 13 deletions

diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog
index bbbf8d9b1d1c..c6a259b13bbc 100644
--- a/net-nntp/inn/ChangeLog
+++ b/net-nntp/inn/ChangeLog
@@ -1,6 +1,11 @@
 # 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.23 2008/08/22 19:51:39 cardoe Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.24 2009/07/25 15:16:14 patrick Exp $
+
+*inn-2.5.0 (25 Jul 2009)
+
+  25 Jul 2009; Patrick Lauer <patrick@gentoo.org> +inn-2.5.0.ebuild:
+  Bump to 2.5.0. Restricting tests. Fixes #230527
 
   22 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/net-nntp/inn/Manifest b/net-nntp/inn/Manifest
index 2527899dc5ed..daa13bfdd397 100644
--- a/net-nntp/inn/Manifest
+++ b/net-nntp/inn/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX inn-2.4.3-berkdb45.patch 2389 RMD160 d0580cc8e2f1cdf60feacd597991edbfb412d3f8 SHA1 e3fe46034f4e0061276378a3e0c576b289876612 SHA256 2e762081a319a898135c98ae5a5f5e0fbcc8b25deeb65814c343a0a6683c62e2
 AUX inn-2.4.3-runtests.patch 2543 RMD160 68605c14e225eb8484461d3170e98737198b3c2a SHA1 b365a0c100045bdd3e3338f81de05f8232f89207 SHA256 2efa10ebb0b33630f42bc070d535a99ff6ed1287ecab53b7ca8210ad74f229b0
 AUX innd 503 RMD160 5631966614d5bb4e1c304195e1e796a1fbc9421e SHA1 85aa86e4fcca7837e32e2e3be31fbd50e96b79c2 SHA256 ab2082ee261d632dafeaaf9ebb459e5afe684597c67b860ca0a7a8ff3bf554ed
 DIST inn-2.4.3.tar.gz 1871994 RMD160 f9465f3fe905d1173fb30c00d591ab8f9cbaecfc SHA1 95c30835b0990a3c432858948266dd4db639a3e1 SHA256 b69679ed4b79ed8384db50e43a09a7d52e4da51712235b912bcfae037e137bf2
+DIST inn-2.5.0.tar.gz 2380748 RMD160 0b9583eef8fe86131297d403323ab6ff2906fe06 SHA1 f009da670e2594d9079e7fb26f32d10c640d24e6 SHA256 0bfcc9e1b232804a5a6bd5bf8574a37092e6f80aadbef7b8aec5c4a50def4791
 EBUILD inn-2.4.3-r1.ebuild 8116 RMD160 945d76daac70c06dcc9a9a287addbab241fdd530 SHA1 f5df74fbe85211776701b71eab31119086844350 SHA256 2b106a107b7a4f31d8719f8183754532bdec2544ca98ac0a1f4ec6adb6965246
-MISC ChangeLog 5849 RMD160 ccbbef6af89725b7e700dccc5606b39e0526d72b SHA1 e928ff417821ddacff2188df6cbc2af2aee7e616 SHA256 4b80a5b495924f7b63c1a535c418f019628480cd545f75d8a6ad690adb468031
+EBUILD inn-2.5.0.ebuild 8153 RMD160 1ab157926edc41245f95a2b48ddb7be6b5bf4686 SHA1 520f21bef7ca8f1343673e428182a8d5c340eb90 SHA256 fc55bee504b54176f3b9531520cf61ba7506af6cd14fef6c0ef803843d481525
+MISC ChangeLog 5996 RMD160 d884df348baa1608c845c50eab722ea08f904e83 SHA1 b683bd60c7e6c8fbb6b7a9febeae944af1941961 SHA256 2ef5c2bfabefddef35b85a9be961a55a9beb30c894a043935f7bce3f656b6ca4
 MISC metadata.xml 352 RMD160 802eed9c30b34a5226648155bf521f9fd3bef350 SHA1 230d40e31eb709966710ca40e489ad00962c80bb SHA256 c58a5ed6da2054c42c3e7a6328456cedbdc45664210a95223fdd18a0fec340ce
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkivGNUACgkQoeSe8B0zEfwWiQCeJLzcmv/KgDUcVnOl52yV91py
-dfgAn37IYEk4ACm/QNIMV4u8K1IejLlf
-=WUk5
------END PGP SIGNATURE-----
diff --git a/net-nntp/inn/inn-2.5.0.ebuild b/net-nntp/inn/inn-2.5.0.ebuild
new file mode 100644
index 000000000000..2479aed39d56
--- /dev/null
+++ b/net-nntp/inn/inn-2.5.0.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.0.ebuild,v 1.1 2009/07/25 15:16:14 patrick Exp $
+
+EAPI="2"
+
+WANT_AUTOCONF="2.1"
+
+inherit fixheadtails ssl-cert eutils multilib libtool autotools
+
+# they fail since 2.4.x, so ...
+RESTRICT="test"
+
+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_prepare() {
+
+	#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"
+
+	elibtoolize
+}
+
+src_compile() {
+	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
+}
+
+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
+		install_cert /etc/news/cert/cert
+		chown news:news "${ROOT}"/etc/news/cert/cert.{crt,csr,key,pem}
+
+		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
+}