commit: 7b99345bb35e9a6a208a3aa3cd6660b4d606cdb3 Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Mon Jun 24 10:24:55 2024 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Mon Jun 24 11:04:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b99345b
app-antivirus/clamav: package maintenance revbump 1.3.1 with the following fixes: - add postinst message for 'clamonacc' - fix x32 builds - fix PID paths - drop py310; add py313 Bug: https://github.com/Cisco-Talos/clamav/issues/1076 Bug: https://bugs.gentoo.org/921088 Bug: https://bugs.gentoo.org/916147 Bug: https://bugs.gentoo.org/787233 Closes: https://bugs.gentoo.org/927214 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> app-antivirus/clamav/clamav-1.3.1-r1.ebuild | 409 +++++++++++++++++++++ .../clamav/files/clamav-1.3.1-onenote-rs.patch | 30 ++ 2 files changed, 439 insertions(+) diff --git a/app-antivirus/clamav/clamav-1.3.1-r1.ebuild b/app-antivirus/clamav/clamav-1.3.1-r1.ebuild new file mode 100644 index 000000000000..05280603ec9e --- /dev/null +++ b/app-antivirus/clamav/clamav-1.3.1-r1.ebuild @@ -0,0 +1,409 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +# Upstream are working on updating clamav's LLVM bytecode interpreter to work +# with later versions of LLVM, but it's not ready yet. See: +# https://github.com/Cisco-Talos/clamav/issues/581 +# This does not impact the ability of the package to build with llvm/clang otherwise. +LLVM_MAX_SLOT=13 +PYTHON_COMPAT=( python3_{11..13} ) + +# Autogenerated by pycargoebuild 0.13.2 +CRATES=" + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] + [email protected] +" + +# Get the commit from the CLAM-2329-new-from-slice branch +declare -A GIT_CRATES=( + [onenote_parser]="https://github.com/Cisco-Talos/onenote.rs;8b450447e58143004b68dd21c11b710fdb79be92;onenote.rs-%commit%"; +) + +inherit cargo cmake flag-o-matic llvm python-any-r1 systemd tmpfiles + +MY_P=${P//_/-} + +DESCRIPTION="Clam Anti-Virus Scanner" +HOMEPAGE="https://www.clamav.net/"; +SRC_URI="https://github.com/Cisco-Talos/clamav/archive/refs/tags/${MY_P}.tar.gz + ${CARGO_CRATE_URIS}" +S=${WORKDIR}/clamav-${MY_P} + +LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB" +# 0/sts (short term support) if not an LTS release +SLOT="0/sts" +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +fi + +IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test" + +REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter ) + clamonacc? ( clamapp ) + milter? ( clamapp ) + test? ( !libclamav-only )" + +RESTRICT="!test? ( test )" + +# Require acct-{user,group}/clamav at build time so that we can set +# the permissions on /var/lib/clamav in src_install rather than in +# pkg_postinst; calling "chown" on the live filesystem scares me. +COMMON_DEPEND=" + acct-group/clamav + acct-user/clamav + app-arch/bzip2 + dev-libs/json-c:= + dev-libs/libltdl + dev-libs/libpcre2:= + dev-libs/libxml2 + dev-libs/openssl:= + >=sys-libs/zlib-1.2.2:= + virtual/libiconv + !libclamav-only? ( net-misc/curl ) + clamapp? ( sys-libs/ncurses:= net-misc/curl ) + elibc_musl? ( sys-libs/fts-standalone ) + jit? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) + milter? ( mail-filter/libmilter:= ) + rar? ( app-arch/unrar ) + system-mspack? ( dev-libs/libmspack ) + test? ( dev-python/pytest ) +" +# rust-bin < 1.71 has an executable stack +# which is not supported on selinux #911589 +BDEPEND=" + virtual/pkgconfig + >=virtual/rust-1.71 + doc? ( app-text/doxygen ) + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]') + ) +" + +DEPEND="${COMMON_DEPEND} + test? ( dev-libs/check )" + +RDEPEND="${COMMON_DEPEND} + selinux? ( sec-policy/selinux-clamav )" + +python_check_deps() { + python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use jit && llvm_pkg_setup + use test && python-any-r1_pkg_setup +} + +src_prepare() { + eapply --dir="${WORKDIR}/onenote.rs-8b450447e58143004b68dd21c11b710fdb79be92" \ + "${FILESDIR}/${P}-onenote-rs.patch" + cmake_src_prepare +} + +src_configure() { + use elibc_musl && append-ldflags -lfts + use ppc64 && append-flags -mminimal-toc + + local mycmakeargs=( + -DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav + -DBYTECODE_RUNTIME=$(usex jit llvm interpreter) + -DCLAMAV_GROUP="clamav" + -DCLAMAV_USER="clamav" + -DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav + -DENABLE_APP=$(usex clamapp ON OFF) + -DENABLE_CLAMONACC=$(usex clamonacc ON OFF) + -DENABLE_DOXYGEN=$(usex doc) + -DENABLE_EXPERIMENTAL=$(usex experimental ON OFF) + -DENABLE_EXTERNAL_MSPACK=$(usex system-mspack ON OFF) + -DENABLE_JSON_SHARED=ON + -DENABLE_MAN_PAGES=ON + -DENABLE_MILTER=$(usex milter ON OFF) + -DENABLE_SHARED_LIB=ON + -DENABLE_STATIC_LIB=OFF + -DENABLE_SYSTEMD=$(usex systemd ON OFF) + -DENABLE_TESTS=$(usex test ON OFF) + -DENABLE_UNRAR=$(usex rar ON OFF) + -DOPTIMIZE=ON + ) + + if use test ; then + # https://bugs.gentoo.org/818673 + # Used to enable some more tests but doesn't behave well in + # sandbox necessarily(?) + needs certain debug symbols present + # in e.g. glibc. + mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_Valgrind=ON + -DPYTHON_FIND_VERSION="${EPYTHON#python}" + ) + fi + + if use jit ; then + # Suppress CMake warnings that variables aren't consumed if we aren't using LLVM + # https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#llvm-optional-see-bytecode-runtime-section + # https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#bytecode-runtime + mycmakeargs+=( + -DLLVM_ROOT_DIR="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})" + -DLLVM_FIND_VERSION="$(best_version sys-devel/llvm:${LLVM_MAX_SLOT} | cut -c 16-)" + ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + # init scripts + newinitd "${FILESDIR}/clamd.initd" clamd + newinitd "${FILESDIR}/freshclam.initd" freshclam + use clamonacc && \ + newinitd "${FILESDIR}/clamonacc.initd" clamonacc + use milter && \ + newinitd "${FILESDIR}/clamav-milter.initd" clamav-milter + + if ! use libclamav-only ; then + if use systemd ; then + # The tmpfiles entry is behind USE=systemd because the + # upstream OpenRC service files should (and do) ensure that + # the directories they need exist and have the correct + # permissions without the help of opentmpfiles. There are + # years-old root exploits in opentmpfiles, the design is + # fundamentally flawed, and the maintainer is not up to + # the task of fixing it. + dotmpfiles "${FILESDIR}/tmpfiles.d/clamav.conf" + systemd_newunit "${FILESDIR}/clamd_at.service-0.104.0" "[email protected]" + systemd_dounit "${FILESDIR}/clamd.service" + systemd_newunit "${FILESDIR}/freshclamd.service-r1" \ + "freshclamd.service" + fi + + if use clamapp ; then + # Modify /etc/{clamd,freshclam}.conf to be usable out of the box + sed -e "s:^\(Example\):\# \1:" \ + -e "s:^#\(PidFile\) .*:\1 ${EPREFIX}/run/clamd.pid:" \ + -e "s/^#\(LocalSocket .*\)/\1/" \ + -e "s/^#\(User .*\)/\1/" \ + -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \ + -e "s:^\#\(LogTime\).*:\1 yes:" \ + -e "s/^#\(DatabaseDirectory .*\)/\1/" \ + "${ED}"/etc/clamav/clamd.conf.sample > \ + "${ED}"/etc/clamav/clamd.conf || die + + sed -e "s:^\(Example\):\# \1:" \ + -e "s:^#\(PidFile\) .*:\1 ${EPREFIX}/run/freshclam.pid:" \ + -e "s/^#\(DatabaseOwner .*\)/\1/" \ + -e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \ + -e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamav/clamd.conf:" \ + -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ + -e "s/^#\(DatabaseDirectory .*\)/\1/" \ + "${ED}"/etc/clamav/freshclam.conf.sample > \ + "${ED}"/etc/clamav/freshclam.conf || die + + if use milter ; then + # Note: only keep the "unix" ClamdSocket and MilterSocket! + sed -e "s:^\(Example\):\# \1:" \ + -e "s:^#\(PidFile) .*\:\1 ${EPREFIX}/run/clamav-milter.pid:" \ + -e "s/^#\(ClamdSocket unix:.*\)/\1/" \ + -e "s/^#\(User .*\)/\1/" \ + -e "s/^#\(MilterSocket unix:.*\)/\1/" \ + -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \ + "${ED}"/etc/clamav/clamav-milter.conf.sample > \ + "${ED}"/etc/clamav/clamav-milter.conf || die + + systemd_newunit "${FILESDIR}/clamav-milter.service-0.104.0" clamav-milter.service + fi + + local i + for i in clamd freshclam clamav-milter + do + if [[ -f "${ED}"/etc/"${i}".conf.sample ]] ; then + mv "${ED}"/etc/"${i}".conf{.sample,} || die + fi + done + + # These both need to be writable by the clamav user + # TODO: use syslog by default; that's what it's for. + diropts -o clamav -g clamav + keepdir /var/lib/clamav + keepdir /var/log/clamav + fi + fi + + if use doc ; then + local HTML_DOCS=( docs/html/. ) + einstalldocs + fi + + # Don't install man pages for utilities we didn't install + if use libclamav-only ; then + rm -r "${ED}"/usr/share/man || die + fi + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + if ! use libclamav-only ; then + if use systemd ; then + tmpfiles_process clamav.conf + fi + fi + + if use milter ; then + elog "For simple instructions how to setup the clamav-milter read the" + elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}" + fi + + local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d ) + if [[ ! -f "${databases}" ]] ; then + ewarn "You must run freshclam manually to populate the virus database" + ewarn "before starting clamav for the first time." + fi + + if ! systemd_is_booted ; then + ewarn "This version of ClamAV provides separate OpenRC services" + ewarn "for clamd, freshclam, clamav-milter, and clamonacc. The" + ewarn "clamd service now starts only the clamd daemon itself. You" + ewarn "should add freshclam (and perhaps clamav-milter) to any" + ewarn "runlevels that previously contained clamd." + fi + + if [[ -z ${REPLACING_VERSIONS} ]] && use clamonacc; then + einfo "'clamonacc' requires additional configuration before it" + einfo "can be enabled, and may not produce any output if not properly" + einfo "configured. Read the appropriate man page if clamonacc is desired." + fi +} diff --git a/app-antivirus/clamav/files/clamav-1.3.1-onenote-rs.patch b/app-antivirus/clamav/files/clamav-1.3.1-onenote-rs.patch new file mode 100644 index 000000000000..d8421a269606 --- /dev/null +++ b/app-antivirus/clamav/files/clamav-1.3.1-onenote-rs.patch @@ -0,0 +1,30 @@ +From bc17e5a2e1f324461024f5e3e5776085a6b6df37 Mon Sep 17 00:00:00 2001 +From: Matt Jolly <[email protected]> +Date: Mon, 24 Jun 2024 17:34:05 +1000 +Subject: [PATCH] PropertType: Specify type for custom discriminant values + +We use custom discriminant values for enum variants for "PropertType" without specifying the type. +This causes it to default to "isize" which on 64bit platforms is big enough to hold the 32bit constants, +but causes overflow when isize is 32bit. + +This issue was uncovered due to build failures on arm for Gentoo Linux as a dependency of ClamAV. + +Bug: https://bugs.gentoo.org/927214 +Signed-off-by: Matt Jolly <[email protected]> +Co-authored-by: Steven Newbury <[email protected]> +--- + src/one/property/mod.rs | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/one/property/mod.rs b/src/one/property/mod.rs +index 42841c6..fcc0481 100644 +--- a/src/one/property/mod.rs ++++ b/src/one/property/mod.rs +@@ -23,6 +23,7 @@ mod references; + pub(crate) mod simple; + pub(crate) mod time; + ++#[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq)] + #[allow(dead_code)] + #[allow(clippy::enum_clike_unportable_variant)]
