fwknop: update to version 2.6.10

This release brings:

- [server] Add MAX_FW_TIMEOUT to access.conf stanzas to allow a maximum
  number of seconds for client-specified timeouts in SPA packets. This
  fixes issue #226 which was spotted by Jeremiah Rothschild.
- [server] Bug fix in CMD_EXEC mode to make sure to call exit() upon any
  error from execvpe(). Without this fix, additional fwknopd processes
  would be started upon a user specifying a command without the necessary
  permissions. This bug was reported by Stephen Isard.
- [build] Jeremie Courreges-Anglas and Ingo Feinerer contributed a patch
  to fix endian detection on OpenBSD systems based on information
  contained here: https://www.opengroup.org/austin/docs/austin_514.txt
- [client/server] (Michael Stair) Added client and server infrastructure
  written in Erlang. See the erlang/ directory.

5 files changed, 41 insertions, 46 deletions

diff --git a/net/fwknop/Makefile b/net/fwknop/Makefile
index ebc937a7a52..2041c25249c 100644
--- a/net/fwknop/Makefile
+++ b/net/fwknop/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2019/12/21 23:44:59 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2021/05/29 22:39:45 khorben Exp $
 
-DISTNAME=	fwknop-2.6.9
+DISTNAME=	fwknop-2.6.10
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mrash/}
 
@@ -18,17 +18,18 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
 
+RCD_SCRIPTS=		fwknopd
 EGDIR=			${PREFIX}/share/examples/fwknop
-CONF_FILES+=		${EGDIR}/access.conf \
-			${PKG_SYSCONFDIR}/fwknop/access.conf
-CONF_FILES+=		${EGDIR}/fwknopd.conf \
-			${PKG_SYSCONFDIR}/fwknop/fwknopd.conf
+CONF_FILES_PERMS+=	${EGDIR}/access.conf \
+			${PKG_SYSCONFDIR}/fwknop/access.conf \
+			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
+CONF_FILES_PERMS+=	${EGDIR}/fwknopd.conf \
+			${PKG_SYSCONFDIR}/fwknop/fwknopd.conf \
+			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
 INSTALLATION_DIRS+=	${EGDIR}
 
 INFO_FILES=	yes
 
-WRKSRC=		${WRKDIR}/fwknop-2.6.9
-
 pre-configure:
 	cd ${WRKSRC} && sh autogen.sh
 
diff --git a/net/fwknop/distinfo b/net/fwknop/distinfo
index 907982b368b..2345a0ecd3f 100644
--- a/net/fwknop/distinfo
+++ b/net/fwknop/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.1 2018/05/01 21:10:42 khorben Exp $
+$NetBSD: distinfo,v 1.2 2021/05/29 22:39:45 khorben Exp $
 
-SHA1 (fwknop-2.6.9.tar.gz) = d306c206bc0afd26cad3567584d5017348ebc13e
-RMD160 (fwknop-2.6.9.tar.gz) = 6409bc7fa4880070502e3c92ff60bf3aa3968b3f
-SHA512 (fwknop-2.6.9.tar.gz) = 4706560d44c911c8604059d88dded9c1b8c333399d90ec7dc366c0fba96c79680bdbf1b8b5e76cc34aaf3a1e58fff80db8f5f20c96d57481bdb476a9b99f4d1b
-Size (fwknop-2.6.9.tar.gz) = 3043542 bytes
-SHA1 (patch-common_netinet__common.h) = 14aba8c993916b6ce4bd035326e1b74735333c8b
-SHA1 (patch-configure.ac) = a17c487cb4f294f3800b5557ccb8124c64c679c4
+SHA1 (fwknop-2.6.10.tar.gz) = b0a70f5626e6e27a41259fc4f07e19c39da5df73
+RMD160 (fwknop-2.6.10.tar.gz) = ee14efc6e43cc9ac32f489f257ab2b19257092cd
+SHA512 (fwknop-2.6.10.tar.gz) = e6c34dad012921fc0773826c769df322f06fd9310e8f263d8b786d2acda0310763db566324a436ea539b5e0bd6a08ce22e9499f6566d61d6309d84927faa4cf4
+Size (fwknop-2.6.10.tar.gz) = 3030310 bytes
diff --git a/net/fwknop/files/fwknopd.sh b/net/fwknop/files/fwknopd.sh
new file mode 100644
index 00000000000..d7d0f3ba68f
--- /dev/null
+++ b/net/fwknop/files/fwknopd.sh
@@ -0,0 +1,27 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: fwknopd.sh,v 1.1 2021/05/29 22:39:46 khorben Exp $
+#
+# Startup script for fwknopd
+#
+# PROVIDE: fwknopd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# You will need to set some variables in /etc/rc.conf to start fwknopd:
+#
+# fwknopd=YES
+#
+# Optionally, "fwknopd_flags" contains additional parameters for the service.
+# See fwknopd(8) for possible options.
+
+. /etc/rc.subr
+
+name="fwknopd"
+rcvar=${name}
+command="@PREFIX@/bin/${name}"
+required_files="@PKG_SYSCONFDIR@/fwknop/fwknopd.conf"
+fwknopd_flags=
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/fwknop/patches/patch-common_netinet__common.h b/net/fwknop/patches/patch-common_netinet__common.h
deleted file mode 100644
index 4f24f311d95..00000000000
--- a/net/fwknop/patches/patch-common_netinet__common.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-common_netinet__common.h,v 1.1 2018/05/01 21:10:42 khorben Exp $
-
-Add support for NetBSD.
-
---- common/netinet_common.h.orig	2016-06-09 01:01:53.000000000 +0000
-+++ common/netinet_common.h
-@@ -45,7 +45,7 @@
-   #if HAVE_NETINET_IN_H
-     #include <netinet/in.h>
-   #endif
--  #if PLATFORM_OPENBSD  /* OpenBSD hack due to autoconf net/if.h difficulties */
-+  #if PLATFORM_NETBSD || PLATFORM_OPENBSD  /* for autoconf net/if.h difficulties */
-     #include <net/if.h>
-     #include <net/ethertypes.h>
-     #include <netinet/if_ether.h>
diff --git a/net/fwknop/patches/patch-configure.ac b/net/fwknop/patches/patch-configure.ac
deleted file mode 100644
index 81021dee26a..00000000000
--- a/net/fwknop/patches/patch-configure.ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2018/05/01 21:10:42 khorben Exp $
-
-Add support for NetBSD.
-
---- configure.ac.orig	2016-06-09 01:01:53.000000000 +0000
-+++ configure.ac
-@@ -412,6 +412,9 @@ use_mingw=no
- case "$host" in
- *-*-linux*)
-     ;;
-+*-*-netbsd*)
-+    AC_DEFINE_UNQUOTED([PLATFORM_NETBSD], [1], [Define if you are running on NetBSD])
-+    ;;
- *-*-openbsd*)
-     AC_DEFINE_UNQUOTED([PLATFORM_OPENBSD], [1], [Define if you are running on OpenBSD])
-     ;;