Fix for 249486 - thanks to jer and Raphael Barrois

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 317 insertions, 1 deletions

diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog
index c6a259b13bbc..1d2a46ae2734 100644
--- a/net-nntp/inn/ChangeLog
+++ b/net-nntp/inn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nntp/inn
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.24 2009/07/25 15:16:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.25 2009/11/08 22:34:33 rich0 Exp $
+
+*inn-2.4.3-r2 (08 Nov 2009)
+
+  08 Nov 2009; Richard Freeman <rich0@gentoo.org> +inn-2.4.3-r2.ebuild,
+  +files/inn-2.4.3-configure.patch:
+  Fix for 249486 - thanks to jer and Raphael Barrois
 
 *inn-2.5.0 (25 Jul 2009)
 
diff --git a/net-nntp/inn/files/inn-2.4.3-configure.patch b/net-nntp/inn/files/inn-2.4.3-configure.patch
new file mode 100644
index 000000000000..6a9dee5ef3b3
--- /dev/null
+++ b/net-nntp/inn/files/inn-2.4.3-configure.patch
@@ -0,0 +1,50 @@
+diff -Nur inn-2.4.3.orig/configure.in inn-2.4.3/configure.in
+--- inn-2.4.3.orig/configure.in	2009-05-07 13:49:50.000000000 +0200
++++ inn-2.4.3/configure.in	2009-05-07 14:44:30.000000000 +0200
+@@ -804,19 +818,23 @@
+ 
+ dnl Check for Kerberos libraries for auth_krb5, and if found define KRB5_AUTH
+ dnl to the relevant object file, which will enable compilation of it.
+-INN_SEARCH_AUX_LIBS(krb5_parse_name, krb5, KRB5_LIB,
+-    [KRB5_AUTH="auth_krb5"
+-     KRB5_LIB="$KRB5_LDFLAGS $KRB5_LIB -lk5crypto -lcom_err"
+-     AC_SUBST(KRB5_AUTH)
+-     AC_SUBST(KRB5_INC)
+-     AC_CHECK_HEADERS([et/com_err.h])], , [$LIBS -lk5crypto -lcom_err])
++if test x"$KRB5_INC" != x ; then
++    INN_SEARCH_AUX_LIBS(krb5_parse_name, krb5, KRB5_LIB,
++        [KRB5_AUTH="auth_krb5"
++         KRB5_LIB="$KRB5_LDFLAGS $KRB5_LIB -lk5crypto -lcom_err"
++         AC_SUBST(KRB5_AUTH)
++         AC_SUBST(KRB5_INC)
++         AC_CHECK_HEADERS([et/com_err.h])], , [$LIBS -lk5crypto -lcom_err])
++fi
+ 
+ dnl Check for necessity of krb5_init_ets
+ dnl OSX does not require this function
+-inn_save_LIBS=$LIBS
+-LIBS=$KRB5_LIB
+-AC_CHECK_FUNCS(krb5_init_ets)
+-LIBS=$inn_save_LIBS
++if test x"$KRB5_INC" != x ; then
++    inn_save_LIBS=$LIBS
++    LIBS=$KRB5_LIB
++    AC_CHECK_FUNCS(krb5_init_ets)
++    LIBS=$inn_save_LIBS
++fi
+ 
+ dnl Libraries and flags for embedded Perl.  Some distributions of Linux have
+ dnl Perl linked with gdbm but don't normally have gdbm installed, so on that
+diff -Nur inn-2.4.3.orig/include/config.h.in inn-2.4.3/include/config.h.in
+--- inn-2.4.3.orig/include/config.h.in	2006-03-20 05:14:57.000000000 +0100
++++ inn-2.4.3/include/config.h.in	2008-06-29 19:56:57.000000000 +0200
+@@ -312,6 +312,9 @@
+ /* Define if you have the <dlfcn.h> header file.  */
+ #undef HAVE_DLFCN_H
+ 
++/* Define if you have the <et/com_err.h> header file.  */
++#undef HAVE_ET_COM_ERR_H
++
+ /* Define if you have the <gdbm-ndbm.h> header file.  */
+ #undef HAVE_GDBM_NDBM_H
+ 
diff --git a/net-nntp/inn/inn-2.4.3-r2.ebuild b/net-nntp/inn/inn-2.4.3-r2.ebuild
new file mode 100644
index 000000000000..62ce56d166f8
--- /dev/null
+++ b/net-nntp/inn/inn-2.4.3-r2.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.4.3-r2.ebuild,v 1.1 2009/11/08 22:34:33 rich0 Exp $
+
+WANT_AUTOCONF="2.1"
+
+inherit fixheadtails ssl-cert eutils multilib libtool autotools toolchain-funcs
+
+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 GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ipv6 kerberos sasl ssl perl python berkdb inntaggedhash innkeywords"
+
+RDEPEND="virtual/mta
+	kerberos? ( virtual/krb5 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( dev-libs/openssl )
+	perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	berkdb? ( sys-libs/db )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	ht_fix_file configure.in support/fixscript.in
+
+	sed -i \
+		-e "s/ -B .OLD//" \
+		Makefile.global.in \
+		control/Makefile \
+		doc/man/Makefile
+
+	sed -i \
+		-e "s:@prefix@/lib:/etc/news/cert:" \
+		samples/sasl.conf.in
+
+	# Fixes compatibility problems with sys-libs/db-4.4 and 4.5,
+	# bug 174680.
+	epatch "${FILESDIR}/${P}-berkdb45.patch"
+
+	# Fixes problems with the test suite.
+	epatch "${FILESDIR}/${P}-runtests.patch"
+
+	# Fixes problems with com_err and kerberos
+	epatch "${FILESDIR}/${P}-configure.patch"
+
+
+	elibtoolize
+}
+
+src_compile() {
+	tc-export CC
+	econf \
+		--prefix=/usr/$(get_libdir)/news \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--with-control-dir=/usr/$(get_libdir)/news/bin/control \
+		--with-etc-dir=/etc/news \
+		--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-path=/var/spool/news/tmp \
+		--enable-libtool \
+		--enable-setgid-inews \
+		--enable-uucp-rnews \
+		--without-tcl \
+		$(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"
+	emake -j1 P="" || die "emake failed"
+}
+
+src_install() {
+	make 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 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
+}