diff options
| author | Gyorgy Sarvari <skandigraun@gmail.com> | 2025-08-08 19:31:22 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-08-11 18:04:25 +0100 |
| commit | 70530d7b39ec173a539af0ae9926d7a89764a481 (patch) | |
| tree | a6f65e788a082bdf3aadcf3f8b1a71661a857cfa | |
| parent | 98f4b6dce000a18ac3b1be592b96f3eb38c07afb (diff) | |
| download | poky-70530d7b39ec173a539af0ae9926d7a89764a481.tar.gz | |
rpm-sequoia-crypto-policy: update to latest revision
0001-libreswan-Allow-skipping-test_config-for-old-ipsec.patch
patch was dropped, as it is included in this revision.
(From OE-Core rev: f9d328b0f3a87b3aeb5fd7193429482cbc2220af)
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2 files changed, 2 insertions, 34 deletions
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 @@ | |||
| 1 | From f7a8e2c049c2c3e2bfcb801d7b65214c0a5bad77 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yoann Congal <yoann.congal@smile.fr> | ||
| 3 | Date: Tue, 15 Apr 2025 17:27:20 +0200 | ||
| 4 | Subject: [PATCH] libreswan: Allow skipping test_config for old ipsec | ||
| 5 | |||
| 6 | In some case, /usr/sbin/ipsec does not handle the readwriteconf command. | ||
| 7 | e.g. on Debian 12 with strongswan installed. | ||
| 8 | As with the other OLD_* variables, add an OLD_LIBRESWAN environment | ||
| 9 | variable to skip configuration testing on those systems. | ||
| 10 | |||
| 11 | Signed-off-by: Yoann Congal <yoann.congal@smile.fr> | ||
| 12 | Upstream-Status: Backport [https://gitlab.com/redhat-crypto/fedora-crypto-policies/-/merge_requests/237] | ||
| 13 | --- | ||
| 14 | python/policygenerators/libreswan.py | 2 ++ | ||
| 15 | 1 file changed, 2 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/python/policygenerators/libreswan.py b/python/policygenerators/libreswan.py | ||
| 18 | index a2b02f5..d81ec0c 100644 | ||
| 19 | --- a/python/policygenerators/libreswan.py | ||
| 20 | +++ b/python/policygenerators/libreswan.py | ||
| 21 | @@ -227,6 +227,8 @@ class LibreswanGenerator(ConfigGenerator): | ||
| 22 | |||
| 23 | @classmethod | ||
| 24 | def test_config(cls, config): | ||
| 25 | + if os.getenv('OLD_LIBRESWAN') == '1': | ||
| 26 | + return True | ||
| 27 | if not os.access('/usr/sbin/ipsec', os.X_OK): | ||
| 28 | return True | ||
| 29 | |||
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" | |||
| 8 | # Python 3.11+ is needed to build fedora-crypto-policies | 8 | # Python 3.11+ is needed to build fedora-crypto-policies |
| 9 | inherit allarch python3native | 9 | inherit allarch python3native |
| 10 | 10 | ||
| 11 | SRC_URI = " \ | 11 | SRC_URI = "git://gitlab.com/redhat-crypto/fedora-crypto-policies.git;protocol=https;branch=master" |
| 12 | git://gitlab.com/redhat-crypto/fedora-crypto-policies.git;protocol=https;branch=master \ | ||
| 13 | file://0001-libreswan-Allow-skipping-test_config-for-old-ipsec.patch \ | ||
| 14 | " | ||
| 15 | 12 | ||
| 16 | SRCREV = "032b418a6db842f0eab330eb5909e4604e888728" | 13 | SRCREV = "ae1df75b1155294ebbd3c84fd206ffb55414c3ec" |
| 17 | UPSTREAM_CHECK_COMMITS = "1" | 14 | UPSTREAM_CHECK_COMMITS = "1" |
| 18 | 15 | ||
| 19 | do_compile () { | 16 | do_compile () { |
