Re: [PR PATCH] [Updated] strongswan: update to 5.9.14.

[icp1994 <icp1994@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 484 bytes --]

There is an updated pull request by icp1994 against master on the void-packages repository

https://github.com/icp1994/void-packages strongswan
https://github.com/void-linux/void-packages/pull/49464

strongswan: update to 5.9.14.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture: **x86_64**

A patch file from https://github.com/void-linux/void-packages/pull/49464.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strongswan-49464.patch --]
[-- Type: text/x-diff, Size: 5471 bytes --]

From 346cc75c07ecc9624b39deb72cddaa625b1a79be Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 19 Mar 2024 19:15:04 +0530
Subject: [PATCH] strongswan: update to 5.9.14.

---
 .../strongswan/patches/0001-fix-musl.patch    | 41 ++++++++++++
 .../strongswan/patches/0002-fix-musl.patch    | 62 +++++++++++++++++++
 srcpkgs/strongswan/template                   |  4 +-
 3 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/strongswan/patches/0001-fix-musl.patch
 create mode 100644 srcpkgs/strongswan/patches/0002-fix-musl.patch

diff --git a/srcpkgs/strongswan/patches/0001-fix-musl.patch b/srcpkgs/strongswan/patches/0001-fix-musl.patch
new file mode 100644
index 00000000000000..eb9233f2a444e0
--- /dev/null
+++ b/srcpkgs/strongswan/patches/0001-fix-musl.patch
@@ -0,0 +1,41 @@
+From 540881627fe8083207f9a2cfd01b931164c7ef4e Mon Sep 17 00:00:00 2001
+From: Tobias Brunner <tobias@strongswan.org>
+Date: Fri, 22 Mar 2024 10:42:34 +0100
+Subject: [PATCH] farp: Fix build with musl C library
+
+Same issue as described in the previous commit.
+
+Fixes: 187c72d1afdc ("dhcp: Port the plugin to FreeBSD/macOS")
+---
+ src/libcharon/plugins/farp/farp_spoofer.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/libcharon/plugins/farp/farp_spoofer.c b/src/libcharon/plugins/farp/farp_spoofer.c
+index 65451263f5f..7f2c9bef419 100644
+--- a/src/libcharon/plugins/farp/farp_spoofer.c
++++ b/src/libcharon/plugins/farp/farp_spoofer.c
+@@ -20,12 +20,14 @@
+ 
+ #include <errno.h>
+ #include <unistd.h>
++#include <net/ethernet.h>
+ #include <sys/ioctl.h>
+ 
+ #if !defined(__APPLE__) && !defined(__FreeBSD__)
+ #include <sys/socket.h>
+-#include <linux/if_arp.h>
+-#include <linux/if_ether.h>
++#include <net/if_arp.h>
++#include <netinet/if_ether.h>
++#include <netpacket/packet.h>
+ #include <linux/filter.h>
+ #else
+ #include <net/bpf.h>
+@@ -33,7 +35,6 @@
+ #include <net/if_dl.h>
+ #endif /* !defined(__APPLE__) && !defined(__FreeBSD__) */
+ 
+-#include <net/ethernet.h>
+ #include <daemon.h>
+ #include <threading/thread.h>
+ #include <processing/jobs/callback_job.h>
diff --git a/srcpkgs/strongswan/patches/0002-fix-musl.patch b/srcpkgs/strongswan/patches/0002-fix-musl.patch
new file mode 100644
index 00000000000000..a83cb14afd96ed
--- /dev/null
+++ b/srcpkgs/strongswan/patches/0002-fix-musl.patch
@@ -0,0 +1,62 @@
+From f5b1ca4ef60bc4fca91f0d1e852ef8447d23c99a Mon Sep 17 00:00:00 2001
+From: Tobias Brunner <tobias@strongswan.org>
+Date: Fri, 22 Mar 2024 09:57:07 +0100
+Subject: [PATCH] pf-handler: Fix build with musl C library
+
+musl's headers define a lot of networking structs.  For some, the
+definition in the Linux UAPI headers is then suppressed by e.g.
+__UAPI_DEF_ETHHDR.
+
+Since we included musl's net/ethernet.h, which includes netinet/if_ether.h
+that defines `struct ethhdr` (and the above constant), **after** we
+include linux/if_ether.h, there was a compilation error because the
+struct was defined multiple times.
+
+However, simply moving that include doesn't fix the problem because for
+ARP-specific structs the Linux headers don't provide __UAPI_DEF* checks.
+So instead of directly including the linux/ headers, we include those
+provided by the C library.  For glibc these usually just include the
+Linux headers, but for musl this allows them to define the struct
+directly.  We also need to move if.h and add packet.h, which define
+other structs (or include headers that do so) that we use.
+
+Fixes: 187c72d1afdc ("dhcp: Port the plugin to FreeBSD/macOS")
+---
+ src/libcharon/network/pf_handler.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/libcharon/network/pf_handler.c b/src/libcharon/network/pf_handler.c
+index 91b0e7507f9..43ef432ba60 100644
+--- a/src/libcharon/network/pf_handler.c
++++ b/src/libcharon/network/pf_handler.c
+@@ -20,23 +20,23 @@
+ 
+ #include <library.h>
+ #include <unistd.h>
++#include <errno.h>
++#include <net/ethernet.h>
++#include <net/if.h>
++#include <sys/ioctl.h>
+ 
+ #if !defined(__APPLE__) && !defined(__FreeBSD__)
+-#include <linux/if_arp.h>
+-#include <linux/if_ether.h>
++#include <net/if_arp.h>
++#include <netinet/if_ether.h>
++#include <netpacket/packet.h>
+ #include <linux/filter.h>
+ #else
+ #include <fcntl.h>
+ #include <ifaddrs.h>
+ #include <net/bpf.h>
+-#include <net/if.h>
+ #include <net/if_dl.h>
+ #endif /* !defined(__APPLE__) && !defined(__FreeBSD__) */
+ 
+-#include <errno.h>
+-#include <net/ethernet.h>
+-#include <sys/ioctl.h>
+-
+ #if !defined(__APPLE__) && !defined(__FreeBSD__)
+ 
+ /**
diff --git a/srcpkgs/strongswan/template b/srcpkgs/strongswan/template
index a90add5d823292..ee4089c3723868 100644
--- a/srcpkgs/strongswan/template
+++ b/srcpkgs/strongswan/template
@@ -1,6 +1,6 @@
 # Template file for 'strongswan'
 pkgname=strongswan
-version=5.9.13
+version=5.9.14
 revision=1
 build_style=gnu-configure
 # tpm support waits on libtss2
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 changelog="https://raw.githubusercontent.com/strongswan/strongswan/master/NEWS"
 distfiles="https://download.strongswan.org/strongswan-${version}.tar.bz2"
-checksum=56e30effb578fd9426d8457e3b76c8c3728cd8a5589594b55649b2719308ba55
+checksum=728027ddda4cb34c67c4cec97d3ddb8c274edfbabdaeecf7e74693b54fc33678
 make_dirs="/etc/ipsec.d/ 0755 root root
  /etc/ipsec.d/aacerts 0755 root root
  /etc/ipsec.d/acerts 0755 root root