From ee32beb0333105ea120420a3556a752079ef5437 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Jun 2021 12:48:35 -0700 Subject: meta-security: subtree update:baca6133f9..ab239f1497 Armin Kuster (16): build cleanup: add iam to base depend tripwire: Blacklist pkg, upstream seems abandond tpm2-pkcs11: Update to 1.6.0 clamav: update to tip. ossec-hids: add UPSTREAM_CHECK_COMMITS python3-scapy: add UPSTREAM_CHECK_COMMITS suricata: 4.1.x add UPSTREAM_CHECK_URI ibmswtpm2: update to 1661 ibmtpm2tss: update to tip packagegroup-core-security: fix typo for mips Apparmor: fix multi config build issue. aide: Add another ids packagegroup-core-security: add aide and ossec .gitlab-ci: drop clean up combine alt w base clamav: fix systemd startup packagegroup-core-security: add clamav-daemon Change-Id: Id941ea16208920cfa31bf6d42f8a01fc9765ec7c Signed-off-by: William A. Kennington III --- .../clamav/files/fix_systemd_socket.patch | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 meta-security/recipes-scanners/clamav/files/fix_systemd_socket.patch (limited to 'meta-security/recipes-scanners/clamav/files/fix_systemd_socket.patch') diff --git a/meta-security/recipes-scanners/clamav/files/fix_systemd_socket.patch b/meta-security/recipes-scanners/clamav/files/fix_systemd_socket.patch new file mode 100644 index 000000000..3e9abe236 --- /dev/null +++ b/meta-security/recipes-scanners/clamav/files/fix_systemd_socket.patch @@ -0,0 +1,25 @@ +clamd not installing clamav-daemon.socket + +Fixes: +__main__.SystemdUnitNotFoundError: (PosixPath('../security-build-image/1.0-r0/rootfs'), 'clamav-daemon.socket') +%post(clamav-daemon-0.104.0-r0.core2_64): waitpid(3587571) rc 3587571 status 100 +warning: %post(clamav-daemon-0.104.0-r0.core2_64) scriptlet failed, exit status 1 + +Upstream-Status: Pending +Signed-off-by: Armin Kuster + +Index: git/clamd/CMakeLists.txt +=================================================================== +--- git.orig/clamd/CMakeLists.txt ++++ git/clamd/CMakeLists.txt +@@ -54,4 +54,10 @@ if(SYSTEMD_FOUND) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/clamav-daemon.service + DESTINATION ${SYSTEMD_UNIT_DIR}) ++ configure_file( ++ ${CMAKE_CURRENT_SOURCE_DIR}/clamav-daemon.socket.in ++ ${CMAKE_CURRENT_BINARY_DIR}/clamav-daemon.socket @ONLY) ++ install( ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/clamav-daemon.socket ++ DESTINATION ${SYSTEMD_UNIT_DIR}) + endif() -- cgit v1.2.3