Skip to contentSkip to conversation

master-next updates

PATCH In review Scott Murray 2 participants 7 messages Jul 18, 2025 – Jul 21, 2025

lore
Share & tools
lore
#0 lore raw

cover master-next updates

Roll up the submissions since the first batch of whinlatter fixes, plus an upgrade of scap-security-guide to get it building again after the CMake 4.0 upgrade in oe-core.

A note about the ptest removal for scap-security-guide; while having comprehensive ptests is desirable, from the commit history it is clear that there was no interest in banging these ones into a working state in the last couple of years. As well, ptests are not enabled in most of the current CI build configurations, and it seems clear that the build time hit would be massive in this case if they were. If someone motivated to try to investigate resolving these issues appears, this decision can be revisited.

Changes:

Clayton Casciato (1):
suricata: fix "interface" arg in systemd service

Haixiao Yan (1):
samhain: Adapt test output to Automake format for ptest compatibility

Scott Murray (1):
scap-security-guide: upgrade 0.1.76 -> 0.1.77

Yi Zhao (1):
scap-security-guide: disable ptest

 .../scap-security-guide/files/run-ptest       |   7 --
 ....1.76.bb => scap-security-guide_0.1.77.bb} |  54 +---------
 ...t-output-to-match-Automake-standards.patch | 102 ++++++++++++++++++
 recipes-ids/samhain/samhain.inc               |   1 +
 recipes-ids/suricata/files/suricata.service   |   2 +-
 5 files changed, 106 insertions(+), 60 deletions(-)
 delete mode 100644 recipes-compliance/scap-security-guide/files/run-ptest
 rename recipes-compliance/scap-security-guide/{scap-security-guide_0.1.76.bb => scap-security-guide_0.1.77.bb} (50%)
 create mode 100644 recipes-ids/samhain/files/0001-Format-test-output-to-match-Automake-standards.patch
Signature · 1 line
2.50.0
#1 lore raw

PATCH 1/4 scap-security-guide: upgrade 0.1.76 -> 0.1.77

Update to latest version to pick up fixes required for building with CMake 4.0.

ChangeLog:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.77

---
 ...p-security-guide_0.1.76.bb => scap-security-guide_0.1.77.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename recipes-compliance/scap-security-guide/{scap-security-guide_0.1.76.bb => scap-security-guide_0.1.77.bb} (98%)
recipes-compliance/scap-security-guide/scap-security-guide_0.1.77.bb renamed from recipes-compliance/scap-security-guide/scap-security-guide_0.1.76.bb +1 -1
similarity index 98%
rename from recipes-compliance/scap-security-guide/scap-security-guide_0.1.76.bb
rename to recipes-compliance/scap-security-guide/scap-security-guide_0.1.77.bb
index b9f7a70..a082a70 100644
@@ -6,7 +6,7 @@ HOME_URL = "https://www.open-scap.org/security-policies/scap-security-guide/"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9bfa86579213cb4c6adaffface6b2820"
 LICENSE = "BSD-3-Clause"
 
-SRCREV = "616d4363527acb61c6494a97f3ceb47ec90f65fd"
+SRCREV = "c1e1ba121d32b3c319b0e25ee2993b62386e5857"
 SRC_URI = "git://github.com/ComplianceAsCode/content.git;nobranch=1;protocol=https \
            file://run_eval.sh \
            file://run-ptest \
Signature · 1 line
2.50.0
#2 lore raw

PATCH 2/4 scap-security-guide: disable ptest

In reply to Scott Murray

From: Yi Zhao <[email protected]>

Enabling ptest will significantly increase build time. Additionally, since the ptest distro_feature is enabled by default in poky distro, build time can be very long, which is annoying.

On my build host:
Enable ptest:

$ time build scap-security-guide
real    219m54.529s
user    0m49.040s
sys     0m1.304s

Disable ptest:

$ time build scap-security-guide
real    1m25.222s
user    0m3.306s
sys     0m0.166s

Since no one cares about this ptest and no one fixes the test failures. Let's disable it.

---
 .../scap-security-guide/files/run-ptest       |  7 ---
 .../scap-security-guide_0.1.77.bb             | 52 +------------------
 2 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 recipes-compliance/scap-security-guide/files/run-ptest
recipes-compliance/scap-security-guide/files/run-ptest deleted +0 -7
deleted file mode 100644
index e8d270f..0000000
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-export PYTHONPATH="/usr/lib/scap-security-guide/ptest/git:$PYTHONPATH"
-
-cd git/build
-
-ctest --output-on-failure -E unique-stigids
recipes-compliance/scap-security-guide/scap-security-guide_0.1.77.bb +1 -51

72 lines not on this page · raw message

Signature · 1 line
2.50.0
#3 lore raw

PATCH 3/4 suricata: fix "interface" arg in systemd service

In reply to Scott Murray

From: Clayton Casciato <[email protected]>

Fix service startup

https://docs.suricata.io/en/suricata-7.0.0/command-line-options.html#cmdoption-i

---
 recipes-ids/suricata/files/suricata.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-ids/suricata/files/suricata.service +1 -1
index a99a76e..bd7010d 100644
@@ -9,7 +9,7 @@ Documentation=https://redmine.openinfosecfoundation.org/projects/suricata/wiki
 Type=simple
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW
 RestrictAddressFamilies=
-ExecStart=/usr/bin/suricata -c /etc/suricata/suricata.yaml eth0
+ExecStart=/usr/bin/suricata -c /etc/suricata/suricata.yaml -i eth0
 ExecReload=/bin/kill -HUP $MAINPID
 PrivateTmp=yes
 ProtectHome=yes
Signature · 1 line
2.50.0
#4 lore raw

PATCH 4/4 samhain: Adapt test output to Automake format for ptest compatibility

In reply to Scott Murray

From: Haixiao Yan <[email protected]>

Convert CuTest output to follow Automake-compatible format (PASS:/FAIL:) so that ptest-runner can correctly parse and report test results.

root@qemux86-64:~# ptest-runner samhain-standalone -t 3600
START: ptest-runner
2025-07-06T09:38
BEGIN: /usr/lib64/samhain-standalone/ptest
PASS: Test_quote_string_ok
PASS: Test_unquote_string_ok
PASS: Test_csv_escape_ok
PASS: Test_tiger
PASS: Test_tiger_file
PASS: Test_tiger_file_with_length
PASS: Test_sh_tools_safe_name_01
PASS: Test_sh_tools_safe_name_02
PASS: Test_sh_tools_safe_name_03
PASS: Test_sh_tools_safe_name_04
PASS: Test_sh_tools_safe_name_05
PASS: Test_sh_tools_safe_name_06
PASS: Test_sh_tools_safe_name_07
PASS: Test_is_numeric_01
PASS: Test_dnmalloc
PASS: Test_sh_unix_lookup_page
PASS: Test_sl_strlcpy
PASS: Test_sl_strlcat
PASS: Test_sh_util_acl_compact
PASS: Test_sh_util_strdup_ok
PASS: Test_sh_util_strconcat_ok
PASS: Test_sh_util_base64_enc_ok
PASS: Test_sh_util_dirname_ok
PASS: Test_sh_util_basename_ok
PASS: Test_sh_util_utf8_ok
PASS: Test_sh_util_obscure_ok
PASS: Test_sl_stale
PASS: Test_sl_snprintf
PASS: Test_sl_ts_strncmp
PASS: Test_sl_strcasecmp
PASS: Test_zAVLTree
PASS: Test_sha256
PASS: Test_entropy
PASS: Test_fifo
PASS: Test_file_lists
PASS: Test_file_dequote
PASS: Test_uuid
PASS: Test_ignore_ok
PASS: Test_inotify
PASS: Test_ipvx
PASS: Test_login
PASS: Test_login
PASS: Test_portcheck_lists
PASS: Test_processcheck_watchlist_ok
PASS: Test_processcheck_listhandle_ok
PASS: Test_restrict
PASS: Test_cmdlist
PASS: Test_srp
PASS: Test_string

DURATION: 0
END: /usr/lib64/samhain-standalone/ptest
2025-07-06T09:38
STOP: ptest-runner
TOTAL: 1 FAIL: 0
root@qemux86-64:~#

---
 ...t-output-to-match-Automake-standards.patch | 102 ++++++++++++++++++
 recipes-ids/samhain/samhain.inc               |   1 +
 2 files changed, 103 insertions(+)
 create mode 100644 recipes-ids/samhain/files/0001-Format-test-output-to-match-Automake-standards.patch
recipes-ids/samhain/files/0001-Format-test-output-to-match-Automake-standards.patch new file +102 -0
new file mode 100644
index 0000000..eccd242
@@ -0,0 +1,102 @@
+From 065813e5ec274942c4e8803d813ae863fb17313f Mon Sep 17 00:00:00 2001
+From: Haixiao Yan <[email protected]>
+Date: Sun, 6 Jul 2025 14:34:08 +0800
+Subject: [PATCH] Format test output to match Automake standards
+
+Upstream-Status: Pending
+
+Signed-off-by: Haixiao Yan <[email protected]>
+---
+ src/CuTest.c      | 63 +++++++++++++++--------------------------------
+ src/make-tests.sh |  1 -
+ 2 files changed, 20 insertions(+), 44 deletions(-)
+
+diff --git a/src/CuTest.c b/src/CuTest.c
+index c1884daedbd8..44007fdb97ff 100644
+--- a/src/CuTest.c
++++ b/src/CuTest.c
+@@ -302,49 +302,26 @@ void CuSuiteRun(CuSuite* testSuite)
+ 	}
+ }
+ 
+-void CuSuiteSummary(CuSuite* testSuite, CuString* summary)
+-{
+-	int i;
+-	for (i = 0 ; i < testSuite->count ; ++i)
+-	{
+-		CuTest* testCase = testSuite->list[i];
+-		CuStringAppend(summary, testCase->failed ? "F" : ".");
+-	}
+-	CuStringAppend(summary, "\n\n");
+-}
+-
+ void CuSuiteDetails(CuSuite* testSuite, CuString* details)
+ {
+-	int i;
+-	int failCount = 0;
+-
+-	if (testSuite->failCount == 0)
+-	{
+-		int passCount = testSuite->count - testSuite->failCount;
+-		const char* testWord = passCount == 1 ? "test" : "tests";
+-		CuStringAppendFormat(details, "OK (%d %s)\n", passCount, testWord);
+-	}
+-	else
+-	{
+-		if (testSuite->failCount == 1)
+-			CuStringAppend(details, "There was 1 failure:\n");
+-		else
+-			CuStringAppendFormat(details, "There were %d failures:\n", testSuite->failCount);
+-
+-		for (i = 0 ; i < testSuite->count ; ++i)
+-		{
+-			CuTest* testCase = testSuite->list[i];
+-			if (testCase->failed)
+-			{
+-				failCount++;
+-				CuStringAppendFormat(details, "%d) %s: %s\n",
+-					failCount, testCase->name, testCase->message);
+-			}
+-		}
+-		CuStringAppend(details, "\n!!!FAILURES!!!\n");
+-
+-		CuStringAppendFormat(details, "Runs: %d ",   testSuite->count);
+-		CuStringAppendFormat(details, "Passes: %d ", testSuite->count - testSuite->failCount);
+-		CuStringAppendFormat(details, "Fails: %d\n",  testSuite->failCount);
+-	}
++    int i;
++
++    for (i = 0; i < testSuite->count; ++i)
++    {
++        CuTest* testCase = testSuite->list[i];
++        if (testCase->failed)
++        {
++            CuStringAppendFormat(details, "FAIL: %s\n", testCase->name);
++        }
++        else
++        {
++            CuStringAppendFormat(details, "PASS: %s\n", testCase->name);
++        }
++    }
++
++    CuStringAppend(details, "\n");
++    CuStringAppendFormat(details, "# TOTAL: %d\n", testSuite->count);
++    CuStringAppendFormat(details, "# PASS:  %d\n", testSuite->count - testSuite->failCount);
++    CuStringAppendFormat(details, "# FAIL:  %d\n", testSuite->failCount);
+ }
++
+diff --git a/src/make-tests.sh b/src/make-tests.sh
+index b6cf814e7030..01399ca75775 100755
+--- a/src/make-tests.sh
++++ b/src/make-tests.sh
+@@ -45,7 +45,6 @@ cat $FILES | grep '^void Test' |
+ echo \
+ '
+     CuSuiteRun(suite);
+-    CuSuiteSummary(suite, output);
+     CuSuiteDetails(suite, output);
+     if (suite->failCount > 0)
+       fprintf(stderr, "%s%c", output->buffer, 0x0A);
+-- 
+2.34.1
+
recipes-ids/samhain/samhain.inc +1 -0
index 6b8d30e..fc4e423 100644
@@ -19,6 +19,7 @@ SRC_URI = "https://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \
            file://0008-Add-LDFLAGS-variable-for-compiling-samhain_setpwd.patch \
            file://0009-fix-build-with-new-version-attr.patch \
            file://0010-Fix-initializer-element-is-not-constant.patch \
+           file://0001-Format-test-output-to-match-Automake-standards.patch \
            "
 
 SRC_URI[sha256sum] = "0b5d3534fd60ecf45dfd79bd415e81f7a56eba7f1755771735e204f334033578"
Signature · 1 line
2.50.0
#5 lore raw
In reply to Scott Murray
Quoted 4 lines · Scott Murray via lists.yoctoproject.org

Roll up the submissions since the first batch of whinlatter fixes, plus an upgrade of scap-security-guide to get it building again after the CMake 4.0 upgrade in oe-core.

Quoted 10 lines

A note about the ptest removal for scap-security-guide; while having comprehensive ptests is desirable, from the commit history it is clear that there was no interest in banging these ones into a working state in the last couple of years. As well, ptests are not enabled in most of the current CI build configurations, and it seems clear that the build time hit would be massive in this case if they were. If someone motivated to try to investigate resolving these issues appears, this decision can be revisited.

Fine for me. This commit leads to a better situation in the CI, OK to merge.

Kind regards,
Marta

#6 lore raw
Quoted 16 lines · Marta Rybczynska via lists.yoctoproject.org
Quoted 4 lines · Scott Murray via lists.yoctoproject.org

Roll up the submissions since the first batch of whinlatter fixes, plus an upgrade of scap-security-guide to get it building again after the CMake 4.0 upgrade in oe-core.

Quoted 8 lines

A note about the ptest removal for scap-security-guide; while having comprehensive ptests is desirable, from the commit history it is clear that there was no interest in banging these ones into a working state in the last couple of years. As well, ptests are not enabled in most of the current CI build configurations, and it seems clear that the build time hit would be massive in this case if they were. If someone motivated to try to investigate resolving these issues appears, this decision can be revisited.

Quoted 1 line

Fine for me. This commit leads to a better situation in the CI, OK to merge.

I have gone ahead and merged the series to master.

Thanks,

Scott