Bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64

3 files changed, 297 insertions, 25 deletions

diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog
index fa7e3b2dfa88..d222706fe293 100644
--- a/net-nntp/inn/ChangeLog
+++ b/net-nntp/inn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nntp/inn
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.55 2013/09/05 19:44:43 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.56 2014/06/09 06:21:42 patrick Exp $
+
+*inn-2.5.4 (09 Jun 2014)
+
+  09 Jun 2014; Patrick Lauer <patrick@gentoo.org> +inn-2.5.4.ebuild:
+  Bump
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> inn-2.5.3-r1.ebuild,
   inn-2.5.3-r2.ebuild:
diff --git a/net-nntp/inn/Manifest b/net-nntp/inn/Manifest
index 6a201510b926..49e81b55c07c 100644
--- a/net-nntp/inn/Manifest
+++ b/net-nntp/inn/Manifest
@@ -1,31 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX inn-2.5.3-ar.patch 788 SHA256 e9ab8a6fbf19f5685a69ad7c3d9a1f06c45ba6e45bfa800c6bdeaef250ab4de8 SHA512 ebe00878b159f6af9e3a378acf369bf5b2d06fcde1f4b3f7c721f8947a555d6a8f6a871e995d32cd0c83df151e338168c7dfbeaf0270b5dd8d98c5a9d2969ed3 WHIRLPOOL 6547beab0bd53ab1f410be4c435429e66150d9212c44fcef755282278b5704a07e81c37dd5104985ea704e1ad8bbc47f9a82e2b673559058bede2e6abc5a170b
 AUX inn-2.5.3-tests.patch 654 SHA256 a8c46c81d287d350605c455a923990a709f01876ca76e1ef4c9642f966005645 SHA512 31a998b61c80583cd63cc3310fdf86605e5e0ce604056896d96aa255caba9ff1e3fa045b70f73e1157587fa6f3dae66789b7f6877204d6b6d4a096935ac80892 WHIRLPOOL df912dc92f26eff369341b6140fa73f5532196abfebaa16661d1bc9c140c90bfcf9273b1da6951181140210b500e1fb6be6f5db9d3199881abd86efdd8763314
 AUX innd 545 SHA256 735789cfad7314f03146bf41b162b51b1f8d8f561b495e11c00b6143512ad54d SHA512 52ebad0dcf240ac504d13437d86a1e5b5fa7e78198041e01c328278deb5993c1dec070838df71f6ef3b56520f8f7ca0b92c1ab3949457e4078e7b7afd9e58883 WHIRLPOOL 4f5263cd0eb357f0c1d8902f836b7a354a103fa55db753183f3ff98cac0d9fc3a1e134ab53ffb691c7409a5d692ef163061269d73020eea9de78b2ae25c2e4e5
 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
 EBUILD inn-2.5.3-r1.ebuild 8441 SHA256 15c89f4848bf0ba4cec76194d168f0cb03e91d907d4afe46332ec5df6d7c897d SHA512 f12b1f2b8b3f73af978224c54e476883b49605973fcb9aaa3aa2b8eace93c8edf2056258ff08e3fe0ec738d4f3f956a1cd53acbd7bf4b2772ee58fbc68c9b799 WHIRLPOOL 17c860df2c2f94aff5f25b6ff88bffe6531ebf586cbdcca7af2886d2357e07f4f66a40e3f47ef1016bb30a1bb71d6173c89c2d03068a800f699ec3338bb7cbf4
 EBUILD inn-2.5.3-r2.ebuild 8687 SHA256 d965bdf62d290fbc8d473324cb5a5cb2db68da16b4faf2d0cc1658cfdc9d83f3 SHA512 828c8edf7d45dd2411044db643c52d35efc8c51c51a814b61228732e736c980835c9f26dee57f01092c6a9cc3a9b772874a9a87b6ab1a59aa324af1ac9197fcd WHIRLPOOL 12c8a976501f059166027f6fb8470ff93c60d3426739b710bdb1acb11d433f268cf0ed6c0aef53fd86badf20cd54f8304f0407f43cac9bd1a7e8b85c6a3b6e11
-MISC ChangeLog 10606 SHA256 9e6cb28e5b5e11cbd631b566e92bbfd8528dc04934cc3ec82441c71c99f1c102 SHA512 70219bd35466cfc5c54dc75e070f8ef3ba20ef0fd41f5ba9b956bbcdd8c3979f4a4cf78d978002591dea1847408addf1987a1bd3c902feb0ba65307a36656e8f WHIRLPOOL 438373468e89087a1f70493be2101b7572affc2c7d81bab9c992849b71e00ff69e80c9de309c28c25901e18d6149d8fcacb4baedcaf8c33bccb82c583833829f
+EBUILD inn-2.5.4.ebuild 8699 SHA256 b5d3a37129b725fc12694547f92602dcdcab80f6fb7baf9e8cd3883cff885c6c SHA512 5aeb2a47ad663faf26cb3c5b3e50a692bc3c40e8416a0d25606ae3cd08ac789c7c05c01a0695c745278d3fc12baffaec5161a2f01d62d1ed16b619cf3957c4f1 WHIRLPOOL 21c32ad4df56c76c2bd4874bf28b6993bd6b549b735a89893ca2c794d810605e13cc13c8f73414095ae5af8f6fd40f67e3c63c8a841b625a8f1940a353ba6714
+MISC ChangeLog 10710 SHA256 35a417fa80a6c6e4e541f52e0d48610f8767841215924aca27b3fcdd9c8c4f6e SHA512 7c08828c0597cffb4d147df2d4641de4bb02e1b65907e17313e91a5117de10b7628f8ecaeed80fda581282ecb5330be775d8078e602563f09f29c889a2147a3d WHIRLPOOL f28a9bc56eae51a6bccd9c7b52b5959831e32b12dfbd5fbfc451c3732632a09ff7775a801d4b469eabcf07c2130a465fcc6edec3df5ff46920d1370a59bb1a22
 MISC metadata.xml 352 SHA256 c58a5ed6da2054c42c3e7a6328456cedbdc45664210a95223fdd18a0fec340ce SHA512 64be44f3e7f7de8081c6e64ec2268383471b9917d9887d38c460b50ff7cb1bce80387f417be62c8f7bf84dc6e82be20c3a2c0d47b63bebb81c01a14fb67c0a07 WHIRLPOOL 54197b7f8d93cf6a1f7e45d5287324a88b84c8d960f9a598c608ab8446a5996a5c43dc1cd2fda03a77265c13b16e45470e1421738e717c3bb2429b733e6f5dc8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
-
-iQJ8BAEBCABmBQJSKN+BXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOtkYP/1PE5Sl0fnVKtkCNxYP8WQV7
-pBJRYUY91AP/Xl+3vHPXe12LmXO6VfE3eOn6Q68qkXLa1DoM/lJH5MtnXW7bDZhn
-5XejXax/rZdBT62Veg1pAiKGyLR3e4zAWA+9TL6FvgwQnYN8LZgRA33hFhPtgb31
-RjXe6vK8ggRwzEU8lmQ7/a9Er7LTQwqvZpLUAqBZaEiAdhwfR7o2w1rAsFPdRwHX
-EWjNRSDvxpEJftYLxJPPtlEsRu0h0RsUgHtAZ/MaE6/pho3oF+LGuQxrqp6EyBfG
-JRrIgKXEkG+Eyj1IIS30wLiebh0KXyMptrospanvlhUbTxXO0Pk75e9vtmCwM2Sz
-Xh8YZaY0n0x1u3ZMn10M+i9bRBP/rzTNDSsL8hpio7qytxbWeioHIUYdxvxMbOnr
-8NXiJEz7pmkM5qIdPyO6Rrqt2zGM8UvSH2DaMTj5sCf/hQUr+rOVMcv78nfsrTvA
-q3ho6IutblvjE5Lx1vxO6DIPbrmJ90CiTlMp4lVy7LBbjEmmChSgvxQALqWbua5S
-oCQk8labtLRDcWCa1AG+lRmfBPuA4GrZM9fL5it5Nn2USigZwgYyjYDMT8QrtWWu
-z5KKHYVxx32t+dkzzvBU0KAglhwGPoIhoyIsUr2VO3I/nl/LjwIW3E6MPEW7tkRR
-FTbjE1X8IiHV4oP1dpBD
-=Su3l
------END PGP SIGNATURE-----
diff --git a/net-nntp/inn/inn-2.5.4.ebuild b/net-nntp/inn/inn-2.5.4.ebuild
new file mode 100644
index 000000000000..b34773d30917
--- /dev/null
+++ b/net-nntp/inn/inn-2.5.4.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.4.ebuild,v 1.1 2014/06/09 06:21:42 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,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
+}