pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/news/leafnode news/leafnode: Update to 1.12.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/4d36a69fbd90
branches: trunk
changeset: 381920:4d36a69fbd90
user: micha <micha%pkgsrc.org@localhost>
date: Fri Jul 15 12:37:55 2022 +0000
description:
news/leafnode: Update to 1.12.0
- Moved pkgsrc options into separate file options.mk
- Modified pkgsrc patch to cover whole rule body again
- Removed WRKSRC setting (was explicitly set to default value)
- Replaced MESSAGE by ${PREFIX}/share/doc/leafnode/INSTALL.pkgsrc
==============================================================================
* 1.12.0, 2022-05-26
### CHANGES
- leafnode now requires the PCRE2 library instead of PCRE.
PCRE2 has been around for a few years and is maintained,
while PCRE is end of life, no longer supported,
and is being phased out by distributions.
See its home page, https://github.com/PhilipHazel/pcre2
Fixes Debian Bug#1000110 reported by Matthew Vernon via Moritz Mühlenhoff.
- Documentation for running under daemontools/ucspi-tcp (tcpserver)
has been removed, only UNINSTALL-daemontools remains as documentation.
- leafnode 1 is now distributed in gzip and xz formats.
bzip2 will no longer be used because xz performs better overall.
- All files have been converted from ISO-8859-1 to UTF-8 encoding.
- Added leafnode@.service and leafnode.socket as examples for how to launch
the network-based leafnode listening on port 119.
diffstat:
news/leafnode/MESSAGE | 20 ------------
news/leafnode/Makefile | 51 ++++++++++++++++----------------
news/leafnode/PLIST | 5 +-
news/leafnode/distinfo | 10 +++---
news/leafnode/files/INSTALL.pkgsrc | 18 +++++++++++
news/leafnode/options.mk | 13 ++++++++
news/leafnode/patches/patch-Makefile.in | 12 +++++--
7 files changed, 72 insertions(+), 57 deletions(-)
diffs (236 lines):
diff -r bd41a240d434 -r 4d36a69fbd90 news/leafnode/MESSAGE
--- a/news/leafnode/MESSAGE Fri Jul 15 11:08:11 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/05/06 17:42:22 jmmv Exp $
-
-Edit ${LEAFNODE_CONFDIR}/config and make the necessary local
-changes.
-
-Leafnode needs to be run from inetd. An example configuration for
-/etc/inetd.conf is as follows:
-nntp stream tcp nowait news ${PREFIX}/sbin/leafnode leafnode
-nntp stream tcp6 nowait news ${PREFIX}/sbin/leafnode leafnode
-
-Edit the news user's crontab to run an expiry job. For example, add:
-0 4 * * * ${PREFIX}/sbin/texpire
-
-As root or news, run "fetchnews". This may take some time. Then connect
-to the leafnode server with an NNTP client. Select the groups you want
-to read in the future by reading the "default" article in them.
-Run "fetchnews" again. This run will pick up all the groups you want to
-read. You may wish to automate the running of "fetchnews".
-===========================================================================
diff -r bd41a240d434 -r 4d36a69fbd90 news/leafnode/Makefile
--- a/news/leafnode/Makefile Fri Jul 15 11:08:11 2022 +0000
+++ b/news/leafnode/Makefile Fri Jul 15 12:37:55 2022 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2021/05/07 11:09:35 micha Exp $
+# $NetBSD: Makefile,v 1.54 2022/07/15 12:37:55 micha Exp $
-DISTNAME= leafnode-1.11.12
+DISTNAME= leafnode-1.12.0
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=leafnode/}
-EXTRACT_SUFX= .tar.bz2
MAINTAINER= micha%NetBSD.org@localhost
HOMEPAGE= https://leafnode.sourceforge.io/
@@ -12,17 +11,21 @@
CONFLICTS+= cyrus-imapd<2.2.10nb2
-WRKSRC= ${WRKDIR}/${DISTNAME}
-
-INSTALLATION_DIRS+= share/examples/leafnode
-INSTALLATION_DIRS+= share/doc/leafnode
+USE_FEATURES= snprintf vsnprintf
LEAFNODE_SPOOL?= /var/spool/leafnode
LEAFNODE_LOCKDIR?= /var/spool/lock/leafnode
LEAFNODE_CONFDIR?= ${PKG_SYSCONFDIR}/leafnode
+# Configure INSTALL.pkgsrc (formerly displayed as MESSAGE)
+SUBST_CLASSES+= install
+SUBST_STAGE.install= post-configure
+SUBST_MESSAGE.install= Preparing INSTALL.pkgsrc file ...
+SUBST_FILES.install= ${WRKDIR}/INSTALL.pkgsrc
+SUBST_VARS.install= PREFIX
+SUBST_VARS.install+= LEAFNODE_CONFDIR
+
# Default data dir, login and group are the same as used by inn
-#
BUILD_DEFS+= LEAFNODE_DATA_DIR INN_DATA_DIR
PKG_GROUPS= ${LEAFNODE_GROUP}
PKG_USERS= ${LEAFNODE_USER}:${LEAFNODE_GROUP}
@@ -41,8 +44,6 @@
FILES_SUBST+= LEAFNODE_HOME=${LEAFNODE_HOME:Q}
MESSAGE_SUBST+= LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR}
-USE_FEATURES= snprintf vsnprintf
-
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-spooldir=${LEAFNODE_SPOOL:Q}
CONFIGURE_ARGS+= --with-lockfile=${LEAFNODE_LOCKDIR}/fetchnews.lck
@@ -51,27 +52,25 @@
CONFIGURE_ARGS+= --with-group=${LEAFNODE_GROUP:Q}
USE_TOOLS+= gmake
-PKG_OPTIONS_VAR= PKG_OPTIONS.leafnode
-PKG_SUPPORTED_OPTIONS= inet6
-PKG_SUGGESTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --with-ipv6
-.else
-CONFIGURE_ARGS+= --without-ipv6
-.endif
+.include "options.mk"
TEST_TARGET= check
+INSTALLATION_DIRS+= share/examples/leafnode
+INSTALLATION_DIRS+= share/doc/leafnode
+
+pre-configure:
+ ${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
+
post-install:
${INSTALL_DATA} ${WRKSRC}/config.example \
- ${DESTDIR}${PREFIX}/share/examples/leafnode
+ ${DESTDIR}${PREFIX}/share/examples/leafnode
${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README-FQDN \
- ${WRKSRC}/README-MAINTAINER \
- ${WRKSRC}/README-daemontools \
- ${DESTDIR}${PREFIX}/share/doc/leafnode
+ ${WRKSRC}/README-MAINTAINER \
+ ${WRKSRC}/UNINSTALL-daemontools \
+ ${DESTDIR}${PREFIX}/share/doc/leafnode
+ ${INSTALL_DATA} ${WRKDIR}/INSTALL.pkgsrc \
+ ${DESTDIR}${PREFIX}/share/doc/leafnode/INSTALL.pkgsrc
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r bd41a240d434 -r 4d36a69fbd90 news/leafnode/PLIST
--- a/news/leafnode/PLIST Fri Jul 15 11:08:11 2022 +0000
+++ b/news/leafnode/PLIST Fri Jul 15 12:37:55 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2014/09/12 21:58:44 shattered Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/07/15 12:37:55 micha Exp $
bin/leafnode-version
bin/newsq
man/man1/leafnode-version.1
@@ -13,8 +13,9 @@
sbin/fetchnews
sbin/leafnode
sbin/texpire
+share/doc/leafnode/INSTALL.pkgsrc
share/doc/leafnode/README
share/doc/leafnode/README-FQDN
share/doc/leafnode/README-MAINTAINER
-share/doc/leafnode/README-daemontools
+share/doc/leafnode/UNINSTALL-daemontools
share/examples/leafnode/config.example
diff -r bd41a240d434 -r 4d36a69fbd90 news/leafnode/distinfo
--- a/news/leafnode/distinfo Fri Jul 15 11:08:11 2022 +0000
+++ b/news/leafnode/distinfo Fri Jul 15 12:37:55 2022 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2021/10/26 11:09:35 nia Exp $
+$NetBSD: distinfo,v 1.25 2022/07/15 12:37:55 micha Exp $
-BLAKE2s (leafnode-1.11.12.tar.bz2) = d0e53af7221094aa451c0a6575c91d457986bfc80a457abb97c519c966e202a3
-SHA512 (leafnode-1.11.12.tar.bz2) = 2460bb4fc51a716059ccfcde7fd99f2f0f8c11f7d20db457c06abb04a39f892331b1e70334901c9f20480f348186465be147ee21368fcd48c9e08bb3c8d7fe87
-Size (leafnode-1.11.12.tar.bz2) = 501619 bytes
-SHA1 (patch-Makefile.in) = 28dd40d5af8316a1a234affa71b807e3ad15c8f1
+BLAKE2s (leafnode-1.12.0.tar.gz) = b04cc9e266f6d50901c4e0ead09a599328da5ce6e1925539564437f386cd8082
+SHA512 (leafnode-1.12.0.tar.gz) = 8122f8e2f7061c68c00d964f88a288d162be6e7fa526dea7a969ea8742116354359a85014bc9cbd59e09d51acf94dcd898a3955231f8aa7262c9c56114fed3cd
+Size (leafnode-1.12.0.tar.gz) = 585469 bytes
+SHA1 (patch-Makefile.in) = f40330bc49ba26c1e946f8164bc92256b3b301a8
diff -r bd41a240d434 -r 4d36a69fbd90 news/leafnode/files/INSTALL.pkgsrc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/news/leafnode/files/INSTALL.pkgsrc Fri Jul 15 12:37:55 2022 +0000
@@ -0,0 +1,18 @@
+Edit @LEAFNODE_CONFDIR@/config and make the necessary local
+changes.
+
+Leafnode needs to be run from inetd. An example configuration for
+/etc/inetd.conf is as follows:
+
+nntp stream tcp nowait news @PREFIX@/sbin/leafnode leafnode
+nntp stream tcp6 nowait news @PREFIX@/sbin/leafnode leafnode
+
+Edit the news user's crontab to run an expiry job. For example, add:
+
+0 4 * * * @PREFIX@/sbin/texpire
+
+As root or news, run "fetchnews". This may take some time. Then connect
+to the leafnode server with an NNTP client. Select the groups you want
+to read in the future by reading the "default" article in them.
+Run "fetchnews" again. This run will pick up all the groups you want to
+read. You may wish to automate the running of "fetchnews".
diff -r bd41a240d434 -r 4d36a69fbd90 news/leafnode/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/news/leafnode/options.mk Fri Jul 15 12:37:55 2022 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2022/07/15 12:37:55 micha Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.leafnode
+PKG_SUPPORTED_OPTIONS= inet6
+PKG_SUGGESTED_OPTIONS= inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+= --with-ipv6
+.else
+CONFIGURE_ARGS+= --without-ipv6
+.endif
diff -r bd41a240d434 -r 4d36a69fbd90 news/leafnode/patches/patch-Makefile.in
--- a/news/leafnode/patches/patch-Makefile.in Fri Jul 15 11:08:11 2022 +0000
+++ b/news/leafnode/patches/patch-Makefile.in Fri Jul 15 12:37:55 2022 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile.in,v 1.2 2021/05/07 11:09:35 micha Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2022/07/15 12:37:55 micha Exp $
Config data is installed with pkgsrc script.
Spool directory is created with pkgsrc script.
---- Makefile.in.orig 2015-08-24 22:26:08.000000000 +0000
+--- Makefile.in.orig 2022-05-26 22:07:48.000000000 +0000
+++ Makefile.in
-@@ -956,20 +956,20 @@ uninstall-man8:
+@@ -1278,20 +1278,20 @@ uninstall-man8:
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
install-sysconfDATA: $(sysconf_DATA)
@@ -40,7 +40,7 @@
uninstall-sysconfDATA:
@$(NORMAL_UNINSTALL)
-@@ -1624,17 +1624,17 @@ rpm: leafnode.spec
+@@ -2138,19 +2138,19 @@ rpm: leafnode.spec
rpmbuild -ba leafnode.spec || rpm -ba leafnode.spec
install-data-hook: amiroot
@@ -55,6 +55,8 @@
- if ./amiroot ; then \
- chown @NEWS_USER@:@NEWS_GROUP@ "$${d}" ; \
- chmod 2775 "$${d}" ; fi
+- $(srcdir)/install-sh -m 0755 -d $(DESTDIR)$(docdir)
+- $(srcdir)/install-sh -m 0644 $(srcdir)/UNINSTALL-daemontools $(DESTDIR)$(docdir)
+# set -e ; for i in "" /leaf.node /failed.postings /interesting.groups \
+# /out.going /message.id /temp.files ; do \
+# mkdir -p $(DESTDIR)$(SPOOLDIR)$$i ; \
@@ -66,6 +68,8 @@
+# if ./amiroot ; then \
+# chown @NEWS_USER@:@NEWS_GROUP@ "$${d}" ; \
+# chmod 2775 "$${d}" ; fi
++# $(srcdir)/install-sh -m 0755 -d $(DESTDIR)$(docdir)
++# $(srcdir)/install-sh -m 0644 $(srcdir)/UNINSTALL-daemontools $(DESTDIR)$(docdir)
uninstall-hook:
rm -f $(DESTDIR)@LOCKFILE@
Home |
Main Index |
Thread Index |
Old Index