diff options
author | Michael Palimaka <kensington@gentoo.org> | 2013-06-03 11:12:17 +0000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2013-06-03 11:12:17 +0000 |
commit | f1e98d99dab846e1a5460b972a31c52c7ed49f45 (patch) | |
tree | 288e0d939b8bc0e4a7f7b9e6bf7f57e05120bbdb /net-nntp | |
parent | bump (diff) | |
download | historical-f1e98d99dab846e1a5460b972a31c52c7ed49f45.tar.gz historical-f1e98d99dab846e1a5460b972a31c52c7ed49f45.tar.bz2 historical-f1e98d99dab846e1a5460b972a31c52c7ed49f45.zip |
Add missing PYTHON_REQUIRED_USE. Add elog to recommend using emerge --config. Respect AR wrt bug #461254. Use correct run dir and fix init script to avoid reporting its status as 'crashed', wrt bug #468010.
Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C
Diffstat (limited to 'net-nntp')
-rw-r--r-- | net-nntp/inn/ChangeLog | 10 | ||||
-rw-r--r-- | net-nntp/inn/Manifest | 21 | ||||
-rw-r--r-- | net-nntp/inn/files/inn-2.5.3-ar.patch | 37 | ||||
-rw-r--r-- | net-nntp/inn/files/innd-r1 | 23 | ||||
-rw-r--r-- | net-nntp/inn/inn-2.5.3-r2.ebuild | 287 |
5 files changed, 368 insertions, 10 deletions
diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog index 21bf5bb34caa..11c6e8ae2258 100644 --- a/net-nntp/inn/ChangeLog +++ b/net-nntp/inn/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-nntp/inn # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.53 2013/03/14 06:36:08 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.54 2013/06/03 11:11:56 kensington Exp $ + +*inn-2.5.3-r2 (03 Jun 2013) + + 03 Jun 2013; Michael Palimaka <kensington@gentoo.org> + +files/inn-2.5.3-ar.patch, +files/innd-r1, +inn-2.5.3-r2.ebuild: + Add missing PYTHON_REQUIRED_USE. Add elog to recommend using emerge --config. + Respect AR wrt bug #461254. Use correct run dir and fix init script to avoid + reporting its status as 'crashed', wrt bug #468010. 14 Mar 2013; Michael Palimaka <kensington@gentoo.org> -inn-2.5.3.ebuild: Remove old. diff --git a/net-nntp/inn/Manifest b/net-nntp/inn/Manifest index 17f9c223b11a..6eb3b7a4e476 100644 --- a/net-nntp/inn/Manifest +++ b/net-nntp/inn/Manifest @@ -1,20 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX inn-2.5.3-ar.patch 788 SHA256 e9ab8a6fbf19f5685a69ad7c3d9a1f06c45ba6e45bfa800c6bdeaef250ab4de8 SHA512 ebe00878b159f6af9e3a378acf369bf5b2d06fcde1f4b3f7c721f8947a555d6a8f6a871e995d32cd0c83df151e338168c7dfbeaf0270b5dd8d98c5a9d2969ed3 WHIRLPOOL 6547beab0bd53ab1f410be4c435429e66150d9212c44fcef755282278b5704a07e81c37dd5104985ea704e1ad8bbc47f9a82e2b673559058bede2e6abc5a170b AUX inn-2.5.3-tests.patch 654 SHA256 a8c46c81d287d350605c455a923990a709f01876ca76e1ef4c9642f966005645 SHA512 31a998b61c80583cd63cc3310fdf86605e5e0ce604056896d96aa255caba9ff1e3fa045b70f73e1157587fa6f3dae66789b7f6877204d6b6d4a096935ac80892 WHIRLPOOL df912dc92f26eff369341b6140fa73f5532196abfebaa16661d1bc9c140c90bfcf9273b1da6951181140210b500e1fb6be6f5db9d3199881abd86efdd8763314 AUX innd 545 SHA256 735789cfad7314f03146bf41b162b51b1f8d8f561b495e11c00b6143512ad54d SHA512 52ebad0dcf240ac504d13437d86a1e5b5fa7e78198041e01c328278deb5993c1dec070838df71f6ef3b56520f8f7ca0b92c1ab3949457e4078e7b7afd9e58883 WHIRLPOOL 4f5263cd0eb357f0c1d8902f836b7a354a103fa55db753183f3ff98cac0d9fc3a1e134ab53ffb691c7409a5d692ef163061269d73020eea9de78b2ae25c2e4e5 +AUX innd-r1 602 SHA256 5e6336f32ef1829f602c24d6df97d4690385ed3a86940033d45e41c23b825603 SHA512 ced2de8ca65812f5748f4d3530f389da8baaa0e9228be6756fa4c701d21141a816740767559bde231c9d563e32995b0e50e5a8af449b60e653a854916c114fed WHIRLPOOL 84358f9329a2b930562ba8be5ec7606d37fd25ba3bbfd573f8bc1b25c87550c7dfeb25f546cecf34a1687c90adbf3e3a262c124052277864761d682544c65f94 DIST inn-2.5.3.tar.gz 2412119 SHA256 60f0042b144499680cc577a4330aeaac5dac20c5994649c0e945d32b5f8dbcf1 SHA512 e579944571f0ec4fcdbf86de8458342075ce08f60df046bc8c45969b39f396ede8f5034f734542e1c64fb7792ae01c117c6a7af170fe5a43e1d0b2693f34d392 WHIRLPOOL a6d08020bfc458ad52567d225f14ef2f92fd605767c7ae4292724e3a3f49e1b42630fd787e7f79aae8a16d236479cef13b9531862eae050db839d3d0530f7999 EBUILD inn-2.5.3-r1.ebuild 8440 SHA256 f06eb7a76bab2b02becc6d063112f8fa96b0e5a186db8b3088111cbc6be7a2ca SHA512 c08861c4cb3a8bd8b90ffd9a69124c70760012dcee460c5572623b29911584b061dbbb2dfefc8c6b6b6424d82ee9baa32771616ce04a59a505ab616a3b7c44aa WHIRLPOOL 362947514ff830cb1f4879e5b6ddb97fd56ba8c6586fbaa57e4e18a696d9effa7bb393d4740fc71ee8985a87ffde0f360e407707ae6af4afab9ed9ac70986f3a -MISC ChangeLog 10098 SHA256 e936f7b63801d0c86cbb7006b57e22370c44c6c41dd54765c8ad946fa46730a8 SHA512 66f70b886107407688abd5f9e2038f8282b0bb01dd7bd7b37d50ea21b5b2c9ba98a6692a44556c15aedfee5d31a2111d4903d114401b47e869751e90c686f8e9 WHIRLPOOL 9df1bd7daf0f2c8167bab15819018e40be8f7d93c3af16d0dc7b86f099df6b8a6e692cfaefea7d942b33ca8744e27a2be6beb36c625bf8be9ade3446c89bdf6b +EBUILD inn-2.5.3-r2.ebuild 8693 SHA256 cadfbaef2dd60ed0b18f026b0b3344f48696b7df0d25f8326b2a1350b714ca6d SHA512 0bfdb0986321ca06a2a62df94c84770c3dc4bab1f13293a0168575ef35094428eb608e183caf53d12da117c9dd8d0254e4cc87f957ac817efaba23ad468999a6 WHIRLPOOL 74393ac056ec4f23128669c8d581b80edc55b54ae1d3657bd4cb554f43a05059d45a3f87fe0699eb0a80f7bd25a1694a0c5cbcbe9b7a2ff55dec2b6ae90ecaf2 +MISC ChangeLog 10464 SHA256 dff4b76edeb0e985b65b38ca104d9eb481af8918a64415c9601d1133d8de5c14 SHA512 1b811331fe19c1e4d17624f93969acdf8b2df8afc97a07db15309213391fd77a85312027dfd988589123a996b186ecf81eac2a98aa569d2c8df3e25ae7a78422 WHIRLPOOL f8a2c7d8eca1009e460c7112214b83575238d903d96565326e03a9e049548400a4f39fb409d014047de229f2122f8919fe422a6b5fa21ed9342498f9c8c87ff1 MISC metadata.xml 352 SHA256 c58a5ed6da2054c42c3e7a6328456cedbdc45664210a95223fdd18a0fec340ce SHA512 64be44f3e7f7de8081c6e64ec2268383471b9917d9887d38c460b50ff7cb1bce80387f417be62c8f7bf84dc6e82be20c3a2c0d47b63bebb81c01a14fb67c0a07 WHIRLPOOL 54197b7f8d93cf6a1f7e45d5287324a88b84c8d960f9a598c608ab8446a5996a5c43dc1cd2fda03a77265c13b16e45470e1421738e717c3bb2429b733e6f5dc8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJRQW/CAAoJEMbwO6tnXQ0s9FYH/2Ij1p3H0QQGSsNAnzS9Z0w/ -OE9HMClD9+uXyjP2mwmqWqfX4k/K3TtPx8girHWY5kQW6MSVrttePN0QQgNAWEUg -MCJnPzSWIN+8qYMTAjcwJf27eaBxI1aey1dicXXbNrmX9X4yltyGdQ04pTk/hYCE -YaOjDrbHeQvjYvIwFv1ssvA/Spi/aIQDTCwatjGlQlvLahWQ2iBJFZ/O4K620npD -WA+psK4rBcr9J+XLEQwlfLD2sFo1ycv10x7Bvk/Dwr/fq3QT827zqpx9PyfILX7I -N8ZKJDqVCiirqrhS5PtnptoQbUkVSqdXRQ8MKEnHa8Zb9KVNNdai7gdqz0nrHpc= -=67Pk +iQEcBAEBCAAGBQJRrHmtAAoJEMbwO6tnXQ0sqg4H/3iy2ejrPOzMG08h22FrXJJ4 +2Fx+Ywg+M8w/QWJscWegskm6jTZVzL/HgU0rw7Cfwqol+Qb0BFyI5Q3EU6n3JMDQ +Ip1J5RmEDyr41gYNZs8kZxWjaGC5R8tAkJkl5LheKpvfBPAQkLJxJn72/7TICuIn +JF/Pa5GoqYuD39LRJ0XumHqXrCFosgRZ8JaCW7AeUKBFhkyMwRkZYSj/WUeZXmWC +u4uKTyyJFTRDCQrEMdYIo1LC2nOHXvH6h8UJtBkmD3QcJ3JdPuV2j9ncPlqEETUM +7W2uP+I1kRAxigfT5FWM84RNgk81qV2qDTibz3VQfuRfjwUQpGnIme1HMX5CsAQ= +=I/Yt -----END PGP SIGNATURE----- diff --git a/net-nntp/inn/files/inn-2.5.3-ar.patch b/net-nntp/inn/files/inn-2.5.3-ar.patch new file mode 100644 index 000000000000..ac4f8158c44f --- /dev/null +++ b/net-nntp/inn/files/inn-2.5.3-ar.patch @@ -0,0 +1,37 @@ +Use system AR. + +Gentoo bug #461254. + +--- lib/Makefile ++++ lib/Makefile +@@ -53,7 +53,7 @@ + -rpath $(PATHLIB) -version-info 2:0:0 + + libinn.a: $(OBJECTS) +- ar r $@ $(OBJECTS) ++ $(AR) r $@ $(OBJECTS) + $(RANLIB) libinn.a + + .c.o .c.lo: +--- storage/Makefile ++++ storage/Makefile +@@ -55,7 +55,7 @@ + -rpath $(PATHLIB) -version-info 2:0:0 + + libstorage.a: $(OBJECTS) +- ar r $@ $(OBJECTS) ++ $(AR) r $@ $(OBJECTS) + $(RANLIB) libstorage.a + + # Make.methods is included in the distribution tarball since some non-GNU +--- history/Makefile ++++ history/Makefile +@@ -51,7 +51,7 @@ + -rpath $(PATHLIB) -version-info 2:0:0 + + libinnhist.a: $(OBJECTS) +- ar r $@ $(OBJECTS) ++ $(AR) r $@ $(OBJECTS) + $(RANLIB) libinnhist.a + + # Try to set up these rules so that buildconfig is only run once. diff --git a/net-nntp/inn/files/innd-r1 b/net-nntp/inn/files/innd-r1 new file mode 100644 index 000000000000..a14b1f325c23 --- /dev/null +++ b/net-nntp/inn/files/innd-r1 @@ -0,0 +1,23 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/files/innd-r1,v 1.1 2013/06/03 11:11:56 kensington Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting ${SVCNAME}" + checkpath -d -m 0755 -o news:news /run/news + start-stop-daemon --start --user news --pidfile /run/news/${SVCNAME}.pid \ + --exec /usr/lib/news/bin/rc.news + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --start --user news --exec /usr/lib/news/bin/rc.news -- stop + sleep 2 + eend $? +} diff --git a/net-nntp/inn/inn-2.5.3-r2.ebuild b/net-nntp/inn/inn-2.5.3-r2.ebuild new file mode 100644 index 000000000000..00b51ed50ff1 --- /dev/null +++ b/net-nntp/inn/inn-2.5.3-r2.ebuild @@ -0,0 +1,287 @@ +# Copyright 1999-2013 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-r2.ebuild,v 1.1 2013/06/03 11:11:56 kensington Exp $ + +EAPI=5 +PYTHON_COMPAT=( python2_{5,6,7} ) + +inherit autotools eutils multilib python-single-r1 ssl-cert toolchain-funcs + +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" + +# GPL-2 only for init script +LICENSE="ISC GPL-2+ public-domain BSD-4 BSD-2 RSA BSD MIT GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="berkdb innkeywords inntaggedhash ipv6 kerberos perl python sasl ssl" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + virtual/mta + dev-perl/MIME-tools + sys-libs/pam + sys-libs/zlib + kerberos? ( virtual/krb5 ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + ssl? ( dev-libs/openssl ) + python? ( ${PYTHON_DEPS} ) + berkdb? ( sys-libs/db ) +" +RDEPEND="${DEPEND}" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-ar.patch + epatch "${FILESDIR}"/${P}-tests.patch + + sed -e 's: -B .OLD::' -i Makefile.global.in || die + + # Do not treat LDFLAGS as if it contained libraries to link to + sed -e 's:LDFLAGS::g' -i m4/python.m4 || die + + # We do not have the biff service, but we do have comsat + sed -e 's:"biff":"comsat":g' -i tests/lib/getnameinfo-t.c || die + + eautoreconf +} + +src_configure() { + tc-export AR + + 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=/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) +} + +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/innfeed.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 + + fowners 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 + + newinitd "${FILESDIR}"/innd-r1 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 "It is recommended to run emerge --config ${CATEGORY}/${PN}" + elog "now to finish setting up this package." + elog + 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 +} |