Version bump, package.mask'ed for testing, please report bugs to bug #29020.

4 files changed, 261 insertions, 4 deletions

diff --git a/net-news/inn/ChangeLog b/net-news/inn/ChangeLog
index cdcb62ef3607..41ca3d6a4114 100644
--- a/net-news/inn/ChangeLog
+++ b/net-news/inn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-news/inn
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/inn/ChangeLog,v 1.11 2004/06/25 00:25:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/inn/ChangeLog,v 1.12 2004/09/07 04:05:07 swegener Exp $
+
+*inn-2.4.1 (07 Sep 2004)
+
+  07 Sep 2004; Sven Wegener <swegener@gentoo.org> +inn-2.4.1.ebuild:
+  Version bump, package.mask'ed for testing, please report bugs to bug #29020.
 
   19 Jun 2004; Sven Wegener <swegener@gentoo.org> +metadata.xml:
   Added metadata.xml
diff --git a/net-news/inn/Manifest b/net-news/inn/Manifest
index 1a5358fbab28..9e9ffb6cfd6b 100644
--- a/net-news/inn/Manifest
+++ b/net-news/inn/Manifest
@@ -1,5 +1,17 @@
-MD5 fe74df3a50fb1a0654a67c7771752620 ChangeLog 1449
-MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7f0a5609c704120c46645852260306f2 ChangeLog 1624
 MD5 65664ec8b14d6dc3eeb7e5cc82df7c9c inn-2.3.5.ebuild 3253
-MD5 9e7c2242ff26084942ee02bb19eb3f95 files/innd 437
+MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161
+MD5 8b70a2b1eb912c7a7ce86efc6d0826c6 inn-2.4.1.ebuild 7313
 MD5 ce3c00651e354a874cc9c60ae4f0255e files/digest-inn-2.3.5 128
+MD5 9e7c2242ff26084942ee02bb19eb3f95 files/innd 437
+MD5 f31130931b3d55b9a8a2c89560c09199 files/digest-inn-2.4.1 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBPTN/I1lqEGTUzyQRAkA1AJ4qFaId0ULMC0+8OBMe+R/tbqam/gCfYkeM
+l9hy33B/6wHKJWctNH5Vx6k=
+=Od1U
+-----END PGP SIGNATURE-----
diff --git a/net-news/inn/files/digest-inn-2.4.1 b/net-news/inn/files/digest-inn-2.4.1
new file mode 100644
index 000000000000..a9d46309a05f
--- /dev/null
+++ b/net-news/inn/files/digest-inn-2.4.1
@@ -0,0 +1 @@
+MD5 bec635b6e70188071fdb539cd374f2ba inn-2.4.1.tar.gz 1849845
diff --git a/net-news/inn/inn-2.4.1.ebuild b/net-news/inn/inn-2.4.1.ebuild
new file mode 100644
index 000000000000..6553f8cc274c
--- /dev/null
+++ b/net-news/inn/inn-2.4.1.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/inn/inn-2.4.1.ebuild,v 1.1 2004/09/07 04:05:07 swegener Exp $
+
+inherit fixheadtails ssl-cert
+
+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"
+KEYWORDS="~x86"
+IUSE="ipv6 kerberos sasl ssl perl python tcltk"
+
+RDEPEND="virtual/mta
+	kerberos? ( virtual/krb5 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( dev-libs/openssl )
+	perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	tcltk? ( dev-lang/tcl )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.13
+	sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	ht_fix_file configure support/fixscript.in
+
+	sed -i \
+		-e "s/ -B .OLD//" \
+		Makefile.global.in \
+		control/Makefile \
+		doc/man/Makefile
+}
+
+src_compile() {
+	export WANT_AUTOCONF="2.1"
+
+	libtoolize --force || die "libtoolize failed"
+	aclocal || die "aclocal failed"
+
+	econf \
+		--prefix=/usr/lib/news \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--with-control-dir=/usr/lib/news/bin/control \
+		--with-etc-dir=/etc/news \
+		--with-filter-dir=/usr/lib/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 \
+		--with-gnu-ld \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with tcltk tcl) \
+		$(use_with kerberos kerberos /usr) \
+		$(use_with sasl) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		|| die "econf failed"
+	emake -j1 P="" || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} P="" install || die "make install failed"
+
+	chown -R root.root ${D}/usr/{lib/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
+	dodir /usr/share/doc/${PF}/dbexamples
+	for db_file in active active.times distributions history newsgroups
+	do
+		if [ -f ${D}/var/spool/news/db/${db_file} ]
+		then
+			mv ${D}/var/spool/news/db/${db_file} ${D}/usr/share/doc/${PF}/dbexamples
+		fi
+	done
+
+	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/lib/news/include
+	doins include/*.h
+
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/innd innd
+
+	insinto /usr/lib/news/lib
+	use ssl && docert cert
+}
+
+pkg_postinst() {
+	for db_file in active active.times distributions history newsgroups
+	do
+		if [ -f ${ROOT}/usr/share/doc/${PF}/dbexamples/${db_file} \
+			-a ! -f ${ROOT}/var/spool/news/db/${db_file} ]
+		then
+			cp -p ${ROOT}/usr/share/doc/${PF}/dbexamples/${db_file} \
+				${ROOT}/var/spool/news/db/${db_file}
+			chmod 664 ${ROOT}/var/spool/news/db/${db_file}
+		fi
+	done
+
+	chown -R news:news ${ROOT}/var/{log,spool}/news
+
+	einfo "Do not forget to update your cron entries, and also run"
+	einfo "makedbz if you need to.  If this is a first-time installation"
+	einfo "a minimal active file has been installed.  You will need to"
+	einfo "touch history and run 'makedbz -i' to initialize the history"
+	einfo "database.  See INSTALL for more information."
+	einfo
+	einfo "You need to assign a real shell to the news user, or else"
+	einfo "starting inn will fail. You can use 'usermod -s /bin/bash news'"
+	einfo "for this."
+
+	if use ssl
+	then
+		einfo
+		einfo "You may want to start nnrpd manually for native ssl support."
+		einfo "If you choose to do so, automating this with a bootscript might"
+		einfo "also be a good choice."
+		einfo "Have a look at man nnrpd for valid parameters."
+	fi
+}
+
+pkg_postrm() {
+	einfo
+	einfo "If you want your newsspool or altered configuration files"
+	einfo "to be removed, please do so now manually."
+	einfo
+}
+
+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" -o "${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" -a "${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" \
+			-a ! -f "${NEWSSPOOL_DIR}/db/history.hash" \
+			-a ! -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/lib/news/bin/makedbz -i"
+			mv "${NEWSSPOOL_DIR}/db/history.n.dir" "${NEWSSPOOL_DIR}/db/history.dir"
+			mv "${NEWSSPOOL_DIR}/db/history.n.hash" "${NEWSSPOOL_DIR}/db/history.hash"
+			mv "${NEWSSPOOL_DIR}/db/history.n.index" "${NEWSSPOOL_DIR}/db/history.index"
+			su - news -c "/usr/lib/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/lib/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/lib/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
+}