From 0cfc8b88263d9f8758fd0e28248ae16058e12a5e Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Mon, 26 Feb 2007 22:03:41 +0000 Subject: [PATCH] Version bump, bug #135088. Fix certificate location in configuration files, bug #123316. Fix autotools handling, bug #159065. Fix obsolete head/tail invocations, bug #158293. Package-Manager: portage-2.1.2-r11 --- net-nntp/inn/ChangeLog | 9 +- net-nntp/inn/Manifest | 34 ++-- net-nntp/inn/files/digest-inn-2.4.3 | 3 + net-nntp/inn/files/innd | 6 +- net-nntp/inn/inn-2.4.3.ebuild | 249 ++++++++++++++++++++++++++++ 5 files changed, 279 insertions(+), 22 deletions(-) create mode 100644 net-nntp/inn/files/digest-inn-2.4.3 create mode 100644 net-nntp/inn/inn-2.4.3.ebuild diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog index d2ac19e2d2f1..bf229c85e06f 100644 --- a/net-nntp/inn/ChangeLog +++ b/net-nntp/inn/ChangeLog @@ -1,6 +1,13 @@ # 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.7 2007/02/09 08:15:19 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.8 2007/02/26 22:03:41 swegener Exp $ + +*inn-2.4.3 (11 Feb 2007) + + 11 Feb 2007; Sven Wegener +inn-2.4.3.ebuild: + Version bump, bug #135088. Fix certificate location in configuration files, + bug #123316. Fix autotools handling, bug #159065. Fix obsolete head/tail + invocations, bug #158293. 09 Feb 2007; Diego Pettenò ChangeLog: Regenerate digest in Manifest2 format. diff --git a/net-nntp/inn/Manifest b/net-nntp/inn/Manifest index 153f23abf0c2..37ce352ecf75 100644 --- a/net-nntp/inn/Manifest +++ b/net-nntp/inn/Manifest @@ -1,24 +1,26 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 2.4.1-berkdb.patch 1393 RMD160 7a8a742865f1c2288f6639f529d44d82578c67d4 SHA1 47ccb08ddc42d1c1898f5ac9146cc2ce1f8b25b2 SHA256 8fc88519689f06d77180df69286c400b7e15003dc7e998774dee1cf56887f465 MD5 69e1740d0d4d85a272e0491fa1a7ddb7 files/2.4.1-berkdb.patch 1393 RMD160 7a8a742865f1c2288f6639f529d44d82578c67d4 files/2.4.1-berkdb.patch 1393 SHA256 8fc88519689f06d77180df69286c400b7e15003dc7e998774dee1cf56887f465 files/2.4.1-berkdb.patch 1393 -AUX innd 436 RMD160 bb9885dceff84ff8b8da045152ebc86581936cc7 SHA1 dcf2fc93f3cecbd5f6ca963cc45b9349ac71b296 SHA256 4ba57bd48a3b17ddec5f8184fcd38366df17fcac26ec04cec8c3cf82ea233662 -MD5 74f511fa4f1e36fbfa0e0ad6e68c0084 files/innd 436 -RMD160 bb9885dceff84ff8b8da045152ebc86581936cc7 files/innd 436 -SHA256 4ba57bd48a3b17ddec5f8184fcd38366df17fcac26ec04cec8c3cf82ea233662 files/innd 436 +AUX innd 503 RMD160 5631966614d5bb4e1c304195e1e796a1fbc9421e SHA1 85aa86e4fcca7837e32e2e3be31fbd50e96b79c2 SHA256 ab2082ee261d632dafeaaf9ebb459e5afe684597c67b860ca0a7a8ff3bf554ed +MD5 c5a9ae6ae97f7cdd4254bf5413fc9e47 files/innd 503 +RMD160 5631966614d5bb4e1c304195e1e796a1fbc9421e files/innd 503 +SHA256 ab2082ee261d632dafeaaf9ebb459e5afe684597c67b860ca0a7a8ff3bf554ed files/innd 503 DIST inn-2.4.1.tar.gz 1849845 RMD160 ce3271fec204a68e7eb0648d1afa176ba1d3e601 SHA1 f36267eca56a643a37ed6c2903cd6fbb71e407f5 SHA256 11effaebfe81f2755151a6e5acb0d1d747e7699d2e8e121e6ae04105f46954d7 +DIST inn-2.4.3.tar.gz 1871994 RMD160 f9465f3fe905d1173fb30c00d591ab8f9cbaecfc SHA1 95c30835b0990a3c432858948266dd4db639a3e1 SHA256 b69679ed4b79ed8384db50e43a09a7d52e4da51712235b912bcfae037e137bf2 DIST inn_db4.tar.gz 644 RMD160 dca25ab3cc0a53c5ad418edea560ac8b01d89839 SHA1 246cf5285dfa703fa76b92aacab4434ad9ef517e SHA256 a58cbc7c5ca33f46150567ec7bb83ec5924d3434a581205128b193e20b48d1a1 EBUILD inn-2.4.1.ebuild 8144 RMD160 12fbfbe5a8452ecbef20e38b7c74499f31cdcd6e SHA1 35653789be2d21e4b89411769ab58f66de9a5614 SHA256 710d2f86ff89ff868c45040044e990b189d3ea85b49ea91ef841ac7f5f86c374 MD5 5dff21aa3eda5b928163bca6b7bde5b0 inn-2.4.1.ebuild 8144 RMD160 12fbfbe5a8452ecbef20e38b7c74499f31cdcd6e inn-2.4.1.ebuild 8144 SHA256 710d2f86ff89ff868c45040044e990b189d3ea85b49ea91ef841ac7f5f86c374 inn-2.4.1.ebuild 8144 -MISC ChangeLog 3497 RMD160 7462b92ca37eb1e2f337e925eeed4252fa66dc2c SHA1 07a9fe75223abb7002b2e3c26d726185bcc4e9dc SHA256 6746497774b28860f2373746571128880d2a5a1922ff9b14a7939ef09b0d12f2 -MD5 d36a40cb66213dbc61f2771297c44419 ChangeLog 3497 -RMD160 7462b92ca37eb1e2f337e925eeed4252fa66dc2c ChangeLog 3497 -SHA256 6746497774b28860f2373746571128880d2a5a1922ff9b14a7939ef09b0d12f2 ChangeLog 3497 +EBUILD inn-2.4.3.ebuild 7770 RMD160 b7c21304d71433c2d053b24cdda8b1f9dca672b0 SHA1 f9838485a6b9299e256dbe83911ee2c9fdff6f81 SHA256 ce092d09ba1426a2df86ca02ff56c97d3b24d6dd523b4bec1f247b43b9960293 +MD5 9f6974d06d46400ab446c1668eef3f4b inn-2.4.3.ebuild 7770 +RMD160 b7c21304d71433c2d053b24cdda8b1f9dca672b0 inn-2.4.3.ebuild 7770 +SHA256 ce092d09ba1426a2df86ca02ff56c97d3b24d6dd523b4bec1f247b43b9960293 inn-2.4.3.ebuild 7770 +MISC ChangeLog 3773 RMD160 d206fceb8a390a55cfe1fe4b66b256f61d6e3037 SHA1 8b0ee1b30653f5ad1c30f653bfffde28ca09dc4c SHA256 bffd6dc3e15ffb94b78278dcd659a3b8daf8ae22ecb87075095880f90656fb14 +MD5 48176b3fe85775b037de719c57597ac7 ChangeLog 3773 +RMD160 d206fceb8a390a55cfe1fe4b66b256f61d6e3037 ChangeLog 3773 +SHA256 bffd6dc3e15ffb94b78278dcd659a3b8daf8ae22ecb87075095880f90656fb14 ChangeLog 3773 MISC metadata.xml 161 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 SHA1 5d3eb0725c80eb73d935d7dfbd653a7c1a2103e7 SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153 MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 metadata.xml 161 @@ -26,10 +28,6 @@ SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153 metadata MD5 0d0ed8ef41b656283b92f0cfd5205ec1 files/digest-inn-2.4.1 446 RMD160 f1a316cf1cba2246e4207523b54c08291aa3f395 files/digest-inn-2.4.1 446 SHA256 8d5c004b74cd268d44fabcf65b1cbc2bbeb257e1a6d3da184941941fc29efe51 files/digest-inn-2.4.1 446 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFFzC2eAiZjviIA2XgRAjNdAKCM0w3o2yzYDFBV2xuR6FMK7FMC8wCgutzS -DPFX7kQsPkINmHl39OCGGYw= -=DlvV ------END PGP SIGNATURE----- +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 diff --git a/net-nntp/inn/files/digest-inn-2.4.3 b/net-nntp/inn/files/digest-inn-2.4.3 new file mode 100644 index 000000000000..89aca2dab904 --- /dev/null +++ b/net-nntp/inn/files/digest-inn-2.4.3 @@ -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/files/innd b/net-nntp/inn/files/innd index ea2a392cf85d..3bbe5b9fb391 100644 --- a/net-nntp/inn/files/innd +++ b/net-nntp/inn/files/innd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 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.1 2005/01/17 19:40:10 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/files/innd,v 1.2 2007/02/26 22:03:41 swegener Exp $ depend() { need net @@ -9,13 +9,13 @@ depend() { start() { ebegin "Starting innd" - su - news -c /usr/lib/news/bin/rc.news + start-stop-daemon --start --chuid news --exec /usr/lib/news/bin/rc.news eend $? } stop() { ebegin "Stopping innd" - su - news -c '/usr/lib/news/bin/rc.news stop' + start-stop-daemon --start --chuid news --exec /usr/lib/news/bin/rc.news -- stop sleep 2 eend $? } diff --git a/net-nntp/inn/inn-2.4.3.ebuild b/net-nntp/inn/inn-2.4.3.ebuild new file mode 100644 index 000000000000..27ec3cbb928b --- /dev/null +++ b/net-nntp/inn/inn-2.4.3.ebuild @@ -0,0 +1,249 @@ +# 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.ebuild,v 1.1 2007/02/26 22:03:41 swegener Exp $ + +WANT_AUTOCONF="2.1" + +inherit fixheadtails ssl-cert eutils 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 +} + +src_compile() { + append-ldflags $(bindnow-flags) + + 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 \ + --without-tcl \ + $(use_with perl) \ + $(use_with python) \ + $(use_with kerberos kerberos /usr) \ + $(use_with sasl) \ + $(use_with ssl openssl) \ + $(use_with berkdb berkeleydb) \ + $(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/{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 + 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/lib/news/include + doins include/*.h + + exeinto /etc/init.d + doexe "${FILESDIR}"/innd innd + + if use ssl + then + insinto /etc/news/cert + docert cert + + fowners news:news /etc/news/cert/cert.{crt,csr,key,pem} + fi +} + +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 + 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." + 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/lib/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/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 +} -- 2.26.2