libreswan: update to version 4.8

[Andrew Cagney <andrew.cagney%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Andrew Cagney <andrew.cagney%gmail.com@localhost>
Pushed By:	cagney
Date:		Mon Oct 3 21:33:10 2022 +0000
Changeset:	78dcca86519fbfcf6ae0a8b8f072cc5bc0148481

Modified Files:
	libreswan/COMMIT_MSG
	libreswan/Makefile
	libreswan/distinfo
Removed Files:
	libreswan/patches/patch-kvm
	libreswan/patches/patch-mk_defaults_netbsd.mk

Log Message:
libreswan: update to version 4.8

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=78dcca86519fbfcf6ae0a8b8f072cc5bc0148481

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libreswan/COMMIT_MSG                          |  2 +-
 libreswan/Makefile                            | 14 ++++++++------
 libreswan/distinfo                            |  8 +++-----
 libreswan/patches/patch-kvm                   | 25 -------------------------
 libreswan/patches/patch-mk_defaults_netbsd.mk | 19 -------------------
 5 files changed, 12 insertions(+), 56 deletions(-)

diffs:
diff --git a/libreswan/COMMIT_MSG b/libreswan/COMMIT_MSG
index d59306e2db..9871e9c8d6 100644
--- a/libreswan/COMMIT_MSG
+++ b/libreswan/COMMIT_MSG
@@ -1,4 +1,4 @@
-Libreswan: import version 4.7
+Libreswan: import version 4.8
 
 Libreswan is an Internet Key Exchange (IKE) daemon for managing IPsec.
 
diff --git a/libreswan/Makefile b/libreswan/Makefile
index 9485c4605f..cd13936357 100644
--- a/libreswan/Makefile
+++ b/libreswan/Makefile
@@ -6,7 +6,7 @@
 # specific overides in mk/default/*.mk (for instance,
 # mk/default/netbsd.mk).
 
-DISTNAME=	libreswan-4.7
+DISTNAME=	libreswan-4.8
 CATEGORIES=	security
 MASTER_SITES=	https://download.libreswan.org/
 
@@ -23,18 +23,20 @@ USE_TOOLS+=	bison
 #default is: USE_LANGUAGES+=	c
 
 DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
-# weak dependency
+
+# Logroate isn't required; just recommended.
+# Logroate isn't installed into examples:
+#   https://github.com/libreswan/libreswan/issues/767
+#EGDIR=		${PREFIX}/share/examples/libreswan
 #DEPENDS+=	logrotate-[0-9]*:../../sysutils/logrotate
+#CONF_FILES+=	${EGDIR}/logrotate.d/ipsec ${PKG_SYSCONFDIR}/logrotate.d/ipsec
+#MAKE_DIRS+=	${PKG_SYSCONFDIR}/logrotate.d
 
 CHECK_PORTABILITY_SKIP=	mk/docker-targets.mk
 
 # code not clean enough
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
-# see https://github.com/libreswan/libreswan/issues/769
-MAKE_FLAGS+=	PYTHON_BINARY=${PYTHONBIN}
-.include "../../lang/python/application.mk"
-
 # libevent?
 .include "../../net/unbound/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/libreswan/distinfo b/libreswan/distinfo
index fe7446fde3..5b6dc7180c 100644
--- a/libreswan/distinfo
+++ b/libreswan/distinfo
@@ -1,7 +1,5 @@
 $NetBSD$
 
-BLAKE2s (libreswan-4.7.tar.gz) = 952887f1381b00a672e05e9baa4d4bb899cd07c4809dc8f365fc06e9791cbd6d
-SHA512 (libreswan-4.7.tar.gz) = aea958be5512e08ea809145021695edd4e7df4487a0f3ba94c4d0165113647195c1c1599cd5fbbbfae8f6a2bebf39d7514a694f86297c29c543b1a63646ca44e
-Size (libreswan-4.7.tar.gz) = 3684167 bytes
-SHA1 (patch-kvm) = 7864fd394df006829ab758d579d248d3cc0defb8
-SHA1 (patch-mk_defaults_netbsd.mk) = 36e3b00088466d0c8ea7ed85e5581d42a374e419
+BLAKE2s (libreswan-4.8.tar.gz) = 65cff65e3e46fd4e985d8b06f9ba53d598be83e4b2a3902ab44d7bf36e65c84b
+SHA512 (libreswan-4.8.tar.gz) = f11e9c9f23871d6c6e8b0761d03c87923c055004cc50a7a4d1c1a4296b940159912294ceea0f9d125e9fd99a6c979399dc70957fdd698617015058d483030cec
+Size (libreswan-4.8.tar.gz) = 3702351 bytes
diff --git a/libreswan/patches/patch-kvm b/libreswan/patches/patch-kvm
deleted file mode 100644
index c5c1f25e56..0000000000
--- a/libreswan/patches/patch-kvm
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-Fix unportable test(1) operator.
-
---- kvm.orig	2022-05-24 17:23:22.000000000 +0000
-+++ kvm
-@@ -164,15 +164,15 @@ BEGIN {
- #
- # ${pass1}, ${pass2} and ${hosts} contain completion values.
- 
--if test "$1" == $0 -a $# -eq 3 ; then
-+if test "$1" = $0 -a $# -eq 3 ; then
-     command=$1
-     word=$2
-     previous=$3
-     # hack to detect first vs later argument
--    if test "${previous}" == "${command}" ; then
-+    if test "${previous}" = "${command}" ; then
- 	# first command
- 	compgen -W "${pass1} ${pass2}" "${word}" | sort
--    elif test "${previous}" == sh ; then
-+    elif test "${previous}" = sh ; then
- 	# pass 1 command
- 	compgen -W "${hosts}" "${word}"
-     else
diff --git a/libreswan/patches/patch-mk_defaults_netbsd.mk b/libreswan/patches/patch-mk_defaults_netbsd.mk
deleted file mode 100644
index 2c315ab04c..0000000000
--- a/libreswan/patches/patch-mk_defaults_netbsd.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Backport patch from upstream.
-
-commit 8861abd461ad049f915fb4aad8ac123188f407a7
-Author: Andrew Cagney <cagney%gnu.org@localhost>
-Date:   Tue Jun 14 20:54:55 2022 -0400
-
-    NetBSD: install manual pages in $(PREFIX)/man
-
-    not share/man
-
---- mk/defaults/netbsd.mk.orig	2022-05-24 17:23:22.000000000 +0000
-+++ mk/defaults/netbsd.mk
-@@ -30,3 +30,4 @@ FINALRUNDIR=/var/run/pluto
- FINALSYSCONFDIR=$(PREFIX)/etc
- FINALNSSDIR=$(PREFIX)/etc/ipsec.d
- FINALEXAMPECONFDIR=$(PREFIX)/share/examples/libreswan
-+FINALMANDIR=$(PREFIX)/man