Version bump (bug #432002).

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 291 insertions, 13 deletions

diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog
index 5439c3c615d9..67e0dde9201b 100644
--- a/net-nntp/inn/ChangeLog
+++ b/net-nntp/inn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nntp/inn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.41 2012/02/08 06:41:07 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.42 2012/08/20 01:12:05 jer Exp $
+
+*inn-2.5.3 (20 Aug 2012)
+
+  20 Aug 2012; Jeroen Roovers <jer@gentoo.org> +inn-2.5.3.ebuild, files/innd:
+  Version bump (bug #432002).
 
   08 Feb 2012; Sergei Trofimovich <slyfox@gentoo.org> files/innd:
   Converted /etc/init.d/innd to use --user instead of --chuid.
diff --git a/net-nntp/inn/Manifest b/net-nntp/inn/Manifest
index 87d5b8b60902..687ccf58eb58 100644
--- a/net-nntp/inn/Manifest
+++ b/net-nntp/inn/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX innd 499 RMD160 f7753b3a1af3e100da7073ac1605262e221d8fe1 SHA1 5de13931ac877ad283f1755a322e91a895da48f6 SHA256 cfc544953b83c3cd0c633ce58cc1d69f87cb9b023bf88cdc2b1fd78507ac535b
-DIST inn-2.5.2.tar.gz 2331916 RMD160 2fce7fade8bd8df3fe7f813b6feb37ff2b2bf07c SHA1 e7a9512acb5fa09ecdf116a4bde39c9f5efe65db SHA256 f5edd48f48ecee9b6430db94fe504f893d7dfae4257f55f382ba1cf7375b4e68
-EBUILD inn-2.5.2-r1.ebuild 8187 RMD160 442a95b2e9f3b667e18040fe08ca7bb23b93cc20 SHA1 9b2361bc88daa9131a536a080a107bf4eda12367 SHA256 141b13d9f359763a05044eb0927615c2034498573c2114d938bc683fdd7e34a0
-EBUILD inn-2.5.2.ebuild 8015 RMD160 4a37c5d5589b4f93440e4721dd80eda0ca14b0a9 SHA1 a29dff7239c331972cf10d077f7f10122c74b473 SHA256 571730ba03b8c7c4ac800e1a32c5d701b5621893a7cec7e40ad50a08086b64bd
-MISC ChangeLog 8617 RMD160 e470842ac76eca0e1624cf7bd48ff227fc997a90 SHA1 6581aafd9f41a423b2ce4d68f882f2a22bdadcfe SHA256 e3e637c18885cc353ba68b4ba84cc2fc6c59b02970beaa3ccfa830a6f230d68d
-MISC metadata.xml 352 RMD160 802eed9c30b34a5226648155bf521f9fd3bef350 SHA1 230d40e31eb709966710ca40e489ad00962c80bb SHA256 c58a5ed6da2054c42c3e7a6328456cedbdc45664210a95223fdd18a0fec340ce
+AUX innd 545 SHA256 735789cfad7314f03146bf41b162b51b1f8d8f561b495e11c00b6143512ad54d SHA512 52ebad0dcf240ac504d13437d86a1e5b5fa7e78198041e01c328278deb5993c1dec070838df71f6ef3b56520f8f7ca0b92c1ab3949457e4078e7b7afd9e58883 WHIRLPOOL 4f5263cd0eb357f0c1d8902f836b7a354a103fa55db753183f3ff98cac0d9fc3a1e134ab53ffb691c7409a5d692ef163061269d73020eea9de78b2ae25c2e4e5
+DIST inn-2.5.2.tar.gz 2331916 SHA256 f5edd48f48ecee9b6430db94fe504f893d7dfae4257f55f382ba1cf7375b4e68 SHA512 0a8e9064fb2997bad6c7745c49f4681bc91e898c629f95ae8ee9d0bb817a032e98034c0693762b73e1c3c58d73dcc1d0a58ab1fa60ab934a6357e34174c3d0a4 WHIRLPOOL df8f2fcbfadba658df8ea5752f801af30797c5aed7809fa33050d300f00e3e1e4b504b418a96f36d310c50e23d44a6389b9b24dd818490b411f244cae77f02a9
+DIST inn-2.5.3.tar.gz 2412119 SHA256 60f0042b144499680cc577a4330aeaac5dac20c5994649c0e945d32b5f8dbcf1 SHA512 e579944571f0ec4fcdbf86de8458342075ce08f60df046bc8c45969b39f396ede8f5034f734542e1c64fb7792ae01c117c6a7af170fe5a43e1d0b2693f34d392 WHIRLPOOL a6d08020bfc458ad52567d225f14ef2f92fd605767c7ae4292724e3a3f49e1b42630fd787e7f79aae8a16d236479cef13b9531862eae050db839d3d0530f7999
+EBUILD inn-2.5.2-r1.ebuild 8187 SHA256 141b13d9f359763a05044eb0927615c2034498573c2114d938bc683fdd7e34a0 SHA512 a186b07c6ca7ae8cfb2665b79538143c119a999d6aa3ccde147955e8c16e373b66af1c16a141fc1cfa3ad00b38b6e27b19b2a91773367873f0f15d7f2fea5089 WHIRLPOOL 14d88f6abbc914de05747306c1c2f41d9460b8286270f169a267c4bf7175e0cb4d796f119acf14350460b01caa20aeef9bfd2d14f53efe4612dcfccefcb22c48
+EBUILD inn-2.5.2.ebuild 8015 SHA256 571730ba03b8c7c4ac800e1a32c5d701b5621893a7cec7e40ad50a08086b64bd SHA512 d34d4956b8176ac936ce43e2f54ed672592142457475aaf242b39579a0ed2620e312d6dce8a9cf296e969cb60c95e05d1a1a431a517e13485752e37f06cc68b2 WHIRLPOOL 4e806b138bfbdf63f0dbf515d58461a01619f6737736dd3159332f10a817113782666431da3409f8ec656be1c61cf680fc6bee868c48f2eafe2aad23936fd5c7
+EBUILD inn-2.5.3.ebuild 8195 SHA256 24cf8364c84969da49d354c5f41a665f795f8703a29a045b65d9a7137d2ed534 SHA512 7ee4e8b158f1cc62e8ff89a1982400d780eccffed193c5bcac36b8e5ea47ff3ea72949fe353e91dd48bdc882bf9b91201e6bfb2ca321c972a74aab5733f32909 WHIRLPOOL 3833956fbf056575692222ab772e54ae249e72b0704ad9799ccb0bddbb15ab0a3c3e4a05be9a110898ec64741fc4f90cec91303ba71c6b69d49962a539b50ef8
+MISC ChangeLog 8749 SHA256 88f1bfa0253322fd2e28699f7700a9243a4945490afd7eb08f088a60c6856389 SHA512 508789cbceccec45a307030e1f81fe16c9a553ebe3645eab71127a07a3176e066bb6bb23c2840924872d393a81656fa4c3c588e8b93f1f58a2fb7990b415e9f8 WHIRLPOOL e5b775798996c46ff27145012850f3739fa3f9a9d364d1d035f0cfed28098a2ff4698eca519dbccbcb03d4afe0e8d9769a98004332be1b8b1500f8e3da59e57d
+MISC metadata.xml 352 SHA256 c58a5ed6da2054c42c3e7a6328456cedbdc45664210a95223fdd18a0fec340ce SHA512 64be44f3e7f7de8081c6e64ec2268383471b9917d9887d38c460b50ff7cb1bce80387f417be62c8f7bf84dc6e82be20c3a2c0d47b63bebb81c01a14fb67c0a07 WHIRLPOOL 54197b7f8d93cf6a1f7e45d5287324a88b84c8d960f9a598c608ab8446a5996a5c43dc1cd2fda03a77265c13b16e45470e1421738e717c3bb2429b733e6f5dc8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk8yGQ8ACgkQcaHudmEf86rw6wCghJtLAiF9QM6GBMQKsoQ1XV2P
-PhIAmgKrpENmiEXGIXuV8haEesuprIiE
-=ajTP
+iEYEAREIAAYFAlAxjusACgkQVWmRsqeSphOEGgCaA+pqY3Gvbtg4F6SOIrdo5afK
+fBkAn0DPEadXryhSM7V9i6vJpg6FfsAE
+=2Uw8
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/inn/files/innd b/net-nntp/inn/files/innd
index a3b1feea4063..37aafbcaa354 100644
--- a/net-nntp/inn/files/innd
+++ b/net-nntp/inn/files/innd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/files/innd,v 1.3 2012/02/08 06:41:07 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/files/innd,v 1.4 2012/08/20 01:12:06 jer Exp $
 
 depend() {
 	need net
@@ -9,6 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting innd"
+	checkpath -d -m 0755 -o news:news /var/run/news
 	start-stop-daemon --start --user news --exec /usr/lib/news/bin/rc.news
 	eend $?
 }
diff --git a/net-nntp/inn/inn-2.5.3.ebuild b/net-nntp/inn/inn-2.5.3.ebuild
new file mode 100644
index 000000000000..18029ce6c8ff
--- /dev/null
+++ b/net-nntp/inn/inn-2.5.3.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.3.ebuild,v 1.1 2012/08/20 01:12:05 jer Exp $
+
+EAPI=4
+inherit autotools 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 perl python sasl ssl"
+
+DEPEND="
+	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 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e "s: -B .OLD::" Makefile.global.in || die
+
+	# Do not treat LDFLAGS as if it contained libraries to link to
+	sed -i m4/python.m4 -e 's:LDFLAGS::g' || die
+
+	# 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
+
+	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
+
+	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/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
+
+	chown 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
+
+	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
+		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
+}