news/leafnode: Update to 1.11.12

Removed patches that were merged upstream.
Take maintainership.

===========================================================================
* 1.11.12, 2021-03-28

### CHANGES
- The sourceforge.net hosting was reconfigured to serve HTTPS, thus, the
  leafnode website is now at https://leafnode.sourceforge.io/
- https://www.leafnode.org/ is now being served by an external nginx-based
  web server so it can use a proper TLS certificate.
- The GMANE links and last modified tag have been removed from the
  website.
- The web site has been updated to use newer https:// links where
  available.
- The mailing list has been moved to the leafnode.org domain. See README.

### BUGFIXES
- A configuration --without-ipv6 now compiles again.
  Patch by Michael Bäuerle.
- Leafnode recognizes an EEXIST error to rmdir() the same as ENOTEMPTY.
  Patch by Gary R. Schmidt.
- Leafnode no longer trashes the stack if it, while scanning the message.id
  directory, finds a directory with an all-numeric name that is 1000 or
  higher. Reported by Matthias Gerstner.

===========================================================================

6 files changed, 12 insertions, 97 deletions

diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index 38609d55fe2..cbb07f99d7e 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.52 2020/11/10 12:03:59 micha Exp $
+# $NetBSD: Makefile,v 1.53 2021/05/07 11:09:35 micha Exp $
 
-DISTNAME=		leafnode-1.11.11
-PKGREVISION=		1
+DISTNAME=		leafnode-1.11.12
 CATEGORIES=		news
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=leafnode/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		micha@NetBSD.org
 HOMEPAGE=		https://leafnode.sourceforge.io/
 COMMENT=		NNTP server for small (dialup) sites
 LICENSE=		mit AND gnu-gpl-v2 AND gnu-lgpl-v2.1
diff --git a/news/leafnode/distinfo b/news/leafnode/distinfo
index 38d2193e9f1..8ba1a9da63e 100644
--- a/news/leafnode/distinfo
+++ b/news/leafnode/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.21 2020/11/10 12:03:59 micha Exp $
+$NetBSD: distinfo,v 1.22 2021/05/07 11:09:35 micha Exp $
 
-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-miscutil.c) = db32f666272c46e7b580d459094178631f275653
-SHA1 (patch-xoverutil.c) = eb7c181aa033a587f53d66cd4d05791c60f49a7c
+SHA1 (leafnode-1.11.12.tar.bz2) = 2a718721413ea0954674df3b094c30dd0550cc54
+RMD160 (leafnode-1.11.12.tar.bz2) = 0c18d66a8e404a04fbc7dcf8efc67a64c590ec55
+SHA512 (leafnode-1.11.12.tar.bz2) = 2460bb4fc51a716059ccfcde7fd99f2f0f8c11f7d20db457c06abb04a39f892331b1e70334901c9f20480f348186465be147ee21368fcd48c9e08bb3c8d7fe87
+Size (leafnode-1.11.12.tar.bz2) = 501619 bytes
+SHA1 (patch-Makefile.in) = 28dd40d5af8316a1a234affa71b807e3ad15c8f1
diff --git a/news/leafnode/patches/patch-Makefile.in b/news/leafnode/patches/patch-Makefile.in
index 6b650380937..d3557c14d05 100644
--- a/news/leafnode/patches/patch-Makefile.in
+++ b/news/leafnode/patches/patch-Makefile.in
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile.in,v 1.1 2018/09/04 11:00:48 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2021/05/07 11:09:35 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
-@@ -954,20 +954,20 @@ uninstall-man8:
+@@ -956,20 +956,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 @@ Spool directory is created with pkgsrc script.
  
  uninstall-sysconfDATA:
  	@$(NORMAL_UNINSTALL)
-@@ -1621,17 +1621,17 @@ rpm:	leafnode.spec
+@@ -1624,17 +1624,17 @@ rpm:	leafnode.spec
  	rpmbuild -ba leafnode.spec || rpm -ba leafnode.spec
  
  install-data-hook: amiroot
diff --git a/news/leafnode/patches/patch-checkpeerlocal.c b/news/leafnode/patches/patch-checkpeerlocal.c
deleted file mode 100644
index 47e5825f18b..00000000000
--- a/news/leafnode/patches/patch-checkpeerlocal.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$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 --git a/news/leafnode/patches/patch-miscutil.c b/news/leafnode/patches/patch-miscutil.c
deleted file mode 100644
index 624159983dc..00000000000
--- a/news/leafnode/patches/patch-miscutil.c
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-miscutil.c,v 1.1 2020/11/10 12:03:59 micha Exp $
-
-Leafnode no longer trashes the stack if it, while scanning the message.id
-directory, finds a directory with an all-numeric name that is 1000 or higher.
-https://gitlab.com/leafnode-2/leafnode-1/-/commit/33e7e308d60d774b7f67c1a59851ce3718ed0355
-
---- miscutil.c.orig	2013-06-10 18:16:31.000000000 +0000
-+++ miscutil.c
-@@ -63,13 +63,16 @@ static const mode_t default_umask = 0002
- struct xoverinfo *xoverinfo;
- unsigned long xfirst, xlast;
- 
-+/* kludge around C89 const not being a compile-time constant */
-+enum { hashsize = 1000 };
-+
- static int
- createmsgiddir(void) {
-     mastr *dir = mastr_new(1024);
-     mastr *mid = mastr_new(1024);
-     DIR *d;
-     int rc = 0;
--    int havedir[1000] = {0};
-+    int havedir[hashsize] = {0};
- 
-     mastr_vcat(dir, spooldir, "/message.id", NULL);
-     d = opendir(mastr_str(dir));
-@@ -84,7 +87,7 @@ createmsgiddir(void) {
- 	    t = de->d_name;
- 	    if (isdigit((unsigned char)*t)) {
- 		u = strtoul(t, &e, 10);
--		if (e > t)
-+		if (e > t && u < hashsize)
- 		    havedir[u] = 1;
- 	    }
- 	}
-@@ -96,7 +99,7 @@ createmsgiddir(void) {
- 	closedir(d);
- 
- 	/* create missing */
--	for(u = 0; u < 1000; u++) {
-+	for(u = 0; u < hashsize; u++) {
- 	    char b[4];
- 
- 	    snprintf(b, sizeof(b), "%03lu", u);
diff --git a/news/leafnode/patches/patch-xoverutil.c b/news/leafnode/patches/patch-xoverutil.c
deleted file mode 100644
index 33dc46ede57..00000000000
--- a/news/leafnode/patches/patch-xoverutil.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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);