libreswan: update to 1.12nb2; backport esp=aes_gcm fix

[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 Sep 4 14:52:14 2023 +0000
Changeset:	9ec043f5204f8ae00444ad31aae17ebb4531fa3e

Modified Files:
	libreswan/Makefile
	libreswan/distinfo
Added Files:
	libreswan/patches/patch-programs_pluto_kernel_pfkeyv2.c

Log Message:
libreswan: update to 1.12nb2; backport esp=aes_gcm fix

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

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

diffstat:
 libreswan/Makefile                                 |  2 +-
 libreswan/distinfo                                 |  1 +
 .../patches/patch-programs_pluto_kernel_pfkeyv2.c  | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diffs:
diff --git a/libreswan/Makefile b/libreswan/Makefile
index 8239060121..fb200b0034 100644
--- a/libreswan/Makefile
+++ b/libreswan/Makefile
@@ -7,7 +7,7 @@
 # mk/default/netbsd.mk).
 
 DISTNAME=	libreswan-4.12
-PKGREVISION=	1
+PKGREVISION=	2
 MASTER_SITES=	https://download.libreswan.org/
 
 CATEGORIES=	security
diff --git a/libreswan/distinfo b/libreswan/distinfo
index 829bb96d14..00fd1977e0 100644
--- a/libreswan/distinfo
+++ b/libreswan/distinfo
@@ -4,3 +4,4 @@ BLAKE2s (libreswan-4.12.tar.gz) = 397c455b67e112d0407b2b6e0fbe1f6e4bec4422c747a5
 SHA512 (libreswan-4.12.tar.gz) = 3a7f5ea5d97da357a8979a8807694a316d42ccc5f9c7b5867041abf2b9316ff8428f24cf307b6b6073c191896c0417f137abf78f9903aecde5e1ee1182577ce0
 Size (libreswan-4.12.tar.gz) = 3718440 bytes
 SHA1 (patch-lib_libswan_x509.c) = 5f660e6186232be02c4c8ecadb905fcb5a1801be
+SHA1 (patch-programs_pluto_kernel_pfkeyv2.c) = 1daad00223d30d409b62a2d4dc932f6d1f91f9d6
diff --git a/libreswan/patches/patch-programs_pluto_kernel_pfkeyv2.c b/libreswan/patches/patch-programs_pluto_kernel_pfkeyv2.c
new file mode 100644
index 0000000000..b2dca4392d
--- /dev/null
+++ b/libreswan/patches/patch-programs_pluto_kernel_pfkeyv2.c
@@ -0,0 +1,22 @@
+--- programs/pluto/kernel_pfkeyv2.c
++++ programs/pluto/kernel_pfkeyv2.c
+@@ -25,6 +25,7 @@
+ #include "ip_encap.h"
+ #include "chunk.h"
+ #include "hunk.h"
++#include "ike_alg_integ.h"	/* for ike_alg_integ_none; */
+ 
+ #include "kernel.h"
+ #include "kernel_alg.h"
+@@ -265,8 +266,10 @@ static struct sadb_sa *put_sadb_sa(struct outbuf *msg,
+ 				   const struct encrypt_desc *encrypt,
+ 				   const struct ipcomp_desc *ipcomp)
+ {
+-	unsigned aalg = (integ != NULL ? integ->integ_sadb_aalg_id :
++	unsigned aalg = (integ == &ike_alg_integ_none && encrypt_desc_is_aead(encrypt) ? SADB_AALG_NONE :
++			 integ != NULL ? integ->integ_sadb_aalg_id :
+ 			 0);
++
+ 	unsigned ealg = (encrypt != NULL ? encrypt->encrypt_sadb_ealg_id :
+ 			 /* XXX: NetBSD treats IPCOMP like ENCRYPT */
+ 			 ipcomp != NULL ? ipcomp->ipcomp_sadb_calg_id : 0);