diff mbox series

[2/2] rpm-sequoia-crypto-policy: update to latest revision

Message ID 20250808173122.584652-2-skandigraun@gmail.com
State New
Headers show
Series [1/2] rpm-sequoia: upgrade 1.7.0 -> 1.9.0 | expand

Commit Message

Gyorgy Sarvari Aug. 8, 2025, 5:31 p.m. UTC 
0001-libreswan-Allow-skipping-test_config-for-old-ipsec.patch
patch was dropped, as it is included in this revision.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
 ...w-skipping-test_config-for-old-ipsec.patch | 29 -------------------
 .../rpm-sequoia-crypto-policy_git.bb          |  7 ++---
 2 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 meta/recipes-devtools/rpm-sequoia/rpm-sequoia-crypto-policy/0001-libreswan-Allow-skipping-test_config-for-old-ipsec.patch
diff mbox series

Patch

diff --git a/meta/recipes-devtools/rpm-sequoia/rpm-sequoia-crypto-policy/0001-libreswan-Allow-skipping-test_config-for-old-ipsec.patch b/meta/recipes-devtools/rpm-sequoia/rpm-sequoia-crypto-policy/0001-libreswan-Allow-skipping-test_config-for-old-ipsec.patch
deleted file mode 100644
index db3ea4b843..0000000000
--- a/meta/recipes-devtools/rpm-sequoia/rpm-sequoia-crypto-policy/0001-libreswan-Allow-skipping-test_config-for-old-ipsec.patch
+++ /dev/null
@@ -1,29 +0,0 @@ 
-From f7a8e2c049c2c3e2bfcb801d7b65214c0a5bad77 Mon Sep 17 00:00:00 2001
-From: Yoann Congal <yoann.congal@smile.fr>
-Date: Tue, 15 Apr 2025 17:27:20 +0200
-Subject: [PATCH] libreswan: Allow skipping test_config for old ipsec
-
-In some case, /usr/sbin/ipsec does not handle the readwriteconf command.
-e.g. on Debian 12 with strongswan installed.
-As with the other OLD_* variables, add an OLD_LIBRESWAN environment
-variable to skip configuration testing on those systems.
-
-Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
-Upstream-Status: Backport [https://gitlab.com/redhat-crypto/fedora-crypto-policies/-/merge_requests/237]
----
- python/policygenerators/libreswan.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/python/policygenerators/libreswan.py b/python/policygenerators/libreswan.py
-index a2b02f5..d81ec0c 100644
---- a/python/policygenerators/libreswan.py
-+++ b/python/policygenerators/libreswan.py
-@@ -227,6 +227,8 @@ class LibreswanGenerator(ConfigGenerator):
- 
-     @classmethod
-     def test_config(cls, config):
-+        if os.getenv('OLD_LIBRESWAN') == '1':
-+            return True
-         if not os.access('/usr/sbin/ipsec', os.X_OK):
-             return True
- 
diff --git a/meta/recipes-devtools/rpm-sequoia/rpm-sequoia-crypto-policy_git.bb b/meta/recipes-devtools/rpm-sequoia/rpm-sequoia-crypto-policy_git.bb
index 658b9ab36a..19b86ae391 100644
--- a/meta/recipes-devtools/rpm-sequoia/rpm-sequoia-crypto-policy_git.bb
+++ b/meta/recipes-devtools/rpm-sequoia/rpm-sequoia-crypto-policy_git.bb
@@ -8,12 +8,9 @@  LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
 # Python 3.11+ is needed to build fedora-crypto-policies
 inherit allarch python3native
 
-SRC_URI = " \
-    git://gitlab.com/redhat-crypto/fedora-crypto-policies.git;protocol=https;branch=master \
-    file://0001-libreswan-Allow-skipping-test_config-for-old-ipsec.patch \
-"
+SRC_URI = "git://gitlab.com/redhat-crypto/fedora-crypto-policies.git;protocol=https;branch=master"
 
-SRCREV = "032b418a6db842f0eab330eb5909e4604e888728"
+SRCREV = "ae1df75b1155294ebbd3c84fd206ffb55414c3ec"
 UPSTREAM_CHECK_COMMITS = "1"
 
 do_compile () {