libreswan: update to 4.14

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

Module Name:	pkgsrc-wip
Committed By:	Andrew Cagney <andrew.cagney%gmail.com@localhost>
Pushed By:	cagney
Date:		Tue Mar 12 02:48:49 2024 +0000
Changeset:	d1a8520c2fc325c7d7c6f97f73b2826623efbf61

Modified Files:
	libreswan/Makefile
	libreswan/distinfo
Removed Files:
	libreswan/patches/patch-include_ip_index.h
	libreswan/patches/patch-include_ip_info.h
	libreswan/patches/patch-lib_libswan_ip_info.c

Log Message:
libreswan: update to 4.14

* Fix compile error in 4.13 in gntoid() [Andrew]
* testing: fixup ikev2-tfc-03 for padded packets [Andrew/Paul]

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

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

diffstat:
 libreswan/Makefile                            |  4 +--
 libreswan/distinfo                            |  9 +++----
 libreswan/patches/patch-include_ip_index.h    | 33 ------------------------
 libreswan/patches/patch-include_ip_info.h     | 25 ------------------
 libreswan/patches/patch-lib_libswan_ip_info.c | 37 ---------------------------
 5 files changed, 5 insertions(+), 103 deletions(-)

diffs:
diff --git a/libreswan/Makefile b/libreswan/Makefile
index 8ac803b10d..274168cd3b 100644
--- a/libreswan/Makefile
+++ b/libreswan/Makefile
@@ -6,8 +6,8 @@
 # specific overides in mk/default/*.mk (for instance,
 # mk/default/netbsd.mk).
 
-DISTNAME=	libreswan-4.13
-PKGREVISION=	1
+DISTNAME=	libreswan-4.14
+PKGREVISION=	0
 MASTER_SITES=	https://download.libreswan.org/
 
 CATEGORIES=	security
diff --git a/libreswan/distinfo b/libreswan/distinfo
index 9ee0014d03..5f70f7c961 100644
--- a/libreswan/distinfo
+++ b/libreswan/distinfo
@@ -1,8 +1,5 @@
 $NetBSD$
 
-BLAKE2s (libreswan-4.13.tar.gz) = a35e41668cfdf79b8806dc231bd180e22230de60748b991b6d08d3dd3561bac3
-SHA512 (libreswan-4.13.tar.gz) = 551bd4e86f6642b2f4c2fae340f73b3fd5c36953a60ce89e37938cd4fcf7131470d3819100577f86baf75214d8b632067a066348620a3fe48d8ed3c26d9897a8
-Size (libreswan-4.13.tar.gz) = 3720846 bytes
-SHA1 (patch-include_ip_index.h) = 1da2e85a193b3fafac600ed3a2baf0faf243808d
-SHA1 (patch-include_ip_info.h) = c69dadb1252c3e2159a1a07a04a348972b32cda9
-SHA1 (patch-lib_libswan_ip_info.c) = 50d5b1a01a3f9ce71d4e6182e93262f1115e6549
+BLAKE2s (libreswan-4.14.tar.gz) = 327f2730fc1dd026c88e9507fc2528b1e077af9e8147acc7dadec80c0855e751
+SHA512 (libreswan-4.14.tar.gz) = fb4c4dc426530614d308a7c4f5d21123a166b1ad652f66393b45d4987a3e2be8e8bc135e7eedfe1c014db962b70f08108757f876e27cd9e7739a79764c6d4f2d
+Size (libreswan-4.14.tar.gz) = 3721106 bytes
diff --git a/libreswan/patches/patch-include_ip_index.h b/libreswan/patches/patch-include_ip_index.h
deleted file mode 100644
index 112dbfb5a0..0000000000
--- a/libreswan/patches/patch-include_ip_index.h
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/include/ip_index.h b/include/ip_index.h
-new file mode 100644
-index 0000000000..508589b05e
---- /dev/null
-+++ include/ip_index.h
-@@ -0,0 +1,27 @@
-+/* ip address type index, for libreswan
-+ *
-+ * Copyright (C) 2022 Andrew Cagney
-+ *
-+ * This library is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU Library General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or (at your
-+ * option) any later version.  See <https://www.gnu.org/licenses/lgpl-2.1.txt>.
-+ *
-+ * This library is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-+ * License for more details.
-+ *
-+ */
-+
-+#ifndef IP_INDEX_H
-+#define IP_INDEX_H
-+
-+enum ip_index {
-+	IPv4_INDEX,
-+	IPv6_INDEX,
-+};
-+
-+#define IP_INDEX_ROOF (IPv6_INDEX+1)
-+
-+#endif
diff --git a/libreswan/patches/patch-include_ip_info.h b/libreswan/patches/patch-include_ip_info.h
deleted file mode 100644
index 283cea766b..0000000000
--- a/libreswan/patches/patch-include_ip_info.h
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/include/ip_info.h b/include/ip_info.h
-index 40e99ef687..c1329a8569 100644
---- include/ip_info.h.dist
-+++ include/ip_info.h
-@@ -9,6 +9,7 @@
- #include "ip_subnet.h"
- #include "ip_selector.h"
- #include "ip_sockaddr.h"
-+#include "ip_index.h"
- 
- struct ip_info {
- 	/*
-@@ -113,8 +114,10 @@ struct ip_info {
- 
- };
- 
--extern const struct ip_info ipv4_info;
--extern const struct ip_info ipv6_info;
-+extern const struct ip_info ip_families[IP_INDEX_ROOF];
-+
-+#define ipv4_info ip_families[IPv4_INDEX]
-+#define ipv6_info ip_families[IPv6_INDEX]
- 
- extern const struct ip_info *aftoinfo(int af);
- 
diff --git a/libreswan/patches/patch-lib_libswan_ip_info.c b/libreswan/patches/patch-lib_libswan_ip_info.c
deleted file mode 100644
index e179c67382..0000000000
--- a/libreswan/patches/patch-lib_libswan_ip_info.c
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/lib/libswan/ip_info.c b/lib/libswan/ip_info.c
-index 70cd6a368f..97296d3a11 100644
---- lib/libswan/ip_info.c.dist
-+++ lib/libswan/ip_info.c
-@@ -158,7 +158,9 @@ static ip_port port_from_ipv6_sockaddr(const ip_sockaddr sa)
- 
- #define IPv4_FF { { 255, 255, 255, 255, }, }
- 
--const struct ip_info ipv4_info = {
-+const struct ip_info ip_families[IP_INDEX_ROOF] = {
-+
-+	[IPv4_INDEX] = {
- 
- 	.ip_version = IPv4,
- 	.ip_size = sizeof(struct in_addr),
-@@ -210,11 +212,11 @@ const struct ip_info ipv4_info = {
- 	.id_ip_addr = ID_IPV4_ADDR,
- 	.id_ip_addr_subnet = ID_IPV4_ADDR_SUBNET,
- 	.id_ip_addr_range = ID_IPV4_ADDR_RANGE,
--};
-+	},
- 
- #define IPv6_FF { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, }, }
- 
--const struct ip_info ipv6_info = {
-+	[IPv6_INDEX] = {
- 
- 	.ip_version = IPv6,
- 	.ip_size = sizeof(struct in6_addr),
-@@ -266,6 +268,7 @@ const struct ip_info ipv6_info = {
- 	.id_ip_addr = ID_IPV6_ADDR,
- 	.id_ip_addr_subnet = ID_IPV6_ADDR_SUBNET,
- 	.id_ip_addr_range = ID_IPV6_ADDR_RANGE,
-+	}
- };
- 
- const struct ip_info *aftoinfo(int af)