From a8cdae633a0986dcaafdfdaeab9fad5113b2c2bc Mon Sep 17 00:00:00 2001 From: sturm Date: Thu, 7 Oct 2004 05:15:25 +0000 Subject: [PATCH] update to leafnode 1.10.6 from maintainer rohee@ --- news/leafnode/Makefile | 6 +- news/leafnode/distinfo | 6 +- news/leafnode/patches/patch-Makefile_in | 8 +- news/leafnode/patches/patch-configure | 8 +- news/leafnode/pkg/DEINSTALL | 49 ------------ news/leafnode/pkg/INSTALL | 102 +++--------------------- news/leafnode/pkg/PLIST | 11 ++- 7 files changed, 31 insertions(+), 159 deletions(-) delete mode 100644 news/leafnode/pkg/DEINSTALL diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile index 26567a674e4..47fce7a1dbd 100644 --- a/news/leafnode/Makefile +++ b/news/leafnode/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.36 2004/08/02 19:00:30 sturm Exp $ +# $OpenBSD: Makefile,v 1.37 2004/10/07 05:15:25 sturm Exp $ COMMENT= "USENET software package designed for small sites" -VERSION= 1.10.3 +VERSION= 1.10.6 DISTNAME= leafnode-${VERSION}.rel PKGNAME= leafnode-${VERSION} CATEGORIES= news @@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --with-lockfile=/var/spool/news/fetchnews.lck CONFIGURE_ARGS+= --with-ipv6 CONFIGURE_ARGS+= --with-user=_news -DOCS= README README-FQDN INSTALL FAQ.txt +DOCS= README README-FQDN INSTALL FAQ.txt NEWS OLDNEWS post-install: $(INSTALL_DATA_DIR) ${PREFIX}/share/doc/leafnode diff --git a/news/leafnode/distinfo b/news/leafnode/distinfo index 5033cd1eb3d..d3a181e8437 100644 --- a/news/leafnode/distinfo +++ b/news/leafnode/distinfo @@ -1,3 +1,3 @@ -MD5 (leafnode-1.10.3.rel.tar.bz2) = 54b041f5b02aac46721dd6fffd4eda65 -RMD160 (leafnode-1.10.3.rel.tar.bz2) = d93868ba20137922962e5c557cd8a70debbf2972 -SHA1 (leafnode-1.10.3.rel.tar.bz2) = fce6cd2faf44d1ffaf2fa3ea92b8c086a65253de +MD5 (leafnode-1.10.6.rel.tar.bz2) = 5280f805fdc3db66e7b168944732f852 +RMD160 (leafnode-1.10.6.rel.tar.bz2) = a2e40558a9f4a451d4718b84aa6ab7236c399a32 +SHA1 (leafnode-1.10.6.rel.tar.bz2) = 3afa95ac151027d8e194b95339b111c9b7260890 diff --git a/news/leafnode/patches/patch-Makefile_in b/news/leafnode/patches/patch-Makefile_in index e77d0e7e50c..164316a08e5 100644 --- a/news/leafnode/patches/patch-Makefile_in +++ b/news/leafnode/patches/patch-Makefile_in @@ -1,8 +1,8 @@ -$OpenBSD: patch-Makefile_in,v 1.14 2004/06/14 05:06:20 sturm Exp $ +$OpenBSD: patch-Makefile_in,v 1.15 2004/10/07 05:15:25 sturm Exp $ ---- Makefile.in.orig 2004-06-11 00:05:35.000000000 +0200 -+++ Makefile.in 2004-06-13 18:40:54.000000000 +0200 -@@ -1361,14 +1361,7 @@ install-data-hook: amiroot +--- Makefile.in.orig Wed Sep 22 17:30:34 2004 ++++ Makefile.in Tue Oct 5 00:33:27 2004 +@@ -1329,14 +1329,7 @@ install-data-hook: amiroot set -e ; for i in . leaf.node failed.postings interesting.groups \ out.going message.id temp.files ; do \ mkdir -p $(DESTDIR)$(SPOOLDIR)/$$i ; \ diff --git a/news/leafnode/patches/patch-configure b/news/leafnode/patches/patch-configure index dc950151780..0a12a34ca7c 100644 --- a/news/leafnode/patches/patch-configure +++ b/news/leafnode/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.6 2004/06/14 05:06:20 sturm Exp $ ---- configure.orig 2004-06-11 00:05:36.000000000 +0200 -+++ configure 2004-06-13 19:25:31.000000000 +0200 -@@ -1824,7 +1824,7 @@ echo "$as_me: WARNING: *** use --sysconf +$OpenBSD: patch-configure,v 1.7 2004/10/07 05:15:25 sturm Exp $ +--- configure.orig Wed Sep 22 11:43:53 2004 ++++ configure Tue Oct 5 00:33:29 2004 +@@ -1836,7 +1836,7 @@ echo "$as_me: WARNING: *** use --sysconf echo "$as_me: WARNING: ***" >&2;} sleep 1 fi diff --git a/news/leafnode/pkg/DEINSTALL b/news/leafnode/pkg/DEINSTALL deleted file mode 100644 index 78c23f21f9b..00000000000 --- a/news/leafnode/pkg/DEINSTALL +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: DEINSTALL,v 1.9 2004/01/27 19:22:46 sturm Exp $ -# - -set -e -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -FILES=' -leafnode/config -' - -SPOOLDIR=/var/spool/news - -if [ "$PKG_DELETE_EXTRA" == Yes ] -then - /bin/rm -r $SPOOLDIR -fi - -echo -echo "+--------------- $1" -echo "| To fully remove $1 from your system" - -if [ "$PKG_DELETE_EXTRA" != Yes ] # else taken care of by pkg_delete -c -then -echo "| You should also remove the configuration files from the ${SYSCONFDIR}/leafnode" -echo "| directory as well as the news spool directory ${SPOOLDIR}." -echo "|" -fi - -echo "| You should also remove the '_news' user from the system by running:" -echo "|" -echo "| userdel _news" -echo "|" -echo "| If you are planning on installing $1 again in the future" -echo "| you can leave them as they are." -if [ "$PKG_DELETE_EXTRA" != Yes ] -then - echo "|" - echo "| FYI, the following configuration files belong to this package:" - echo "|" - for f in ${FILES}; do - echo "| ${SYSCONFDIR}/$f" - done -fi -echo "+--------------- $1" -echo - -exit 0 diff --git a/news/leafnode/pkg/INSTALL b/news/leafnode/pkg/INSTALL index 3c1be9f6d51..a8a88397979 100755 --- a/news/leafnode/pkg/INSTALL +++ b/news/leafnode/pkg/INSTALL @@ -1,16 +1,6 @@ #!/bin/sh # -# $OpenBSD: INSTALL,v 1.9 2004/06/24 03:16:55 brad Exp $ - -P_NAME=leafnode - -DIRS=' -leafnode -' - -FILES=' -leafnode/config -' +# $OpenBSD: INSTALL,v 1.10 2004/10/07 05:15:25 sturm Exp $ SPOOLDIR=/var/spool/news SPOOL_DIRS=' @@ -26,29 +16,17 @@ set -e PATH=/bin:/usr/bin:/sbin:/usr/sbin PREFIX=${PKG_PREFIX:-/usr/local} -do_create_user() -{ - if id -u _news >/dev/null 2>/dev/null - then - echo "User _news already exists... ok" - else - echo -n "Adding user _news..." - if [ -d /var/spool/news ] - then - echo " Giving /var/spool/news to _news" - else - echo " Creating /var/spool/news" - mkdir -p /var/spool/news - fi - chown 519:news /var/spool/news - - user add -d /var/spool/news -g news -c 'NNTP server' -s /sbin/nologin -u 519 _news - echo "ok" - fi -} - do_create_spool_dirs() { + if [ -d /var/spool/news ] + then + echo " Giving /var/spool/news to _news" + else + echo " Creating /var/spool/news" + mkdir -p /var/spool/news + fi + chown _news:news /var/spool/news + echo -n "Creating spool directories... " for d in ${SPOOL_DIRS}; do if [ ! -d "${SPOOLDIR}/$d" ]; then @@ -67,64 +45,6 @@ do_create_spool_dirs() echo "ok" } -do_post() -{ - DEST_PFX=${SYSCONFDIR} - SOURCE_PFX=${PREFIX}/share/examples - - echo - echo "+--------------- ${P_NAME}" - - # install dirs if necessary - for d in ${DIRS}; do - if [ ! -d "${DEST_PFX}/$d" ]; then - install -d ${DEST_PFX}/$d - fi - done - - # install or take note of existing config files - for f in ${FILES}; do - if [ -f "${DEST_PFX}/$f" ]; then - OLD_CONFS="${OLD_CONFS} $f" - else - if ! install -m 644 ${SOURCE_PFX}/$f.example ${DEST_PFX}/$f; then - echo "| ERROR: The following file could not be installed, exiting: ${DEST_PFX}/$f" - exit 1 - fi - NEW_CONFS="${NEW_CONFS} $f" - fi - done - - # print status report - if [ -n "${NEW_CONFS}" ]; then - echo "| The following NEW configuration files have been installed:" - echo "|" - for f in ${NEW_CONFS}; do - echo "| ${DEST_PFX}/$f" - done - fi - - if [ -n "${OLD_CONFS}" ]; then - if [ -n "${NEW_CONFS}" ]; then - echo "|" - fi - echo "| The following OLD configuration files were found and have NOT been" - echo "| overwritten:" - echo "|" - for f in ${OLD_CONFS}; do - echo "| ${DEST_PFX}/$f" - done - echo "|" - echo "| You should however manually compare them to their equivalents in" - echo "|" - echo "| ${SOURCE_PFX}" - echo "|" - echo "| and update your configuration as needed." - fi - echo "+--------------- ${P_NAME}" - echo -} - # verify proper execution # if [ $# -ne 2 ]; then @@ -136,11 +56,9 @@ fi # case $2 in PRE-INSTALL) - do_create_user ;; POST-INSTALL) do_create_spool_dirs - do_post ;; *) echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 diff --git a/news/leafnode/pkg/PLIST b/news/leafnode/pkg/PLIST index 32cb1f90424..7e1d82e197f 100644 --- a/news/leafnode/pkg/PLIST +++ b/news/leafnode/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.12 2004/09/15 18:21:21 espie Exp $ +@comment $OpenBSD: PLIST,v 1.13 2004/10/07 05:15:25 sturm Exp $ +@newuser _news:519:news::NNTP server:/var/spool/news:/sbin/nologin bin/leafnode-version bin/newsq @man man/man1/leafnode-version.1 @@ -16,16 +17,18 @@ sbin/texpire share/doc/leafnode/ share/doc/leafnode/FAQ.txt share/doc/leafnode/INSTALL +share/doc/leafnode/NEWS +share/doc/leafnode/OLDNEWS share/doc/leafnode/README share/doc/leafnode/README-FQDN share/examples/leafnode/ share/examples/leafnode/Makefile.dist share/examples/leafnode/UNINSTALL-daemontools share/examples/leafnode/config.example +@sample ${SYSCONFDIR}/leafnode/ +@sample ${SYSCONFDIR}/leafnode/config share/examples/leafnode/filters.example share/examples/leafnode/nntp.rules.dist share/examples/leafnode/run.tcpd.dist share/examples/leafnode/run.tcpserver.dist -@cwd ${SYSCONFDIR} -@extra leafnode/config -@extra leafnode/ +@extraunexec /bin/rm -r /var/spool/news