pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/news/leafnode leafnode: update to 1.11.11.
details: https://anonhg.NetBSD.org/pkgsrc/rev/deae0c97d614
branches: trunk
changeset: 312475:deae0c97d614
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Sep 04 11:00:48 2018 +0000
description:
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.
diffstat:
news/leafnode/Makefile | 12 ++--
news/leafnode/distinfo | 14 +++--
news/leafnode/patches/patch-Makefile.in | 71 ++++++++++++++++++++++++++++
news/leafnode/patches/patch-aa | 62 ------------------------
news/leafnode/patches/patch-checkpeerlocal.c | 22 ++++++++
news/leafnode/patches/patch-xoverutil.c | 15 +++++
6 files changed, 122 insertions(+), 74 deletions(-)
diffs (247 lines):
diff -r 4d6a94896367 -r deae0c97d614 news/leafnode/Makefile
--- a/news/leafnode/Makefile Tue Sep 04 10:22:46 2018 +0000
+++ b/news/leafnode/Makefile Tue Sep 04 11:00:48 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2014/09/12 21:58:44 shattered Exp $
+# $NetBSD: Makefile,v 1.49 2018/09/04 11:00:48 wiz Exp $
-DISTNAME= leafnode-1.11.10
+DISTNAME= leafnode-1.11.11
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=leafnode/}
EXTRACT_SUFX= .tar.bz2
@@ -14,13 +14,16 @@
WRKSRC= ${WRKDIR}/${DISTNAME}
+INSTALLATION_DIRS+= share/examples/leafnode
+INSTALLATION_DIRS+= share/doc/leafnode
+
LEAFNODE_SPOOL?= /var/spool/leafnode
LEAFNODE_LOCKDIR?= /var/spool/lock/leafnode
LEAFNODE_CONFDIR?= ${PKG_SYSCONFDIR}/leafnode
# Default data dir, login and group are the same as used by inn
#
-BUILD_DEFS+= LEAFNODE_DATA_DIR
+BUILD_DEFS+= LEAFNODE_DATA_DIR INN_DATA_DIR
PKG_GROUPS= ${LEAFNODE_GROUP}
PKG_USERS= ${LEAFNODE_USER}:${LEAFNODE_GROUP}
LEAFNODE_HOME?= ${INN_DATA_DIR}
@@ -63,11 +66,8 @@
TEST_TARGET= check
post-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/leafnode
${INSTALL_DATA} ${WRKSRC}/config.example \
${DESTDIR}${PREFIX}/share/examples/leafnode
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/leafnode
-
${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README-FQDN \
${WRKSRC}/README-MAINTAINER \
${WRKSRC}/README-daemontools \
diff -r 4d6a94896367 -r deae0c97d614 news/leafnode/distinfo
--- a/news/leafnode/distinfo Tue Sep 04 10:22:46 2018 +0000
+++ b/news/leafnode/distinfo Tue Sep 04 11:00:48 2018 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.19 2015/11/02 23:49:47 agc Exp $
+$NetBSD: distinfo,v 1.20 2018/09/04 11:00:48 wiz Exp $
-SHA1 (leafnode-1.11.10.tar.bz2) = c25a6cc36d9080a882836c2cc6516543a85d7fd7
-RMD160 (leafnode-1.11.10.tar.bz2) = bedded3f3d3c46e3fc274290036faaad75bb91b4
-SHA512 (leafnode-1.11.10.tar.bz2) = efffbe9a3fe10da64ebfaff31738b66e9783923ea119e2f792bc0e7e1811d570e85c5ddec17af6787333958deeee3af9bec87d1312c37eb19e355147dfa721ae
-Size (leafnode-1.11.10.tar.bz2) = 493480 bytes
-SHA1 (patch-aa) = ba9b942ca1802d98948d9e98838a0b332212fc18
+SHA1 (leafnode-1.11.11.tar.bz2) = 8e84358748a26ff147ea28120e8b42f5f6deb936
+RMD160 (leafnode-1.11.11.tar.bz2) = 78078216a49356250ff843044431a66a0b722ab7
+SHA512 (leafnode-1.11.11.tar.bz2) = 3a476a32f2e59ed0812379efc2ad1964347094417e7fc01d93f84d0cfaed78a66b2f2f40d1ac36f8a0f8844523ab57b9a605d4bd73ea309248c0562e7c26248a
+Size (leafnode-1.11.11.tar.bz2) = 500482 bytes
+SHA1 (patch-Makefile.in) = 5ca379bc986a971c27c3287559c7294f7a4e92de
+SHA1 (patch-checkpeerlocal.c) = a2754f43c6153ce2f781880ed5bac3b90e72954c
+SHA1 (patch-xoverutil.c) = eb7c181aa033a587f53d66cd4d05791c60f49a7c
diff -r 4d6a94896367 -r deae0c97d614 news/leafnode/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/news/leafnode/patches/patch-Makefile.in Tue Sep 04 11:00:48 2018 +0000
@@ -0,0 +1,71 @@
+$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@
diff -r 4d6a94896367 -r deae0c97d614 news/leafnode/patches/patch-aa
--- a/news/leafnode/patches/patch-aa Tue Sep 04 10:22:46 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2014/09/12 21:58:45 shattered Exp $
-
---- Makefile.in.orig 2013-06-11 21:32:46.000000000 +0000
-+++ Makefile.in
-@@ -912,17 +912,17 @@ 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)
-- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-- 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)
-+# test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-+# @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-+# 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)
-@@ -1579,17 +1579,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@
diff -r 4d6a94896367 -r deae0c97d614 news/leafnode/patches/patch-checkpeerlocal.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/news/leafnode/patches/patch-checkpeerlocal.c Tue Sep 04 11:00:48 2018 +0000
@@ -0,0 +1,22 @@
+$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)));
diff -r 4d6a94896367 -r deae0c97d614 news/leafnode/patches/patch-xoverutil.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/news/leafnode/patches/patch-xoverutil.c Tue Sep 04 11:00:48 2018 +0000
@@ -0,0 +1,15 @@
+$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);
Home |
Main Index |
Thread Index |
Old Index