Skip to contentSkip to conversation

Assorted fixes

PATCH New Scott Murray 1 participant 10 messages Jan 15

lore
Share & tools
lore
#0 lore raw

cover Assorted fixes

This patch series pulls together the couple of recent contributions to kirkstone branch with selected backported changes for known broken recipes plus getting the base CI build tests working. These changes are on the kirkstone-next branch of meta-security, and my plan is to merge them to kirkstone tomorrow evening (EST) if there are no objections.

Things to note:
- The Parsec and musl build tests fail, and given the impending EOL of kirkstone, debugging the failures is currently a low priority.
- checksecurity and lynis have ended up with minor upgrades due to the process of working through cherry-picking fixes from master. I believe in both cases the upgrades are minor enough to not be an issue, and that seems a small tradeoff for actually building now. I would have considered being a bit more aggressive with updating lynis, but it does not seem worthwhile given the impending kirkstone EOL, and no one having complained about the recipe not building.

Scott

Changes:

Armin Kuster (2):
chkrootkit: update SRC_URI
checksecurity: update to 2.0.16

Marta Rybczynska (3):
CI: update build for new CI
kas: update configuration
checksecurity: update the debian package

Scott Murray (2):
Update maintainers
meta-security-compliance: Update lynis

Vijay Anusuri (2):
sssd: Fix for CVE-2025-11561
clamav: Fix for CVE-2024-20328

 .gitlab-ci.yml                                |  49 +++---
 README                                        |   4 +-
 conf/distro/include/maintainers.inc           |  72 ++++-----
 kas/kas-security-alt.yml                      |   4 +-
 kas/kas-security-base.yml                     |  21 ++-
 kas/kas-security-dm.yml                       |   2 +-
 kas/kas-security-parsec.yml                   |   4 +-
 kas/qemuarm64-musl.yml                        |   1 +
 kas/qemux86-musl.yml                          |   1 +
 kas/qemux86-test.yml                          |   4 +
 meta-hardening/README                         |   4 +-
 meta-integrity/README.md                      |   4 +-
 meta-parsec/README.md                         |   1 -
 .../lynis/{lynis_3.0.0.bb => lynis_3.0.9.bb}  |   6 +-
 meta-tpm/README                               |   4 +-
 meta-tpm/conf/distro/include/maintainers.inc  |  33 ++--
 ...rity_2.0.15.bb => checksecurity_2.0.16.bb} |  17 +-
 ...k-setuid-use-more-portable-find-args.patch |  16 +-
 .../files/setuid-log-folder.patch             |  52 ------
 recipes-scanners/clamav/clamav_0.104.0.bb     |   1 +
 .../clamav/files/CVE-2024-20328.patch         | 153 ++++++++++++++++++
 recipes-scanners/rootkits/chkrootkit_0.55.bb  |   2 +-
 .../sssd/files/CVE-2025-11561.patch           |  50 ++++++
 recipes-security/sssd/sssd_2.5.2.bb           |   1 +
 24 files changed, 346 insertions(+), 160 deletions(-)
 rename meta-security-compliance/recipes-auditors/lynis/{lynis_3.0.0.bb => lynis_3.0.9.bb} (84%)
 rename recipes-scanners/checksecurity/{checksecurity_2.0.15.bb => checksecurity_2.0.16.bb} (57%)
 delete mode 100644 recipes-scanners/checksecurity/files/setuid-log-folder.patch
 create mode 100644 recipes-scanners/clamav/files/CVE-2024-20328.patch
 create mode 100644 recipes-security/sssd/files/CVE-2025-11561.patch
Signature · 1 line
2.51.0
#1 lore raw

PATCH 1/9 Update maintainers

Add Marta and myself as maintainers for meta-security and the other embedded layers that Armin had been maintaining. To avoid Armin getting bugged about individual recipes, set the RECIPE_MAINTAINER variables to myself.

(backport from master)

---
 README                                       |  4 +-
 conf/distro/include/maintainers.inc          | 72 ++++++++++----------
 meta-hardening/README                        |  4 +-
 meta-integrity/README.md                     |  4 +-
 meta-parsec/README.md                        |  1 -
 meta-tpm/README                              |  4 +-
 meta-tpm/conf/distro/include/maintainers.inc | 33 +++++----
 7 files changed, 64 insertions(+), 58 deletions(-)
README +3 -1
index 081669f..7bd7f7c 100644
@@ -92,7 +92,9 @@ Now you can just do 'git send-email origin/master' to send all local patches.
 
 For pull requests, please use create-pull-request and send-pull-request. 
 
-Maintainers:    Armin Kuster <[email protected]>
+Maintainers:
+Scott Murray <[email protected]>
+Marta Rybczynska <[email protected]>
 
 
 License
conf/distro/include/maintainers.inc +36 -36

75 lines not on this page · raw message

meta-hardening/README +3 -1
index 191253c..e804bcb 100644
@@ -76,7 +76,9 @@ $ git config format.subjectPrefix meta-hardening][PATCH
 
 Now you can just do 'git send-email origin/master' to send all local patches.
 
-Maintainers:  Armin Kuster <[email protected]>
+Maintainers:
+Scott Murray <[email protected]>
+Marta Rybczynska <[email protected]>
 
 License
 =======
meta-integrity/README.md +3 -1
index eae1c57..b0196dc 100644
@@ -45,7 +45,9 @@ [email protected] mailing list. When submitting patches that way,
 make sure to copy the maintainer and add a "[meta-integrity]"
 prefix to the subject of the mails.
 
-Maintainer: Armin Kuster <[email protected]>
+Maintainers:
+Scott Murray <[email protected]>
+Marta Rybczynska <[email protected]>
 
 
 Table of Contents
meta-parsec/README.md +0 -1
index 97026ea..292d99d 100644
@@ -190,7 +190,6 @@ $ git config format.subjectPrefix meta-parsec][PATCH
 Now you can just do 'git send-email origin/master' to send all local patches.
 
 Maintainers:    Anton Antonov <[email protected]>
-                Armin Kuster <[email protected]>
 
 
 License
meta-tpm/README +3 -1
index 5722a92..e3667da 100644
@@ -69,7 +69,9 @@ $ git config format.subjectPrefix meta-security][PATCH
 
 Now you can just do 'git send-email origin/master' to send all local patches.
 
-Maintainers:    Armin Kuster <[email protected]>
+Maintainers:    
+Scott Murray <[email protected]>
+Marta Rybczynska <[email protected]>
 
 
 License
meta-tpm/conf/distro/include/maintainers.inc +16 -17
index e7b216d..829f198 100644
@@ -19,20 +19,19 @@
 #	RECIPE_MAINTAINER:pn-<recipe name> = "Full Name <address@domain>"
 #
 # Please keep this list in alphabetical order.
-RECIPE_MAINTAINER:pn-aircrack-ng = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-pcr-extend = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-tpm-quote-tools = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-libtpm = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-trousers = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-swtpm = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-openssl-tpm-engine = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-tpm-tools = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-tpm2-abrmd = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-tpm2-totp = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-tpm2-tcti-uefi = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-tpm2-tss-engine = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-tpm2-pkcs11 = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-tpm2-tss = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-tpm2-tools = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER:pn-ibmswtpm2 = "Armin Kuster <[email protected]>"
-
+RECIPE_MAINTAINER:pn-aircrack-ng = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-pcr-extend = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-tpm-quote-tools = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-libtpms = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-trousers = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-swtpm = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-openssl-tpm-engine = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-tpm-tools = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-tpm2-abrmd = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-tpm2-totp = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-tpm2-tcti-uefi = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-tpm2-tss-engine = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-tpm2-pkcs11 = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-tpm2-tss = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-tpm2-tools = "Scott Murray <[email protected]>"
+RECIPE_MAINTAINER:pn-ibmswtpm2 = "Scott Murray <[email protected]>"
Signature · 1 line
2.51.0
#2 lore raw

PATCH 2/9 CI: update build for new CI

In reply to Scott Murray

From: Marta Rybczynska <[email protected]>

Update for Ubuntu 24.04 runners:
- use venv for installing kas
- add missing directories
- assume that python3 and pip are installed.

Other changes:
- add logging of jobs to files

(reworked for kirkstone branch)

---
 .gitlab-ci.yml | 49 ++++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 21 deletions(-)
.gitlab-ci.yml +28 -21
index a4137cb..e37a161 100644
@@ -1,10 +1,13 @@
 .before-my-script: &before-my-script
     - echo "$ERR_REPORT_USERNAME" > ~/.oe-send-error
     - echo "$ERR_REPORT_EMAIL" >> ~/.oe-send-error
+    - echo "$CI_PROJECT_DIR" >> ~/.ci_project_dir
     - export PATH=~/.local/bin:$PATH
-    - wget https://bootstrap.pypa.io/get-pip.py
-    - python3 get-pip.py
+    - python3 -m venv ~/kas_env/
+    - source ~/kas_env/bin/activate
     - python3 -m pip install kas
+    - mkdir -p $CI_PROJECT_DIR/build/tmp/log/error-report/
+    - mkdir -p $CI_PROJECT_DIR/log/
 
 .after-my-script: &after-my-script
     - cd $CI_PROJECT_DIR/poky
@@ -26,6 +29,10 @@ stages:
   stage: base 
   after_script:
     - *after-my-script
+  artifacts:
+    paths:
+      - $CI_PROJECT_DIR/log/*
+    when: always
 
 .parsec:
   before_script:
@@ -51,78 +58,78 @@ stages:
 qemux86:
   extends: .base
   script:
-  - kas shell kas/$CI_JOB_NAME.yml  -c "bitbake -k security-build-image integrity-image-minimal"
-  - kas build --target security-build-image kas/$CI_JOB_NAME-comp.yml
-  - kas build --target harden-image-minimal kas/$CI_JOB_NAME-harden.yml
+  - kas shell kas/$CI_JOB_NAME.yml  -c "bitbake -k security-build-image integrity-image-minimal" 2>&1 | tee $CI_PROJECT_DIR/log/qemux86_security_image.txt
+  - kas build --target security-build-image kas/$CI_JOB_NAME-comp.yml  2>&1 | tee $CI_PROJECT_DIR/log/qemux86_compliance_image.txt
+  - kas build --target harden-image-minimal kas/$CI_JOB_NAME-harden.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemux86_harden_image.txt
 
 qemux86-musl:
   extends: .musl
   needs: ['qemux86']
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemux86_musl_security_image.txt
 
 qemux86-parsec:
   extends: .parsec
   needs: ['qemux86']
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemux86_parsec_security_image.txt
 
 qemux86-test:
   extends: .test
   needs: ['qemux86']
   allow_failure: true
   script:
-  - kas build --target security-test-image kas/$CI_JOB_NAME.yml
-  - kas build -c testimage --target security-test-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-test-image kas/$CI_JOB_NAME.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemux86_test_security_image.txt
+  - kas build -c testimage --target security-test-image kas/$CI_JOB_NAME.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemux86_testimage_security_image.txt
 
 qemux86-64:
   extends: .base
   script:
-  - kas shell kas/$CI_JOB_NAME.yml  -c "bitbake -k security-build-image security-tpm-image security-tpm2-image integrity-image-minimal"
-  - kas build --target dm-verity-image-initramfs kas/$CI_JOB_NAME-dm-verify.yml
-  - kas build --target security-build-image kas/$CI_JOB_NAME-alt.yml
+  - kas shell kas/$CI_JOB_NAME.yml  -c "bitbake -k core-image-minimal security-build-image security-tpm-image security-tpm2-image integrity-image-minimal" 2>&1 | tee $CI_PROJECT_DIR/log/qemux86_64_security_image.txt
+  - kas build --target dm-verity-image-initramfs kas/$CI_JOB_NAME-dm-verify.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemux86_64_dm_verify.txt
+  - kas build --target security-build-image kas/$CI_JOB_NAME-alt.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemux86_64_security_build_image.txt
 
 qemux86-64-parsec:
   extends: .parsec
   needs: ['qemux86-64']
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemux86_64_parsec_security_image.txt
 
 qemuarm:
   extends: .base
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemuarm_security_image.txt
 
 qemuarm-parsec:
   extends: .parsec
   needs: ['qemuarm']
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemuarm_parsec_security_image.txt
 
 qemuarm64:
   extends: .base
   script:
-  - kas shell kas/$CI_JOB_NAME.yml  -c "bitbake -k security-build-image security-tpm2-image integrity-image-minimal"
-  - kas build --target security-build-image kas/$CI_JOB_NAME-alt.yml
+  - kas shell kas/$CI_JOB_NAME.yml  -c "bitbake -k security-build-image security-tpm2-image integrity-image-minimal" 2>&1 | tee $CI_PROJECT_DIR/log/qemuarm64_security_image.txt
+  - kas build --target security-build-image kas/$CI_JOB_NAME-alt.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemuarm64_build_security_image.txt
 
 qemuarm64-musl:
   extends: .musl
   needs: ['qemuarm64']
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemuarm64_musl_security_image.txt
 
 qemuarm64-parsec:
   extends: .parsec
   needs: ['qemuarm64']
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemuarm64_parsec_security_image.txt
 
 qemumips64:
   extends: .base
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemumips64_security_image.txt
 
 qemuriscv64:
   extends: .base
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 2>&1 | tee $CI_PROJECT_DIR/log/qemuriscv64_security_image.txt
Signature · 1 line
2.51.0
#3 lore raw

PATCH 3/9 kas: update configuration

In reply to Scott Murray

From: Marta Rybczynska <[email protected]>

Update based on latest master configuration.

Changes:
- switch to kirkstone
- add required usrmerge feature to kas-security-alt configuration
- add whitespaces around assignement
- add common dldir/sstate
- don't build apparmor in musl configs
- only enable ptest for the test image
- Update the kas configuration file versions to 19 to match kas 4.8.x.
- Change refspec to branch to remove deprecation warnings.
- Add quoting around URLs to match upstream examples.

---
 kas/kas-security-alt.yml    |  4 ++--
 kas/kas-security-base.yml   | 21 +++++++++++++--------
 kas/kas-security-dm.yml     |  2 +-
 kas/kas-security-parsec.yml |  4 ++--
 kas/qemuarm64-musl.yml      |  1 +
 kas/qemux86-musl.yml        |  1 +
 kas/qemux86-test.yml        |  4 ++++
 7 files changed, 24 insertions(+), 13 deletions(-)
kas/kas-security-alt.yml +2 -2
index 3ee9808..2a449c5 100644
@@ -1,8 +1,8 @@
 header:
-    version: 9
+    version: 19
     includes: 
         - kas-security-base.yml
 
 local_conf_header:
   alt: |
-      DISTRO_FEATURES:append = " systemd"
+      INIT_MANAGER = "systemd"
kas/kas-security-base.yml +13 -8
index 3bf46db..78c0b04 100644
@@ -1,5 +1,5 @@
 header:
-  version: 9
+  version: 19
 
 distro: poky
 
@@ -13,16 +13,16 @@ repos:
       meta-hardening:
 
   poky:
-    url: https://git.yoctoproject.org/git/poky
-    refspec: master
+    url: "https://git.yoctoproject.org/git/poky"
+    branch: kirkstone
     layers:
       meta:
       meta-poky:
       meta-yocto-bsp:
-
+ 
   meta-openembedded:
-    url: http://git.openembedded.org/meta-openembedded
-    refspec: master
+    url: "http://git.openembedded.org/meta-openembedded"
+    branch: kirkstone
     layers:
       meta-oe:
       meta-perl:
@@ -41,8 +41,8 @@ local_conf_header:
     INHERIT += "report-error"
     INHERIT += "testimage"
     INHERIT += "rm_work"
-    BB_NUMBER_THREADS="24"
-    BB_NUMBER_PARSE_THREADS="12"
+    BB_NUMBER_THREADS = "24"
+    BB_NUMBER_PARSE_THREADS = "12"
     BB_TASK_NICE_LEVEL = '5'
     BB_TASK_NICE_LEVEL_task-testimage = '0'
     BB_TASK_IONICE_LEVEL = '2.7'
@@ -52,6 +52,7 @@ local_conf_header:
     PACKAGE_CLASSES = "package_ipk"
 
     DISTRO_FEATURES:append = " security pam apparmor smack ima tpm tpm2"
+    DISTRO_FEATURES:remove = "ptest"
     MACHINE_FEATURES:append = " tpm tpm2"
 
   diskmon: |
@@ -65,6 +66,10 @@ local_conf_header:
     ABORT,${SSTATE_DIR},100M,1K \
     ABORT,/tmp,10M,1K"
 
+  dlsstate: |
+    DL_DIR = "/home/gitlab-runner/build/downloads"
+    SSTATE_DIR = "/home/gitlab-runner/build/sstate-cache"
+
 bblayers_conf_header:
   base: |
     BBPATH = "${TOPDIR}"
kas/kas-security-dm.yml +1 -1
index c03b336..fe74d25 100644
@@ -1,5 +1,5 @@
 header:
-    version: 9
+    version: 19
     includes: 
         - kas-security-base.yml
 
kas/kas-security-parsec.yml +2 -2
index 9a009be..cb59fba 100644
@@ -1,5 +1,5 @@
 header:
-    version: 9
+    version: 19
     includes:
         - kas-security-base.yml
 
@@ -10,7 +10,7 @@ repos:
 
   meta-clang:
     url: https://github.com/kraj/meta-clang.git
-    refspec: master
+    branch: kirkstone
 
 local_conf_header:
   meta-parsec: |
kas/qemuarm64-musl.yml +1 -0
index b353eb4..f01f759 100644
@@ -6,5 +6,6 @@ header:
 local_conf_header:
     musl: |
         TCLIBC = "musl"
+        DISTRO_FEATURES:remove = "apparmor"
 
 machine: qemuarm64
kas/qemux86-musl.yml +1 -0
index 61d9572..aa6572c 100644
@@ -6,5 +6,6 @@ header:
 local_conf_header:
     musl: |
         TCLIBC = "musl"
+        DISTRO_FEATURES:remove = "apparmor"
 
 machine: qemux86
kas/qemux86-test.yml +4 -0
index 83a5353..98f1e7f 100644
@@ -3,4 +3,8 @@ header:
   includes:
     - kas-security-base.yml
 
+local_conf_header:
+  ptest: |
+      DISTRO_FEATURES:append = " ptest"
+
 machine: qemux86
Signature · 1 line
2.51.0
#4 lore raw

PATCH 4/9 chkrootkit: update SRC_URI

In reply to Scott Murray

From: Armin Kuster <[email protected]>

0.55 no longer hosted from main source. Use Ubuntu archive

---
 recipes-scanners/rootkits/chkrootkit_0.55.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-scanners/rootkits/chkrootkit_0.55.bb +1 -1
index 20015a1..4293aec 100644
@@ -5,7 +5,7 @@ SECTION = "security"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fdbe53788f7081c63387d8087273f5ff"
 
-SRC_URI = "ftp://ftp.pangeia.com.br/pub/seg/pac/${BPN}.tar.gz"
+SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/c/${BPN}/${BPN}_${PV}.orig.tar.gz"
 SRC_URI[sha256sum] = "a81c0286ec449313f953701202a00e81b204fc2cf43e278585a11c12a5e0258b"
 
 inherit autotools-brokensep
Signature · 1 line
2.51.0
#5 lore raw

PATCH 5/9 checksecurity: update to 2.0.16

In reply to Scott Murray

From: Armin Kuster <[email protected]>

Drop setuid-log-folder.patch, using sed instead. Refresh patch check-setuid-use-more-portable-find-args.patch

---
 ...rity_2.0.15.bb => checksecurity_2.0.16.bb} | 18 +++++--
 ...k-setuid-use-more-portable-find-args.patch | 16 +++---
 .../files/setuid-log-folder.patch             | 52 -------------------
 3 files changed, 21 insertions(+), 65 deletions(-)
 rename recipes-scanners/checksecurity/{checksecurity_2.0.15.bb => checksecurity_2.0.16.bb} (57%)
 delete mode 100644 recipes-scanners/checksecurity/files/setuid-log-folder.patch
recipes-scanners/checksecurity/checksecurity_2.0.16.bb renamed from recipes-scanners/checksecurity/checksecurity_2.0.15.bb +13 -5
similarity index 57%
rename from recipes-scanners/checksecurity/checksecurity_2.0.15.bb
rename to recipes-scanners/checksecurity/checksecurity_2.0.16.bb
index e053a15..8006c9f 100644
@@ -4,14 +4,22 @@ SECTION = "security"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI = "http://ftp.de.debian.org/debian/pool/main/c/checksecurity/checksecurity_${PV}.tar.gz \
-           file://setuid-log-folder.patch \
-           file://check-setuid-use-more-portable-find-args.patch"
+SRC_URI = "http://ftp.de.debian.org/debian/pool/main/c/checksecurity/checksecurity_${PV}+nmu1.tar.gz \
+           file://check-setuid-use-more-portable-find-args.patch \
+          "
 
-SRC_URI[md5sum] = "a30161c3e24d3be710b2fd13fcd1f32f"
-SRC_URI[sha256sum] = "67abe3d6391c96146e96f376d3fd6eb7a9418b0f7fe205b465219889791dba32"
+SRC_URI[sha256sum] = "9803b3760e9ec48e06ebaf48cec081db48c6fe72254a476224e4c5c55ed97fb0"
+
+S = "${WORKDIR}/checksecurity-${PV}+nmu1"
+
+
+# allow for anylocal, no need to patch
+LOGDIR="/etc/checksecurity"
 
 do_compile() {
+    sed -i -e "s;LOGDIR=/var/log/setuid;LOGDIR=${LOGDIR};g" ${B}/etc/check-setuid.conf
+    sed -i -e "s;LOGDIR=/var/log/setuid;LOGDIR=${LOGDIR};g" ${B}/plugins/check-setuid
+    sed -i -e "s;LOGDIR:=/var/log/setuid;LOGDIR:=${LOGDIR};g" ${B}/plugins/check-setuid
 }
 
 do_install() {
recipes-scanners/checksecurity/files/check-setuid-use-more-portable-find-args.patch +8 -8
index f1fe8ed..1a2f364 100644
@@ -8,16 +8,16 @@ Signed-off-by: Christopher Larson <[email protected]>
  plugins/check-setuid | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-Index: checksecurity-2.0.15/plugins/check-setuid
+Index: checksecurity-2.0.16+nmu1/plugins/check-setuid
 ===================================================================
---- checksecurity-2.0.15.orig/plugins/check-setuid	2018-09-06 00:49:23.930934294 +0500
-+++ checksecurity-2.0.15/plugins/check-setuid	2018-09-06 00:49:49.694934757 +0500
-@@ -99,7 +99,7 @@
- ionice -t -c3 \
+--- checksecurity-2.0.16+nmu1.orig/plugins/check-setuid
++++ checksecurity-2.0.16+nmu1/plugins/check-setuid
+@@ -100,7 +100,7 @@ ionice -t -c3 \
  find `mount | grep -vE "$CHECKSECURITY_FILTER" | cut -d ' ' -f 3` \
+         -ignore_readdir_race  \
  	-xdev $PATHCHK \
--	\( -type f -perm +06000 -o \( \( -type b -o -type c \) \
-+	\( -type f \( -perm -4000 -o -perm -2000 \) -o \( \( -type b -o -type c \) \
+-	\( -type f -perm /06000 -o \( \( -type b -o -type c \) \
++    \( -type f \( -perm -4000 -o -perm -2000 \) -o \( \( -type b -o -type c \) \	
  	$DEVCHK \) \) \
-         -ignore_readdir_race  \
  	-printf "%8i %5m %3n %-10u %-10g %9s %t %h/%f\n" |
+ 	sort -k 12 >$TMPSETUID
recipes-scanners/checksecurity/files/setuid-log-folder.patch deleted +0 -52

52 lines not on this page · raw message

Signature · 1 line
2.51.0
#6 lore raw

PATCH 6/9 checksecurity: update the debian package

In reply to Scott Murray

From: Marta Rybczynska <[email protected]>

The previously used package (nmu1) is not longer available, use the latest current one (nmu3). The changelog between the two:

checksecurity (2.0.16+nmu3) unstable; urgency=medium

* Non-maintainer upload.
* Fix "missing required debian/rules targets build-arch and/or build- indep": Add targets to debian/rules.
(Closes: #999082)
* Fix "Removal of obsolete debhelper compat 5 and 6 in bookworm":
Bump to 7 in debian/{compat,control}.
(Closes: #965448)
* Fix some grave packaging errors:
- move debhelper from Build-Depends-Indep to Build-Depends
- remove temporary files debian/postrm.debhelper and debian/substvars from source package

-- gregor herrmann <[email protected]> Sun, 26 Dec 2021 01:56:10 +0100

checksecurity (2.0.16+nmu2) unstable; urgency=medium

* Non maintainer upload by the Reproducible Builds team.
* No source change upload to rebuild on buildd with .buildinfo files.

-- Holger Levsen <[email protected]> Fri, 01 Jan 2021 19:17:53 +0100

(adapted from 828a78314f51b919baf638d64e8e12c0c0a408ad)

---
 recipes-scanners/checksecurity/checksecurity_2.0.16.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
recipes-scanners/checksecurity/checksecurity_2.0.16.bb +3 -4
index 8006c9f..6a223f8 100644
@@ -4,14 +4,13 @@ SECTION = "security"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI = "http://ftp.de.debian.org/debian/pool/main/c/checksecurity/checksecurity_${PV}+nmu1.tar.gz \
+SRC_URI = "http://ftp.de.debian.org/debian/pool/main/c/checksecurity/checksecurity_${PV}+nmu3.tar.gz \
            file://check-setuid-use-more-portable-find-args.patch \
           "
 
-SRC_URI[sha256sum] = "9803b3760e9ec48e06ebaf48cec081db48c6fe72254a476224e4c5c55ed97fb0"
-
-S = "${WORKDIR}/checksecurity-${PV}+nmu1"
+SRC_URI[sha256sum] = "12b043dc7b38512cdf0735c7c147a4f9e60d83a397b5b8ec130c65ceddbe1a0c"
 
+S = "${WORKDIR}/checksecurity-${PV}+nmu3"
 
 # allow for anylocal, no need to patch
 LOGDIR="/etc/checksecurity"
Signature · 1 line
2.51.0
#7 lore raw

PATCH 7/9 meta-security-compliance: Update lynis

In reply to Scott Murray

Update lynis SRC_URI to fix building, and while at it bump to 3.0.9 which hopefully be a transparent upgrade for anyone still on kirkstone.

---
 .../lynis/{lynis_3.0.0.bb => lynis_3.0.9.bb}                | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta-security-compliance/recipes-auditors/lynis/{lynis_3.0.0.bb => lynis_3.0.9.bb} (84%)
meta-security-compliance/recipes-auditors/lynis/lynis_3.0.9.bb renamed from meta-security-compliance/recipes-auditors/lynis/lynis_3.0.0.bb +4 -2
similarity index 84%
rename from meta-security-compliance/recipes-auditors/lynis/lynis_3.0.0.bb
rename to meta-security-compliance/recipes-auditors/lynis/lynis_3.0.9.bb
index f665e29..e72589e 100644
@@ -6,9 +6,11 @@ HOMEDIR = "https://cisofy.com/"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3edd6782854304fd11da4975ab9799c1"
 
-SRC_URI = "https://cisofy.com/files/${BPN}-${PV}.tar.gz"
+SRC_URI = "https://downloads.cisofy.com/lynis/archive/${BPN}-${PV}.tar.gz"
 
-SRC_URI[sha256sum] = "3cc165f9007ba41de6d0b693a1167dbaf0179085f9506dcba64b4b8e37e1bda2"
+SRC_URI[sha256sum] = "f394df7d20391fb76e975ae88f3eba1da05ac9c4945e2c7f709326e185e17025"
+
+UPSTREAM_CHECK = "https://downloads.cisofy.com/lynis"
 
 S = "${WORKDIR}/${BPN}"
 
Signature · 1 line
2.51.0
#8 lore raw

PATCH 8/9 sssd: Fix for CVE-2025-11561

In reply to Scott Murray

From: Vijay Anusuri <[email protected]>

Upstream-Status: Backport [https://github.com/SSSD/sssd/commit/a0336f4cd69c25b3d501a3d361d3d286c00da4d2]

---
 .../sssd/files/CVE-2025-11561.patch           | 50 +++++++++++++++++++
 recipes-security/sssd/sssd_2.5.2.bb           |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 recipes-security/sssd/files/CVE-2025-11561.patch
recipes-security/sssd/files/CVE-2025-11561.patch new file +50 -0
new file mode 100644
index 0000000..0bfed6d
@@ -0,0 +1,50 @@
+From a0336f4cd69c25b3d501a3d361d3d286c00da4d2 Mon Sep 17 00:00:00 2001
+From: Sumit Bose <[email protected]>
+Date: Fri, 10 Oct 2025 12:57:40 +0200
+Subject: [PATCH] krb5: disable Kerberos localauth an2ln plugin for AD/IPA
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If a client is joined to AD or IPA SSSD's localauth plugin can handle
+the mapping of Kerberos principals to local accounts. In case it cannot
+map the Kerberos principals libkrb5 is currently configured to fall back
+to the default localauth plugins 'default', 'rule', 'names',
+'auth_to_local', 'k5login' and 'an2ln' (see man krb5.conf for details).
+All plugins except 'an2ln' require some explicit configuration by either
+the administrator or the local user. To avoid some unexpected mapping is
+done by the 'an2ln' plugin this patch disables it in the configuration
+snippets for SSSD's localauth plugin.
+
+Resolves: https://github.com/SSSD/sssd/issues/8021
+
+:relnote: After startup SSSD already creates a Kerberos configuration
+ snippet typically in /var/lib/sss/pubconf/krb5.include.d/localauth_plugin
+ if the AD or IPA providers are used. This enables SSSD's localauth plugin.
+ Starting with this release the an2ln plugin is disabled in the
+ configuration snippet as well. If this file or its content are included in
+ the Kerberos configuration it will fix CVE-2025-11561.
+
+Reviewed-by: Alexey Tikhonov <[email protected]>
+Reviewed-by: Pavel Březina <[email protected]>
+(cherry picked from commit 9939c39d1949fad48af2f0b43c788bad0809e310)
+
+Upstream-Status: Backport [https://github.com/SSSD/sssd/commit/a0336f4cd69c25b3d501a3d361d3d286c00da4d2]
+CVE: CVE-2025-11561
+Signed-off-by: Vijay Anusuri <[email protected]>
+---
+ src/util/domain_info_utils.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/util/domain_info_utils.c b/src/util/domain_info_utils.c
+index e131a5d96af..160e1711bcd 100644
+--- a/src/util/domain_info_utils.c
++++ b/src/util/domain_info_utils.c
+@@ -751,6 +751,7 @@ static errno_t sss_write_krb5_snippet_common(const char *file_name,
+ #define LOCALAUTH_PLUGIN_CONFIG \
+ "[plugins]\n" \
+ " localauth = {\n" \
++"  disable = an2ln\n" \
+ "  module = sssd:"APP_MODULES_PATH"/sssd_krb5_localauth_plugin.so\n" \
+ " }\n"
+ 
recipes-security/sssd/sssd_2.5.2.bb +1 -0
index c07559c..43c31ee 100644
@@ -25,6 +25,7 @@ SRC_URI = "https://github.com/SSSD/sssd/releases/download/${PV}/sssd-${PV}.tar.g
            file://musl_fixup.patch \
            file://CVE-2021-3621.patch \
            file://CVE-2023-3758.patch \
+           file://CVE-2025-11561.patch \
            "
 
 SRC_URI[sha256sum] = "5e21b3c7b4a2f1063d0fbdd3216d29886b6eaba153b44fb5961698367f399a0f"
Signature · 1 line
2.51.0
#9 lore raw

PATCH 9/9 clamav: Fix for CVE-2024-20328

In reply to Scott Murray

From: Vijay Anusuri <[email protected]>

Upstream-Status: Backport [https://github.com/Cisco-Talos/clamav/commit/fe7638287bb11419474ea314652404e7e9b314b2]

---
 recipes-scanners/clamav/clamav_0.104.0.bb     |   1 +
 .../clamav/files/CVE-2024-20328.patch         | 153 ++++++++++++++++++
 2 files changed, 154 insertions(+)
 create mode 100644 recipes-scanners/clamav/files/CVE-2024-20328.patch
recipes-scanners/clamav/clamav_0.104.0.bb +1 -0
index 0a6b92a..39abda9 100644
@@ -21,6 +21,7 @@ SRC_URI = "git://github.com/vrtadmin/clamav-devel;branch=rel/0.104;protocol=http
     file://headers_fixup.patch \
     file://oe_cmake_fixup.patch \
     file://fix_systemd_socket.patch \
+    file://CVE-2024-20328.patch \
     file://CVE-2024-20505.patch \
     file://CVE-2024-20506.patch \
 "
recipes-scanners/clamav/files/CVE-2024-20328.patch new file +153 -0

153 lines not on this page · raw message

Signature · 1 line
2.51.0