summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2007-12-30 20:29:58 +0000
committerUlrich Müller <ulm@gentoo.org>2007-12-30 20:29:58 +0000
commit913c2af4c593cbb24910530d538339535d9709d4 (patch)
tree8634da15247022377aa7898f6d717369c190df34 /net-nntp/inn
parentVersion bump to dev-haskell/haxml (diff)
downloadhistorical-913c2af4c593cbb24910530d538339535d9709d4.tar.gz
historical-913c2af4c593cbb24910530d538339535d9709d4.tar.bz2
historical-913c2af4c593cbb24910530d538339535d9709d4.zip
Replace call to docert by install_cert, bug #201687.
Package-Manager: portage-2.1.4_rc11
Diffstat (limited to 'net-nntp/inn')
-rw-r--r--net-nntp/inn/ChangeLog7
-rw-r--r--net-nntp/inn/Manifest23
-rw-r--r--net-nntp/inn/files/digest-inn-2.4.3-r13
-rw-r--r--net-nntp/inn/inn-2.4.3-r1.ebuild258
4 files changed, 282 insertions, 9 deletions
diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog
index 5e9afb6d9f24..d99f81dc2a5c 100644
--- a/net-nntp/inn/ChangeLog
+++ b/net-nntp/inn/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-nntp/inn
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.16 2007/06/24 22:27:17 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.17 2007/12/30 20:29:57 ulm Exp $
+
+*inn-2.4.3-r1 (30 Dec 2007)
+
+ 30 Dec 2007; Ulrich Mueller <ulm@gentoo.org> +inn-2.4.3-r1.ebuild:
+ Replace call to docert by install_cert, bug #201687.
24 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org> inn-2.4.3.ebuild:
Filtering -Wl,--as-needed from LDFLAGS because it breaks the compilation.
diff --git a/net-nntp/inn/Manifest b/net-nntp/inn/Manifest
index 9d47722a7e77..104b0dd9bb46 100644
--- a/net-nntp/inn/Manifest
+++ b/net-nntp/inn/Manifest
@@ -24,14 +24,18 @@ EBUILD inn-2.4.1.ebuild 8124 RMD160 1173e6df1d28e259e494ac057fd35b2198cc245e SHA
MD5 bc224d05b4de435e30682d3057ddcde2 inn-2.4.1.ebuild 8124
RMD160 1173e6df1d28e259e494ac057fd35b2198cc245e inn-2.4.1.ebuild 8124
SHA256 cd20e1aed285e200d981c2f7b7a470812f7dbf52cc2a18585b396761489cc3bc inn-2.4.1.ebuild 8124
+EBUILD inn-2.4.3-r1.ebuild 8192 RMD160 a4e1505231961d9dfaba5b69e61df05b09290c0f SHA1 4baa5de8a461a2f1c7a30639fe7f58cd9d07c446 SHA256 25b2400810ce2151477e19dddccd9dd9af9e02e681e934f03cf06e8caf07e9ca
+MD5 b0b9205bef6b57480b4eb08bb575df0b inn-2.4.3-r1.ebuild 8192
+RMD160 a4e1505231961d9dfaba5b69e61df05b09290c0f inn-2.4.3-r1.ebuild 8192
+SHA256 25b2400810ce2151477e19dddccd9dd9af9e02e681e934f03cf06e8caf07e9ca inn-2.4.3-r1.ebuild 8192
EBUILD inn-2.4.3.ebuild 8210 RMD160 058f88e90a5d664723244b03e5fd981cb8008ed1 SHA1 16c5af08756cce3b15afa78fdef0d3095fb25515 SHA256 01d6af056258acb238b6c8b44a2eacf841a86a5d21750a1cecfe8af073b3e3f7
MD5 589b2b697d7f59568359753eab72595b inn-2.4.3.ebuild 8210
RMD160 058f88e90a5d664723244b03e5fd981cb8008ed1 inn-2.4.3.ebuild 8210
SHA256 01d6af056258acb238b6c8b44a2eacf841a86a5d21750a1cecfe8af073b3e3f7 inn-2.4.3.ebuild 8210
-MISC ChangeLog 4884 RMD160 d4a301743200f89c5f7c07b683a9ecfddfb95fdf SHA1 e1963432bfeb39e1acfd03659db7ad9f926128c0 SHA256 2a3eb13c6f5c70fb4cd2cb557c956288597b38ca66b1aa9ba3f87b4f0fd04c41
-MD5 add663457a1a789fe725ca8b8d41d262 ChangeLog 4884
-RMD160 d4a301743200f89c5f7c07b683a9ecfddfb95fdf ChangeLog 4884
-SHA256 2a3eb13c6f5c70fb4cd2cb557c956288597b38ca66b1aa9ba3f87b4f0fd04c41 ChangeLog 4884
+MISC ChangeLog 5031 RMD160 f17a71ee037cef7f2ab31e7a322cd3fd7a4addbb SHA1 37d6cd51ae0d82d3f79616f5dbfe1b125e91ea6f SHA256 4d81a1d0492a191e1fd6d120ec9ceec6f70c161fb35f3e3082fc1b2bbe7d9c33
+MD5 4b1352c74672351f9f933425ad5e6782 ChangeLog 5031
+RMD160 f17a71ee037cef7f2ab31e7a322cd3fd7a4addbb ChangeLog 5031
+SHA256 4d81a1d0492a191e1fd6d120ec9ceec6f70c161fb35f3e3082fc1b2bbe7d9c33 ChangeLog 5031
MISC metadata.xml 161 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 SHA1 5d3eb0725c80eb73d935d7dfbd653a7c1a2103e7 SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153
MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161
RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 metadata.xml 161
@@ -42,10 +46,13 @@ SHA256 8d5c004b74cd268d44fabcf65b1cbc2bbeb257e1a6d3da184941941fc29efe51 files/di
MD5 b2f700070372823c26def2b4b0260144 files/digest-inn-2.4.3 232
RMD160 db230f307dac68998c3c462497ece2808908d8ba files/digest-inn-2.4.3 232
SHA256 e984c0ba5b35e379d2c71f485b898a347dc7225df9b10da1fbaa735e226c5841 files/digest-inn-2.4.3 232
+MD5 b2f700070372823c26def2b4b0260144 files/digest-inn-2.4.3-r1 232
+RMD160 db230f307dac68998c3c462497ece2808908d8ba files/digest-inn-2.4.3-r1 232
+SHA256 e984c0ba5b35e379d2c71f485b898a347dc7225df9b10da1fbaa735e226c5841 files/digest-inn-2.4.3-r1 232
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v1.4.8 (GNU/Linux)
-iD8DBQFGfu/OCkvF58q80IkRAsIdAJkBawEYV8+v3e3PhlaaEzr7Wnsw+ACffXbz
-YNQj77MbGzYaOxtX74v+SI8=
-=g9/0
+iEYEARECAAYFAkd3/94ACgkQOeoy/oIi7uy+jACbBMAKs+tNpkA0Z5vnC9J2rlhz
+2YwAoMZjjPdKVIlQrlVTQyAjcPSQ7WHS
+=vek2
-----END PGP SIGNATURE-----
diff --git a/net-nntp/inn/files/digest-inn-2.4.3-r1 b/net-nntp/inn/files/digest-inn-2.4.3-r1
new file mode 100644
index 000000000000..89aca2dab904
--- /dev/null
+++ b/net-nntp/inn/files/digest-inn-2.4.3-r1
@@ -0,0 +1,3 @@
+MD5 6caa10909a7bf55fb91535685990aec9 inn-2.4.3.tar.gz 1871994
+RMD160 f9465f3fe905d1173fb30c00d591ab8f9cbaecfc inn-2.4.3.tar.gz 1871994
+SHA256 b69679ed4b79ed8384db50e43a09a7d52e4da51712235b912bcfae037e137bf2 inn-2.4.3.tar.gz 1871994
diff --git a/net-nntp/inn/inn-2.4.3-r1.ebuild b/net-nntp/inn/inn-2.4.3-r1.ebuild
new file mode 100644
index 000000000000..0236540ec84b
--- /dev/null
+++ b/net-nntp/inn/inn-2.4.3-r1.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/12/30 20:29:57 ulm Exp $
+
+WANT_AUTOCONF="2.1"
+
+inherit fixheadtails ssl-cert eutils multilib libtool flag-o-matic autotools
+
+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"
+}
+
+src_compile() {
+ elibtoolize
+
+ filter-ldflags -Wl,--as-needed
+ append-ldflags $(bindnow-flags)
+
+ 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
+}