From 266d946c931a0b65f43c82e77fc4e6795793f09f Mon Sep 17 00:00:00 2001
From: Evan Maddock <maddock.evan@vivaldi.net>
Date: Sat, 20 Dec 2025 15:56:59 -0500
Subject: [PATCH] libreswan: Packaging fixes

**Summary**
- Make the build configuration a little more obvious.
- Fix an issue where starting fails.
- Fix PAM config location.

Signed-off-by: Evan Maddock <maddock.evan@vivaldi.net>
---
 packages/l/libreswan/abi_used_symbols         |  1 +
 packages/l/libreswan/files/libreswan.tmpfiles |  1 -
 packages/l/libreswan/package.yml              | 26 +++++++++----------
 packages/l/libreswan/pspec_x86_64.xml         | 11 ++++----
 4 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 packages/l/libreswan/files/libreswan.tmpfiles

diff --git a/packages/l/libreswan/abi_used_symbols b/packages/l/libreswan/abi_used_symbols
index 2513892db1d..cc22d3ebb71 100644
--- a/packages/l/libreswan/abi_used_symbols
+++ b/packages/l/libreswan/abi_used_symbols
@@ -56,6 +56,7 @@ libc.so.6:getaddrinfo
 libc.so.6:getc
 libc.so.6:getcwd
 libc.so.6:getdtablesize
+libc.so.6:getenv
 libc.so.6:gethostname
 libc.so.6:getifaddrs
 libc.so.6:getopt_long
diff --git a/packages/l/libreswan/files/libreswan.tmpfiles b/packages/l/libreswan/files/libreswan.tmpfiles
deleted file mode 100644
index fa26610210c..00000000000
--- a/packages/l/libreswan/files/libreswan.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/lib/ipsec/nss 0700 root root -
diff --git a/packages/l/libreswan/package.yml b/packages/l/libreswan/package.yml
index ac8067b12fa..330fd1273f9 100644
--- a/packages/l/libreswan/package.yml
+++ b/packages/l/libreswan/package.yml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=/usr/share/ypkg/schema/schema.json
 name       : libreswan
 version    : '5.3'
-release    : 13
+release    : 14
 source     :
     - https://download.libreswan.org/libreswan-5.3.tar.gz : c1d350c3f3296fd21b9db0794e23d3f319b292f880bf8178b82ef5c6391c60c0
 homepage   : https://libreswan.org/
@@ -23,19 +23,19 @@ builddeps  :
 conflicts  :
     - strongswan
 environment: |
-    export PREFIX=/usr
-    export USE_DNSSEC=false
-    export WERROR_CFLAGS=
+    libreswan_config=(
+        PREFIX=%PREFIX%
+        INITSYSTEM=systemd
+        MANDIR=%PREFIX%/share/man
+        PAMCONFDIR=%PREFIX%/share/defaults/etc/pam.d
+        PENSWARETC=%PREFIX%/share/defaults
+        SYSCONFDIR=%PREFIX%/share/defaults
+        USE_DNSSEC=false
+    )
 build      : |
-    %make programs 
+    %make "${libreswan_config[@]}" programs
 install    : |
-    %make_install \
-        MANDIR=/usr/share/man \
-        SYSCONFDIR=/usr/share/defaults \
-        PENSWARETC=/usr/share/defaults
+    %make_install "${libreswan_config[@]}"
     %install_license COPYING
 
-    install -D -m 00644 $pkgfiles/libreswan.tmpfiles $installdir/%libdir%/tmpfiles.d/libreswan.conf
-
-    rm -r $installdir/etc
-    rm -r $installdir/var
+    rm -rvf ${installdir}/var
diff --git a/packages/l/libreswan/pspec_x86_64.xml b/packages/l/libreswan/pspec_x86_64.xml
index ad14a418d4b..51d44616927 100644
--- a/packages/l/libreswan/pspec_x86_64.xml
+++ b/packages/l/libreswan/pspec_x86_64.xml
@@ -20,7 +20,8 @@
 </Description>
         <PartOf>network.util</PartOf>
         <Files>
-            <Path fileType="library">/usr/lib64/tmpfiles.d/libreswan.conf</Path>
+            <Path fileType="library">/usr/lib/systemd/system/ipsec.service</Path>
+            <Path fileType="library">/usr/lib/tmpfiles.d/libreswan.conf</Path>
             <Path fileType="executable">/usr/libexec/ipsec/_asn1check</Path>
             <Path fileType="executable">/usr/libexec/ipsec/_dncheck</Path>
             <Path fileType="executable">/usr/libexec/ipsec/_enumcheck</Path>
@@ -51,6 +52,7 @@
             <Path fileType="executable">/usr/libexec/ipsec/showroute</Path>
             <Path fileType="executable">/usr/libexec/ipsec/whack</Path>
             <Path fileType="executable">/usr/sbin/ipsec</Path>
+            <Path fileType="data">/usr/share/defaults/etc/pam.d/pluto</Path>
             <Path fileType="data">/usr/share/defaults/ipsec.conf</Path>
             <Path fileType="data">/usr/share/defaults/ipsec.d/policies/block</Path>
             <Path fileType="data">/usr/share/defaults/ipsec.d/policies/clear</Path>
@@ -60,9 +62,6 @@
             <Path fileType="data">/usr/share/defaults/ipsec.d/policies/private-or-clear</Path>
             <Path fileType="data">/usr/share/defaults/ipsec.secrets</Path>
             <Path fileType="data">/usr/share/defaults/logrotate.d/libreswan</Path>
-            <Path fileType="data">/usr/share/defaults/pam.d/pluto</Path>
-            <Path fileType="data">/usr/share/defaults/sysconfig/pluto</Path>
-            <Path fileType="doc">/usr/share/doc/libreswan/init.d/ipsec.init</Path>
             <Path fileType="doc">/usr/share/doc/libreswan/ipsec.conf-sample</Path>
             <Path fileType="doc">/usr/share/doc/libreswan/ipsec.d/policies/block</Path>
             <Path fileType="doc">/usr/share/doc/libreswan/ipsec.d/policies/clear</Path>
@@ -142,8 +141,8 @@
         </Conflicts>
     </Package>
     <History>
-        <Update release="13">
-            <Date>2025-12-17</Date>
+        <Update release="14">
+            <Date>2025-12-20</Date>
             <Version>5.3</Version>
             <Comment>Packaging update</Comment>
             <Name>Evan Maddock</Name>