Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 299 insertions, 17 deletions

diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog
index 25b1904c63e6..ed49e28e397b 100644
--- a/net-nntp/inn/ChangeLog
+++ b/net-nntp/inn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nntp/inn
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.57 2015/04/08 18:17:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.58 2015/06/09 05:32:30 jer Exp $
+
+*inn-2.5.5 (09 Jun 2015)
+
+  09 Jun 2015; Jeroen Roovers <jer@gentoo.org> +inn-2.5.5.ebuild:
+  Version bump.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> inn-2.5.3-r1.ebuild,
   inn-2.5.3-r2.ebuild, inn-2.5.4.ebuild:
diff --git a/net-nntp/inn/Manifest b/net-nntp/inn/Manifest
index 36aa66715723..6acd75e8cedc 100644
--- a/net-nntp/inn/Manifest
+++ b/net-nntp/inn/Manifest
@@ -7,27 +7,17 @@ AUX innd 545 SHA256 735789cfad7314f03146bf41b162b51b1f8d8f561b495e11c00b6143512a
 AUX innd-r1 602 SHA256 5e6336f32ef1829f602c24d6df97d4690385ed3a86940033d45e41c23b825603 SHA512 ced2de8ca65812f5748f4d3530f389da8baaa0e9228be6756fa4c701d21141a816740767559bde231c9d563e32995b0e50e5a8af449b60e653a854916c114fed WHIRLPOOL 84358f9329a2b930562ba8be5ec7606d37fd25ba3bbfd573f8bc1b25c87550c7dfeb25f546cecf34a1687c90adbf3e3a262c124052277864761d682544c65f94
 DIST inn-2.5.3.tar.gz 2412119 SHA256 60f0042b144499680cc577a4330aeaac5dac20c5994649c0e945d32b5f8dbcf1 SHA512 e579944571f0ec4fcdbf86de8458342075ce08f60df046bc8c45969b39f396ede8f5034f734542e1c64fb7792ae01c117c6a7af170fe5a43e1d0b2693f34d392 WHIRLPOOL a6d08020bfc458ad52567d225f14ef2f92fd605767c7ae4292724e3a3f49e1b42630fd787e7f79aae8a16d236479cef13b9531862eae050db839d3d0530f7999
 DIST inn-2.5.4.tar.gz 2408600 SHA256 5b62240c3074f2f38b3bcc656c343c587f2a923ec9d45e19f0d4ce269cb3f3f4 SHA512 f632599d009e8965d1b0ce7fef84dfbe48034c3a86825694a5ca4311123347647f9a4b534cff59820437f619ec09867bcff16f8f18c705e056eeea6493bc5441 WHIRLPOOL a313cb90e5dd55f4db5b70ede6b6d98561d2601f8d27e1b9b3983b90491b5ab300f0571d5fc1ac74f7892997ff6219189c863b122d569fe8673f3fcd13b0b67a
+DIST inn-2.5.5.tar.gz 2419841 SHA256 4245602c2c30fd3fe38513e9403c8d0ea4eb76256961591f97da630c341053bf SHA512 aada60b15952810fa31c3b2078b4ca1b1e560cee348cc81d076e0ba1f8b785497310d60aca89b9ecc4af85a1493eefa8a2b976cb349b8ea96482c93cbcf049f1 WHIRLPOOL b931d0f6a1e60b0157fafcc269e84d4f1f6c914ca7b95799be1a99feeec5c5568e41a9c7384da122d05eac7393d457a612be9ffbb79a01122e0c37c1de76785a
 EBUILD inn-2.5.3-r1.ebuild 8437 SHA256 7195806b63bc9cbbff615c03dc7ab45d7733398862becf8787a4602e06d9a344 SHA512 9f091d3866a6b7ec4b47bcddc256c5d1c1df9e571063e7b41533d824966da93f39e8816d18455593063efeaf60210a6ac20310e4772245e42d947bbc33016267 WHIRLPOOL 64a89825ad5e57ded93c6daf6108885a4d8b42e5a1337938c064ce35dc40787e297eef2d0a4a707e5a5692540657407de212c8c51654256183d4beb9fa55be62
 EBUILD inn-2.5.3-r2.ebuild 8683 SHA256 3b8ad9b6599a8b828c418bf04896205db24578668a3c0d6fa81b749cbd1f4c38 SHA512 a3dfbb53d6ac29030895d373daf85bc4f0efa20951647dc72d8dd79279924955627cd4b96452a3992122c67364d0472e0aad5d375b458f8867ef2963f3dc69f0 WHIRLPOOL 0476436b03538164544c7c11c26b1e5bd4e5f604d012d2758a1bb8fc0296e15dae93b5c1b587d152fcbeee38bbdbc620945b150eed1e88c5f0ed3023713986c3
 EBUILD inn-2.5.4.ebuild 8694 SHA256 09db21087ff20a24ead29d8e3c6ea45bf0edc79053d2fddc6bb9310739b04bc2 SHA512 8a307709c43bb192a01c8c3e0af094c0f90e851e8b42174ddc9b541896b192b1f6bd05ae33d93ae7079eabbccbd1cb9bce8fbd33003c82b106ab5f6b8329625f WHIRLPOOL c04a382d46b242cd64d823376899ba3f330b22c8d92d0e2ea17a748a1f757993c3a22280da22a87cb8e1a69eea6c2eee75d21a3f32882fa434342dce4293e005
-MISC ChangeLog 10856 SHA256 2c13ad19445357182fb847213dd59e8ec3fdbcfe167a530dd6fb999432da20a6 SHA512 ef637f6f191360d25403b21614d6dc71a43f78f87fc0e4ce126b5c9e26fc74e7bf1fb6620369bd775b153640c7f5ec2f58b0bcc123cc6adf053c731273167d42 WHIRLPOOL 68bab8058e2fded4bb907516351536127b75f85cf901309d3b23ca93fd447e11af24e3da27f231706a4a0e7516ceeb718eaecbd2c220f2a8b85957f7a18685cc
+EBUILD inn-2.5.5.ebuild 8691 SHA256 aa6f207b8bb77687dd23e26ab8b1bf825a32fac799b4a900537f7340b68c06d2 SHA512 eb531aafaca2b68f6b2fae340ca2d4f6e5534bd5b173011e23637e18d5548b721a3a7a6a4276c91d405d6e4938afbfe2b5672c40209b11a8eaeda09898ae6fa2 WHIRLPOOL ada5876ac00dd3ddfa3e3f1b8557f8ecc9efb91ecaf809e4ce7bb4b0f5910459dea376af091b27c9f9ba027d38c6962484cfcc44caa28c9ccc71ff57b2092d5a
+MISC ChangeLog 10962 SHA256 606f32e450f9448d6101ec9205a49c34c3dc7513d93cbf8742384d929434e20a SHA512 300022a35f3b597bebcc9a7cd7604a4338fc234707b04877db1a83e14e61a00181fe84c2454d4ab02661eff13a0df163ad0b6f1f92799ed317e25e24d96867d7 WHIRLPOOL 3f79b5484d1c2b949f07e5e1d5f4ecca303b66381143251d1e24c925e929d5f1d937666c6906206900ca92c0adaaa0f0aed6cc843469100d587a37a50a19c352
 MISC metadata.xml 352 SHA256 c58a5ed6da2054c42c3e7a6328456cedbdc45664210a95223fdd18a0fec340ce SHA512 64be44f3e7f7de8081c6e64ec2268383471b9917d9887d38c460b50ff7cb1bce80387f417be62c8f7bf84dc6e82be20c3a2c0d47b63bebb81c01a14fb67c0a07 WHIRLPOOL 54197b7f8d93cf6a1f7e45d5287324a88b84c8d960f9a598c608ab8446a5996a5c43dc1cd2fda03a77265c13b16e45470e1421738e717c3bb2429b733e6f5dc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJXDDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+SMP/iOhfZcZiCaXNUxTziQwE4MQ
-3JddxLVwA0pH+4xWvgjE9zKiT7SMusRkkr4Jz+ordHj5kelTIh/agh62PmLo/DN9
-fBp6C2RfqzYNxc7GfKFKbhvHXKWCs1l9dj/IoJnabzbI1WRTObTLB6QERLBjKJHI
-FX+MHCsErkx4SuzLUXpY35XB6pRH6D5G0tkvtLjcXjMb5I7eRKNfKwgCAU4X+jXr
-YvljJO1xoGPAVY9q8zx6uFir9CAoeoG/NbZzh9tlqFglw8aNRxVSpT7iXhDJwYd0
-VYnoa7orM+S4+K7QP7pTZ6zGJCnEZvWyJh//HfIXIvwBvgm/LYJIew5ohI9gPD4/
-Anx40k/n4iRd9sJ0nEnEw1DLz280NPqV5DcECsQRqbXTVu0Ouiyg/fj9oH2OV+y9
-TQbwkWVPx03AW6r2UkpeA2W/ilnyQ+H3dboUEfFfy2GWL2FNERChg6fpQjdNJKUY
-r7/MaBCM1oWpbHHedD48XBxfqYBMzI1zZmwb4yN56hLlhpUDZp6wRZfuY/iofaYL
-hUHcCdt6CnJTKHiM5TUttRgmTyk99/mTXB4k88sG+tU69kzRC8nrIL1DMTXkZVS7
-80iQ/7vzTZpuYWwwr/dwQ5SSgNChjE3pTZfltbmpBrxh9xNa3nZgh90gbwkH4UeB
-QCfcEWBB9EDSWf4il/mp
-=QgML
+iEYEAREIAAYFAlV2em8ACgkQVWmRsqeSphOyGwCeN2pIm8nZkQxmdKNmIMHN/dzX
+YEcAn0YhfeVOSnuaa2f+us5HpmvhVI4P
+=H8SE
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/inn/inn-2.5.5.ebuild b/net-nntp/inn/inn-2.5.5.ebuild
new file mode 100644
index 000000000000..085e0d819ea2
--- /dev/null
+++ b/net-nntp/inn/inn-2.5.5.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.5.ebuild,v 1.1 2015/06/09 05:32:30 jer Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib python-single-r1 ssl-cert toolchain-funcs
+
+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"
+
+# GPL-2 only for init script
+LICENSE="ISC GPL-2+ public-domain BSD-4 BSD-2 RSA BSD MIT GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="berkdb innkeywords inntaggedhash ipv6 kerberos perl python sasl ssl"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	virtual/mta
+	dev-perl/MIME-tools
+	sys-libs/pam
+	sys-libs/zlib
+	kerberos? ( virtual/krb5 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( dev-libs/openssl )
+	python? ( ${PYTHON_DEPS} )
+	berkdb? ( sys-libs/db )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.5.3-ar.patch
+	epatch "${FILESDIR}"/${PN}-2.5.3-tests.patch
+
+	sed -e 's: -B .OLD::' -i Makefile.global.in || die
+
+	# Do not treat LDFLAGS as if it contained libraries to link to
+	sed -e 's:LDFLAGS::g' -i m4/python.m4 || die
+
+	# We do not have the biff service, but we do have comsat
+	sed -e 's:"biff":"comsat":g' -i tests/lib/getnameinfo-t.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR
+
+	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=/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)
+}
+
+src_install() {
+	emake DESTDIR="${D}/" P="" SPECIAL="" install
+
+	chown -R root:0 \
+		"${D}"/usr/$(get_libdir)/news/$(get_libdir) \
+		"${D}"/usr/$(get_libdir)/news/include \
+		"${D}"/usr/share/doc \
+		"${D}"/usr/share/man \
+		|| die
+	chmod 644 "${D}"/etc/news/* || die
+	chmod 640 \
+		"${D}"/etc/news/control.ctl \
+		"${D}"/etc/news/expire.ctl \
+		"${D}"/etc/news/incoming.conf \
+		"${D}"/etc/news/innfeed.conf \
+		"${D}"/etc/news/nntpsend.ctl \
+		"${D}"/etc/news/passwd.nntp \
+		"${D}"/etc/news/readers.conf \
+		|| die
+
+	# 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/news \
+		/var/spool/news/archive \
+		/var/spool/news/articles \
+		/var/spool/news/db \
+		/var/spool/news/incoming \
+		/var/spool/news/incoming/bad \
+		/var/spool/news/innfeed \
+		/var/spool/news/outgoing \
+		/var/spool/news/overview \
+		/var/spool/news/tmp
+
+	fowners news:news /var/log/news
+
+	dodoc ChangeLog MANIFEST README* doc/checklist
+	use ipv6 && dodoc doc/IPv6-info
+
+	# So other programs can build against INN
+	insinto /usr/$(get_libdir)/news/include
+	doins include/*.h
+
+	newinitd "${FILESDIR}"/innd-r1 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 "It is recommended to run emerge --config ${CATEGORY}/${PN}"
+	elog "now to finish setting up this package."
+	elog
+	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
+		einfo "Changing shell to /bin/bash for user news..."
+		usermod -s /bin/bash news
+	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
+
+			einfo "Running makedbz -i ..."
+			su - news -c "/usr/$(get_libdir)/news/bin/makedbz -i"
+
+			einfo "Moving files into place ..."
+			[[ -f ${NEWSSPOOL_DIR}/db/history.n.dir ]] && \
+				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.dir \
+				"${NEWSSPOOL_DIR}"/db/history.dir
+			[[ -f ${NEWSSPOOL_DIR}/db/history.n.pag ]] && \
+				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.pag \
+				"${NEWSSPOOL_DIR}"/db/history.pag
+			[[ -f ${NEWSSPOOL_DIR}/db/history.n.hash ]] && \
+				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.hash \
+				"${NEWSSPOOL_DIR}"/db/history.hash
+			[[ -f ${NEWSSPOOL_DIR}/db/history.n.index ]] && \
+				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.index \
+				"${NEWSSPOOL_DIR}"/db/history.index
+
+			einfo "Running makehistory ..."
+			su - news -c /usr/$(get_libdir)/news/bin/makehistory
+		else
+			NEWS_ERRFLAG="1"
+			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."
+		einfo "Leaving history database as it is."
+	fi
+
+	INNCFG_INODES=$(
+		sed /etc/news/inn.conf \
+			-e '/innwatchspoolnodes/ ! d; s:[^ ]*[ ]*\([^ ]*\):\1:'
+	)
+	INNSPOOL_INODES=$(
+		df -Pi ${NEWSSPOOL_DIR} | \
+			sed -e 's:[^ ]*[ ]*\([^ ]*\).*:\1:; 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 /etc/news/inn.conf \
+			-e '/innwatchspoolnodes/ s:\([^ ]*\)\([ ]*\).*:\1\20:'
+		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 "There were one or more errors/warnings checking your"
+		eerror "configuration. Please read inn's documentation and"
+		eerror "fix them accordingly."
+	else
+		einfo "INN configuration tests passed successfully."
+		ewarn "Please ensure you have configured inn properly."
+	fi
+}