Version bump.

Package-Manager: portage-2.1.9.24/cvs/Linux i686

3 files changed, 254 insertions, 2 deletions

diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog
index b2e6540001f9..58eb9b4b8198 100644
--- a/net-nntp/inn/ChangeLog
+++ b/net-nntp/inn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nntp/inn
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.29 2010/01/12 17:32:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.30 2010/11/27 16:09:03 jer Exp $
+
+*inn-2.5.2 (27 Nov 2010)
+
+  27 Nov 2010; Jeroen Roovers <jer@gentoo.org> +inn-2.5.2.ebuild:
+  Version bump.
 
   12 Jan 2010; Jeroen Roovers <jer@gentoo.org> inn-2.5.1.ebuild:
   dev-lang/perl and dev-perl/MIME-tools are not optional.
diff --git a/net-nntp/inn/Manifest b/net-nntp/inn/Manifest
index 8dfa5423e2e7..165e7f7b5e3d 100644
--- a/net-nntp/inn/Manifest
+++ b/net-nntp/inn/Manifest
@@ -5,9 +5,11 @@ AUX innd 503 RMD160 5631966614d5bb4e1c304195e1e796a1fbc9421e SHA1 85aa86e4fcca78
 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
 DIST inn-2.5.1.tar.gz 2305406 RMD160 8cb24ac4fcea299b02b2b0b043a4f5506b902c47 SHA1 e49a58a3484bbb7fd230b37ca17cc34eb10c10f1 SHA256 bb486d1bd0259762a9d7339309c4e8600bd5fc6ce1af4fccde6fe9d1f64a1c58
+DIST inn-2.5.2.tar.gz 2331916 RMD160 2fce7fade8bd8df3fe7f813b6feb37ff2b2bf07c SHA1 e7a9512acb5fa09ecdf116a4bde39c9f5efe65db SHA256 f5edd48f48ecee9b6430db94fe504f893d7dfae4257f55f382ba1cf7375b4e68
 EBUILD inn-2.4.3-r1.ebuild 8116 RMD160 945d76daac70c06dcc9a9a287addbab241fdd530 SHA1 f5df74fbe85211776701b71eab31119086844350 SHA256 2b106a107b7a4f31d8719f8183754532bdec2544ca98ac0a1f4ec6adb6965246
 EBUILD inn-2.4.3-r2.ebuild 8237 RMD160 7518f8dabdf75b50c885aaa35bb93db8c1a73322 SHA1 9857b646324f473ba39ac7d8589f8a542c43b31c SHA256 00cd9f35b4d9f9c65aa3571036b267e8a1f99f5ba501d7d00f99f31a1d812e7b
 EBUILD inn-2.5.0.ebuild 8078 RMD160 9d68ed357f91b5a3e2e41706a294d2e9212f8e6a SHA1 f834a98b4ebcc38f4c3df2b48a52a00c54ce7e48 SHA256 cc78de9caed80e95b30253cf6c08c4ee881526bc1b0a84f438b282f2db86550a
 EBUILD inn-2.5.1.ebuild 8016 RMD160 1f59dfc943cc076fffbd9c470ee5746cdc7b072a SHA1 52d636edfe1a48a0267397a5cddf036beb038352 SHA256 ffc2716fa96ac8bb31bc987d3f57817135e23c1f06d24c765487b197c6b5053b
-MISC ChangeLog 7018 RMD160 ba69485155e5b20a36244f6c38adbd9395a68ae9 SHA1 3b448bec053fa6233eae35d535fb0772b14c43ff SHA256 de5c1728987ffbba9939f9138954ac87c085d49393d6ea90aca4df9e3acde5a6
+EBUILD inn-2.5.2.ebuild 8010 RMD160 011ec81f6f67b1c14984543049993b32b56ad70a SHA1 b5be60ae1a0d1e44ec4582ef683ba2ada0778e54 SHA256 57311973183c86c47e66c464a03502875704a02e876e2af9e5e54e769c4741f9
+MISC ChangeLog 7127 RMD160 0d7ff89bdcce6b32229eb3cdc4746196d4bf2d50 SHA1 522c71e5d27e0841e9271b774e140e58903c0a61 SHA256 607efa581d8e246fd269ca4fc4da7fd73ade01854d8683accd14dedc16b95555
 MISC metadata.xml 352 RMD160 802eed9c30b34a5226648155bf521f9fd3bef350 SHA1 230d40e31eb709966710ca40e489ad00962c80bb SHA256 c58a5ed6da2054c42c3e7a6328456cedbdc45664210a95223fdd18a0fec340ce
diff --git a/net-nntp/inn/inn-2.5.2.ebuild b/net-nntp/inn/inn-2.5.2.ebuild
new file mode 100644
index 000000000000..28b9f7d1afb3
--- /dev/null
+++ b/net-nntp/inn/inn-2.5.2.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.2.ebuild,v 1.1 2010/11/27 16:09:03 jer Exp $
+
+EAPI="2"
+
+inherit autotools eutils fixheadtails multilib ssl-cert
+
+DESCRIPTION="The Internet News daemon, fully featured NNTP server"
+HOMEPAGE="https://www.isc.org/software/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="berkdb innkeywords inntaggedhash ipv6 kerberos python sasl ssl"
+
+RDEPEND="
+	virtual/mta
+	dev-perl/MIME-tools
+	kerberos? ( virtual/krb5 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( dev-libs/openssl )
+	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 || die "sed failed"
+
+	# Do not treat LDFLAGS as if it contained libraries to link to
+	sed -i m4/python.m4 -e 's|LDFLAGS||g' || die "sed python.m4 failed"
+
+	# We do not have the biff service, but we do have comsat
+	sed -i tests/lib/getnameinfo-t.c \
+		-e 's|"biff"|"comsat"|g' \
+		|| die "sed getnameinfo-t.c failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--prefix=/usr/$(get_libdir)/news \
+		--sysconfdir=/etc/news \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--with-control-dir=/usr/$(get_libdir)/news/bin/control \
+		--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-dir=/var/spool/news/tmp \
+		--disable-libtool \
+		--with-gnu-ld \
+		--enable-setgid-inews \
+		--enable-uucp-rnews \
+		$(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"
+}
+
+src_install() {
+	emake 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
+}
+
+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
+}