leafnode: update to 1.11.11. Updated provided by Michael Bčľ°uerle via pkgsrc-wip. * 1.11.11, 2015-08-25 ### BUGFIXES - The configfile parser now strips whitespace between a configuration parameter's value and a trailing comment. Found by Cecil Westerhof. - The roff manual page sources now render proper hyphens (-), minus characters (\-) and en-dashes (\[en]) depending on their context. This is so that copying-and-pasting from the manual page works properly. - The code that checks if the peer is local now properly deals with IPv4 mapped IPv6 addresses.diff -r1.48 -r1.49 pkgsrc/news/leafnode/Makefile
(wiz)
@@ -1,36 +1,39 @@ | @@ -1,36 +1,39 @@ | |||
1 | # $NetBSD: Makefile,v 1.48 2014/09/12 21:58:44 shattered Exp $ | 1 | # $NetBSD: Makefile,v 1.49 2018/09/04 11:00:48 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= leafnode-1.11.10 | 3 | DISTNAME= leafnode-1.11.11 | |
4 | CATEGORIES= news | 4 | CATEGORIES= news | |
5 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=leafnode/} | 5 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=leafnode/} | |
6 | EXTRACT_SUFX= .tar.bz2 | 6 | EXTRACT_SUFX= .tar.bz2 | |
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://leafnode.sourceforge.net/ | 9 | HOMEPAGE= http://leafnode.sourceforge.net/ | |
10 | COMMENT= NNTP server for small (dialup) sites | 10 | COMMENT= NNTP server for small (dialup) sites | |
11 | LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2.1 | 11 | LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2.1 | |
12 | 12 | |||
13 | CONFLICTS+= cyrus-imapd<2.2.10nb2 | 13 | CONFLICTS+= cyrus-imapd<2.2.10nb2 | |
14 | 14 | |||
15 | WRKSRC= ${WRKDIR}/${DISTNAME} | 15 | WRKSRC= ${WRKDIR}/${DISTNAME} | |
16 | 16 | |||
17 | INSTALLATION_DIRS+= share/examples/leafnode | |||
18 | INSTALLATION_DIRS+= share/doc/leafnode | |||
19 | ||||
17 | LEAFNODE_SPOOL?= /var/spool/leafnode | 20 | LEAFNODE_SPOOL?= /var/spool/leafnode | |
18 | LEAFNODE_LOCKDIR?= /var/spool/lock/leafnode | 21 | LEAFNODE_LOCKDIR?= /var/spool/lock/leafnode | |
19 | LEAFNODE_CONFDIR?= ${PKG_SYSCONFDIR}/leafnode | 22 | LEAFNODE_CONFDIR?= ${PKG_SYSCONFDIR}/leafnode | |
20 | 23 | |||
21 | # Default data dir, login and group are the same as used by inn | 24 | # Default data dir, login and group are the same as used by inn | |
22 | # | 25 | # | |
23 | BUILD_DEFS+= LEAFNODE_DATA_DIR | 26 | BUILD_DEFS+= LEAFNODE_DATA_DIR INN_DATA_DIR | |
24 | PKG_GROUPS= ${LEAFNODE_GROUP} | 27 | PKG_GROUPS= ${LEAFNODE_GROUP} | |
25 | PKG_USERS= ${LEAFNODE_USER}:${LEAFNODE_GROUP} | 28 | PKG_USERS= ${LEAFNODE_USER}:${LEAFNODE_GROUP} | |
26 | LEAFNODE_HOME?= ${INN_DATA_DIR} | 29 | LEAFNODE_HOME?= ${INN_DATA_DIR} | |
27 | 30 | |||
28 | PKG_GECOS.${LEAFNODE_USER}= Internet News | 31 | PKG_GECOS.${LEAFNODE_USER}= Internet News | |
29 | PKG_HOME.${LEAFNODE_USER}= ${LEAFNODE_DATA_DIR} | 32 | PKG_HOME.${LEAFNODE_USER}= ${LEAFNODE_DATA_DIR} | |
30 | PKG_SHELL.${LEAFNODE_USER}= ${SH} | 33 | PKG_SHELL.${LEAFNODE_USER}= ${SH} | |
31 | 34 | |||
32 | PKG_GROUPS_VARS+= LEAFNODE_GROUP | 35 | PKG_GROUPS_VARS+= LEAFNODE_GROUP | |
33 | PKG_USERS_VARS+= LEAFNODE_USER | 36 | PKG_USERS_VARS+= LEAFNODE_USER | |
34 | 37 | |||
35 | FILES_SUBST+= LEAFNODE_SPOOL=${LEAFNODE_SPOOL:Q} | 38 | FILES_SUBST+= LEAFNODE_SPOOL=${LEAFNODE_SPOOL:Q} | |
36 | FILES_SUBST+= LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR:Q} | 39 | FILES_SUBST+= LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR:Q} | |
@@ -53,25 +56,22 @@ PKG_SUPPORTED_OPTIONS= inet6 | @@ -53,25 +56,22 @@ PKG_SUPPORTED_OPTIONS= inet6 | |||
53 | PKG_SUGGESTED_OPTIONS= inet6 | 56 | PKG_SUGGESTED_OPTIONS= inet6 | |
54 | 57 | |||
55 | .include "../../mk/bsd.options.mk" | 58 | .include "../../mk/bsd.options.mk" | |
56 | 59 | |||
57 | .if !empty(PKG_OPTIONS:Minet6) | 60 | .if !empty(PKG_OPTIONS:Minet6) | |
58 | CONFIGURE_ARGS+= --with-ipv6 | 61 | CONFIGURE_ARGS+= --with-ipv6 | |
59 | .else | 62 | .else | |
60 | CONFIGURE_ARGS+= --without-ipv6 | 63 | CONFIGURE_ARGS+= --without-ipv6 | |
61 | .endif | 64 | .endif | |
62 | 65 | |||
63 | TEST_TARGET= check | 66 | TEST_TARGET= check | |
64 | 67 | |||
65 | post-install: | 68 | post-install: | |
66 | ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/leafnode | |||
67 | ${INSTALL_DATA} ${WRKSRC}/config.example \ | 69 | ${INSTALL_DATA} ${WRKSRC}/config.example \ | |
68 | ${DESTDIR}${PREFIX}/share/examples/leafnode | 70 | ${DESTDIR}${PREFIX}/share/examples/leafnode | |
69 | ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/leafnode | |||
70 | ||||
71 | ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README-FQDN \ | 71 | ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README-FQDN \ | |
72 | ${WRKSRC}/README-MAINTAINER \ | 72 | ${WRKSRC}/README-MAINTAINER \ | |
73 | ${WRKSRC}/README-daemontools \ | 73 | ${WRKSRC}/README-daemontools \ | |
74 | ${DESTDIR}${PREFIX}/share/doc/leafnode | 74 | ${DESTDIR}${PREFIX}/share/doc/leafnode | |
75 | 75 | |||
76 | .include "../../devel/pcre/buildlink3.mk" | 76 | .include "../../devel/pcre/buildlink3.mk" | |
77 | .include "../../mk/bsd.pkg.mk" | 77 | .include "../../mk/bsd.pkg.mk" |
@@ -1,7 +1,9 @@ | @@ -1,7 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.19 2015/11/02 23:49:47 agc Exp $ | 1 | $NetBSD: distinfo,v 1.20 2018/09/04 11:00:48 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (leafnode-1.11.10.tar.bz2) = c25a6cc36d9080a882836c2cc6516543a85d7fd7 | 3 | SHA1 (leafnode-1.11.11.tar.bz2) = 8e84358748a26ff147ea28120e8b42f5f6deb936 | |
4 | RMD160 (leafnode-1.11.10.tar.bz2) = bedded3f3d3c46e3fc274290036faaad75bb91b4 | 4 | RMD160 (leafnode-1.11.11.tar.bz2) = 78078216a49356250ff843044431a66a0b722ab7 | |
5 | SHA512 (leafnode-1.11.10.tar.bz2) = efffbe9a3fe10da64ebfaff31738b66e9783923ea119e2f792bc0e7e1811d570e85c5ddec17af6787333958deeee3af9bec87d1312c37eb19e355147dfa721ae | 5 | SHA512 (leafnode-1.11.11.tar.bz2) = 3a476a32f2e59ed0812379efc2ad1964347094417e7fc01d93f84d0cfaed78a66b2f2f40d1ac36f8a0f8844523ab57b9a605d4bd73ea309248c0562e7c26248a | |
6 | Size (leafnode-1.11.10.tar.bz2) = 493480 bytes | 6 | Size (leafnode-1.11.11.tar.bz2) = 500482 bytes | |
7 | SHA1 (patch-aa) = ba9b942ca1802d98948d9e98838a0b332212fc18 | 7 | SHA1 (patch-Makefile.in) = 5ca379bc986a971c27c3287559c7294f7a4e92de | |
8 | SHA1 (patch-checkpeerlocal.c) = a2754f43c6153ce2f781880ed5bac3b90e72954c | |||
9 | SHA1 (patch-xoverutil.c) = eb7c181aa033a587f53d66cd4d05791c60f49a7c |
$NetBSD: patch-Makefile.in,v 1.1 2018/09/04 11:00:48 wiz 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
@@ -954,20 +954,20 @@ uninstall-man8:
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
install-sysconfDATA: $(sysconf_DATA)
- @$(NORMAL_INSTALL)
- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
- done
+# @$(NORMAL_INSTALL)
+# @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+# if test -n "$$list"; then \
+# echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
+# $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
+# fi; \
+# for p in $$list; do \
+# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+# echo "$$d$$p"; \
+# done | $(am__base_list) | \
+# while read files; do \
+# echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+# $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
+# done
uninstall-sysconfDATA:
@$(NORMAL_UNINSTALL)
@@ -1621,17 +1621,17 @@ rpm: leafnode.spec
rpmbuild -ba leafnode.spec || rpm -ba leafnode.spec
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 ; \
- if ./amiroot ; then \
- chown @NEWS_USER@:@NEWS_GROUP@ $(DESTDIR)$(SPOOLDIR)/$$i ; \
- chmod 2775 $(DESTDIR)$(SPOOLDIR)/$$i ; fi ; \
- done
- d="`dirname $(DESTDIR)@LOCKFILE@`" ; mkdir -p "$${d}" && \
- if ./amiroot ; then \
- chown @NEWS_USER@:@NEWS_GROUP@ "$${d}" ; \
- chmod 2775 "$${d}" ; fi
+# set -e ; for i in "" /leaf.node /failed.postings /interesting.groups \
+# /out.going /message.id /temp.files ; do \
+# mkdir -p $(DESTDIR)$(SPOOLDIR)$$i ; \
+# if ./amiroot ; then \
+# chown @NEWS_USER@:@NEWS_GROUP@ $(DESTDIR)$(SPOOLDIR)/$$i ; \
+# chmod 2775 $(DESTDIR)$(SPOOLDIR)/$$i ; fi ; \
+# done
+# d="`dirname $(DESTDIR)@LOCKFILE@`" ; mkdir -p "$${d}" && \
+# if ./amiroot ; then \
+# chown @NEWS_USER@:@NEWS_GROUP@ "$${d}" ; \
+# chmod 2775 "$${d}" ; fi
uninstall-hook:
rm -f $(DESTDIR)@LOCKFILE@
$NetBSD: patch-checkpeerlocal.c,v 1.1 2018/09/04 11:00:48 wiz Exp $
IPv6 guards added (build fails without IPv6 otherwise).
--- checkpeerlocal.c.orig 2018-08-24 15:30:42.000000000 +0000
+++ checkpeerlocal.c
@@ -208,6 +208,7 @@ int checkpeerlocal(int sock)
}
#endif
+#ifdef HAVE_IPV6
if (IN6_IS_ADDR_V4MAPPED(&addr.sin6.sin6_addr)) {
/* map to IPv4 */
struct sockaddr_in si;
@@ -216,6 +217,7 @@ int checkpeerlocal(int sock)
memcpy(&addr.sin, &si, sizeof(struct sockaddr_in));
D(pat(&addr.sa));
}
+#endif
if (getifaddrs(&ifap) != 0) {
D(printf("getifaddrs failed: %s\n", strerror(errno)));
$NetBSD: patch-xoverutil.c,v 1.1 2018/09/04 11:00:48 wiz Exp $
Accept EEXIST response the same as ENOTEMPTY for rmdir().
--- xoverutil.c.orig 2009-01-30 15:02:52.000000000 +0000
+++ xoverutil.c
@@ -386,7 +386,7 @@ static void killcwd(void) {
if (chdir(spooldir)) {
ln_log(LNLOG_SERR, LNLOG_CTOP, "error: cannot chdir(%s): %m", spooldir);
}
- if (rmdir(t) && errno != ENOTEMPTY) {
+ if (rmdir(t) && errno != ENOTEMPTY && errno != EEXIST) {
ln_log(LNLOG_SERR, LNLOG_CTOP, "error: cannot rmdir(%s): %m", t);
}
free(t);