[pkgsrc/trunk]: pkgsrc/news/leafnode Update of news/leafnode to 1.9.49.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/news/leafnode Update of news/leafnode to 1.9.49.
From: cjep <cjep%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:21:19 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ca2a9c07c19
branches:  trunk
changeset: 466095:8ca2a9c07c19
user:      cjep <cjep%pkgsrc.org@localhost>
date:      Sun Jan 11 16:45:51 2004 +0000

description:
Update of news/leafnode to 1.9.49.

Pkgsrc changes since previous version:
* Add the news user if necessary (and be compatible with the INN package).
* Use bsd.pkg.install.mk.

Vendor changes since previous version:
(see the Changelog for more details)

* Security fix. Do not lock up when the news header ends prematurely.
* Revise some memory handling and catch out-of-memory conditions.
* Fixes to syslog handling.
* Support XOVER without argument.
* Fix SEGV in fetchnews.c.

diffstat:

 news/leafnode/DEINSTALL        |  22 ++++++++----
 news/leafnode/INSTALL          |  69 +++++++++++++++++++++--------------------
 news/leafnode/Makefile         |  41 ++++++++++++++----------
 news/leafnode/PLIST            |   8 ++++-
 news/leafnode/distinfo         |   8 ++--
 news/leafnode/patches/patch-aa |  14 ++++----
 6 files changed, 92 insertions(+), 70 deletions(-)

diffs (272 lines):

diff -r e99f59d01c87 -r 8ca2a9c07c19 news/leafnode/DEINSTALL
--- a/news/leafnode/DEINSTALL   Sun Jan 11 16:42:04 2004 +0000
+++ b/news/leafnode/DEINSTALL   Sun Jan 11 16:45:51 2004 +0000
@@ -1,14 +1,22 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.2 2003/05/06 17:42:21 jmmv Exp $
+# $NetBSD: DEINSTALL,v 1.3 2004/01/11 16:45:51 cjep Exp $
 
-case "$2" in
-        DEINSTALL) cat <<EOF
+LEAFNODE_CONFDIR=@LEAFNODE_CONFDIR@
+LEAFNODE_SPOOL=@LEAFNODE_SPOOL@ 
+LEAFNODE_LOCKDIR=@LEAFNODE_LOCKDIR@
+LEAFNODE_HOME=@LEAFNODE_HOME@
+
+case "${STAGE}" in
+        POST-DEINSTALL) cat <<EOF
 
 ==========================================================================
 
 Note that the leafnode spool, lock and configuration directories
-(@@LEAFNODE_SPOOL@@, @@LEAFNODE_LOCKDIR@@ and @@LEAFNODE_CONFDIR@@)
+
+       ${LEAFNODE_SPOOL} 
+       ${LEAFNODE_LOCKDIR}
+       ${LEAFNODE_HOME} 
+    and ${LEAFNODE_CONFDIR}
+
 are NOT deleted during the package deinstallation. Please remove these
 directories and all their contents manually if they are no longer needed.
 Also, don't forgot to remove any cron jobs associated with leafnode.
@@ -18,5 +26,3 @@
 EOF
         ;;
 esac
-
-exit 0
diff -r e99f59d01c87 -r 8ca2a9c07c19 news/leafnode/INSTALL
--- a/news/leafnode/INSTALL     Sun Jan 11 16:42:04 2004 +0000
+++ b/news/leafnode/INSTALL     Sun Jan 11 16:45:51 2004 +0000
@@ -1,44 +1,47 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.2 2003/05/06 17:42:22 jmmv Exp $
+# $NetBSD: INSTALL,v 1.3 2004/01/11 16:45:51 cjep Exp $
 
-if [ "$2" != "POST-INSTALL" ]; then
-  exit 0
-fi
+LEAFNODE_CONFDIR=@LEAFNODE_CONFDIR@
+LEAFNODE_SPOOL=@LEAFNODE_SPOOL@
+LEAFNODE_LOCKDIR=@LEAFNODE_LOCKDIR@
+LEAFNODE_HOME=@LEAFNODE_HOME@
+
+if [ "${STAGE}" = "POST-INSTALL" ]; then
 
-mkdir -p @@LEAFNODE_CONFDIR@@
-if [ ! -f @@LEAFNODE_CONFDIR@@/config ]; then
-       cp @@PREFIX@@/share/examples/leafnode/config.example \
-       @@LEAFNODE_CONFDIR@@/config
-       chmod u+w @@LEAFNODE_CONFDIR@@/config
-fi
+       mkdir -p ${LEAFNODE_CONFDIR}
+       if [ ! -f ${LEAFNODE_CONFDIR}/config ]; then
+               cp ${PREFIX}/share/examples/leafnode/config.example \
+               ${LEAFNODE_CONFDIR}/config
+               chmod u+w ${LEAFNODE_CONFDIR}/config
+       fi
 
-echo "Creating leafnode spool directories..."
+       echo "Creating leafnode spool directories..."
 
-SPOOL_DIRS="leaf.node failed.postings interesting.groups out.going message.id"
+       SPOOL_DIRS="leaf.node failed.postings interesting.groups out.going message.id"
 
-mkdir -p @@LEAFNODE_SPOOL@@
-chown news:news @@LEAFNODE_SPOOL@@
-chmod 2775     @@LEAFNODE_SPOOL@@
+       mkdir -p ${LEAFNODE_SPOOL}
+       chown news:news ${LEAFNODE_SPOOL}
+       chmod 2775      ${LEAFNODE_SPOOL}
 
-for D in $SPOOL_DIRS; do
-       mkdir -p @@LEAFNODE_SPOOL@@/$D;
-       chown news:news @@LEAFNODE_SPOOL@@/$D
-       chmod 2775      @@LEAFNODE_SPOOL@@/$D
-done
+       for D in $SPOOL_DIRS; do
+               mkdir -p ${LEAFNODE_SPOOL}/$D;
+               chown news:news ${LEAFNODE_SPOOL}/$D
+               chmod 2775      ${LEAFNODE_SPOOL}/$D
+       done
 
-mkdir -p @@LEAFNODE_LOCKDIR@@
-chown news:news @@LEAFNODE_LOCKDIR@@
-chmod 2775 @@LEAFNODE_LOCKDIR@@
+       mkdir -p ${LEAFNODE_LOCKDIR}
+       chown news:news ${LEAFNODE_LOCKDIR}
+       chmod 2775 ${LEAFNODE_LOCKDIR}
 
-# Make directories (a la quickmkdir)
-for a in 0 1 2 3 4 5 6 7 8 9; do
-       for b in 0 1 2 3 4 5 6 7 8 9; do
-               for c in 0 1 2 3 4 5 6 7 8 9; do
-                       mkdir -m 2775 -p @@LEAFNODE_SPOOL@@/message.id/$a$b$c
-                       chown news:news @@LEAFNODE_SPOOL@@/message.id/$a$b$c
+       # Make directories (a la quickmkdir)
+       for a in 0 1 2 3 4 5 6 7 8 9; do
+               for b in 0 1 2 3 4 5 6 7 8 9; do
+                       for c in 0 1 2 3 4 5 6 7 8 9; do
+                               mkdir -m 2775 -p ${LEAFNODE_SPOOL}/message.id/$a$b$c
+                               chown news:news ${LEAFNODE_SPOOL}/message.id/$a$b$c
+                       done
                done
        done
-done
 
-exit 0
+       mkdir -p ${LEAFNODE_HOME}
+       chown news:news ${LEAFNODE_HOME}
+fi
diff -r e99f59d01c87 -r 8ca2a9c07c19 news/leafnode/Makefile
--- a/news/leafnode/Makefile    Sun Jan 11 16:42:04 2004 +0000
+++ b/news/leafnode/Makefile    Sun Jan 11 16:45:51 2004 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2003/09/05 16:16:23 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/11 16:45:51 cjep Exp $
 
-DISTNAME=              leafnode-1.9.43.rel
+DISTNAME=              leafnode-1.9.49.rel
 PKGNAME=               ${DISTNAME:S/.rel//}
 WRKSRC=                        ${WRKDIR}/${DISTNAME}
 CATEGORIES=            news
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=leafnode/}
-
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            cjep%NetBSD.org@localhost
@@ -13,11 +12,26 @@
 COMMENT=               NNTP server for small (dialup) sites
 
 USE_BUILDLINK2=                yes
+INSTALL_EXTRA_TMPL+=   ${.CURDIR}/INSTALL
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
 
 LEAFNODE_SPOOL?=       /var/spool/leafnode
 LEAFNODE_LOCKDIR?=     /var/spool/lock/leafnode
 LEAFNODE_CONFDIR?=     ${PKG_SYSCONFDIR}/leafnode
 
+# Use news login and be compatible with inn package
+#
+BUILD_DEFS+=           INN_DATA_DIR
+PKG_USERS=             news:news::Internet\\ News:${INN_DATA_DIR}:${SH}
+PKG_GROUPS=            news
+LEAFNODE_HOME?=                ${INN_DATA_DIR}
+
+FILES_SUBST+=  LEAFNODE_SPOOL=${LEAFNODE_SPOOL}
+FILES_SUBST+=  LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR}
+FILES_SUBST+=  LEAFNODE_LOCKDIR=${LEAFNODE_LOCKDIR}
+FILES_SUBST+=  LEAFNODE_HOME=${LEAFNODE_HOME}
+MESSAGE_SUBST+=                LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR}
+
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-spooldir=${LEAFNODE_SPOOL}
 CONFIGURE_ARGS+=       --with-lockfile=${LEAFNODE_LOCKDIR}/fetchnews.lck
@@ -32,24 +46,17 @@
 CONFIGURE_ARGS+=       --without-ipv6
 .endif
 
-DEINSTALL_FILE=                ${WRKDIR}/DEINSTALL
-INSTALL_FILE=          ${WRKDIR}/INSTALL
-
-MESSAGE_SUBST+=                LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR}
-
-post-build:
-       for F in DEINSTALL INSTALL; do                                  \
-       ${SED}  -e 's#@@LEAFNODE_SPOOL@@#${LEAFNODE_SPOOL}#g'           \
-               -e 's#@@LEAFNODE_LOCKDIR@@#${LEAFNODE_LOCKDIR}#g'       \
-               -e 's#@@LEAFNODE_CONFDIR@@#${LEAFNODE_CONFDIR}#g'       \
-               -e 's#@@PREFIX@@#${PREFIX}#g'   \
-               ${PKGDIR}/$${F} > ${WRKDIR}/$${F}; done
-
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/leafnode
        ${INSTALL_DATA} ${WRKSRC}/config.example                        \
                                ${PREFIX}/share/examples/leafnode
-       PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/leafnode
+
+       ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README-FQDN          \
+                       ${WRKSRC}/README-MAINTAINER                     \
+                       ${WRKSRC}/README-daemontools                    \
+                       ${WRKSRC}/README.FIRST ${PREFIX}/share/doc/leafnode
 
 .include "../../devel/pcre/buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e99f59d01c87 -r 8ca2a9c07c19 news/leafnode/PLIST
--- a/news/leafnode/PLIST       Sun Jan 11 16:42:04 2004 +0000
+++ b/news/leafnode/PLIST       Sun Jan 11 16:45:51 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/08 12:44:13 cjep Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/01/11 16:45:51 cjep Exp $
 bin/leafnode-version
 bin/newsq
 man/man1/leafnode-version.1
@@ -13,5 +13,11 @@
 sbin/fetchnews
 sbin/leafnode
 sbin/texpire
+share/doc/leafnode/README
+share/doc/leafnode/README-FQDN
+share/doc/leafnode/README-MAINTAINER
+share/doc/leafnode/README-daemontools
+share/doc/leafnode/README.FIRST
 share/examples/leafnode/config.example
 @dirrm share/examples/leafnode
+@dirrm share/doc/leafnode
diff -r e99f59d01c87 -r 8ca2a9c07c19 news/leafnode/distinfo
--- a/news/leafnode/distinfo    Sun Jan 11 16:42:04 2004 +0000
+++ b/news/leafnode/distinfo    Sun Jan 11 16:45:51 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2003/09/05 16:16:23 wiz Exp $
+$NetBSD: distinfo,v 1.10 2004/01/11 16:45:51 cjep Exp $
 
-SHA1 (leafnode-1.9.43.rel.tar.bz2) = 40e19de39e2081bde4d4a161b733bdd1a9d936c7
-Size (leafnode-1.9.43.rel.tar.bz2) = 628364 bytes
-SHA1 (patch-aa) = d1aa900eb9040f8810afd7dbe4f26551c7dad99e
+SHA1 (leafnode-1.9.49.rel.tar.bz2) = fbf69b03e6e535ce780ccf542fc75cc0a5913901
+Size (leafnode-1.9.49.rel.tar.bz2) = 666698 bytes
+SHA1 (patch-aa) = 830794c3739401b359d369730a754e54ea1a8e14
diff -r e99f59d01c87 -r 8ca2a9c07c19 news/leafnode/patches/patch-aa
--- a/news/leafnode/patches/patch-aa    Sun Jan 11 16:42:04 2004 +0000
+++ b/news/leafnode/patches/patch-aa    Sun Jan 11 16:45:51 2004 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2002/09/22 10:35:48 cjep Exp $
+$NetBSD: patch-aa,v 1.3 2004/01/11 16:45:51 cjep Exp $
 
---- Makefile.in.orig   Fri Sep 20 11:49:58 2002
+--- Makefile.in.orig   2004-01-07 01:49:26.000000000 +0000
 +++ Makefile.in
-@@ -623,14 +623,14 @@
+@@ -815,14 +815,14 @@ uninstall-man8:
+         rm -f $(DESTDIR)$(man8dir)/$$inst; \
        done
- sysconfDATA_INSTALL = $(INSTALL_DATA)
  install-sysconfDATA: $(sysconf_DATA)
 -      @$(NORMAL_INSTALL)
--      $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+-      $(mkdir_p) $(DESTDIR)$(sysconfdir)
 -      @list='$(sysconf_DATA)'; for p in $$list; do \
 -        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 -        f="`echo $$p | sed -e 's|^.*/||'`"; \
@@ -15,7 +15,7 @@
 -        $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
 -      done
 +#     @$(NORMAL_INSTALL)
-+#     $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
++#     $(mkdir_p) $(DESTDIR)$(sysconfdir)
 +#     @list='$(sysconf_DATA)'; for p in $$list; do \
 +#       if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +#       f="`echo $$p | sed -e 's|^.*/||'`"; \
@@ -25,7 +25,7 @@
  
  uninstall-sysconfDATA:
        @$(NORMAL_UNINSTALL)
-@@ -1059,18 +1059,18 @@
+@@ -1343,18 +1343,18 @@ rpm:
        rpm -ba leafnode.spec
  
  install-data-hook: quickmkdir amiroot
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of news/leafnode
Next by Date: [pkgsrc/trunk]: pkgsrc/doc -leafnode. I'm no longer looking at gd-noX11 or tm...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of news/leafnode
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc -leafnode. I'm no longer looking at gd-noX11 or tm...
Indexes:
Home | Main Index | Thread Index | Old Index