From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 592A3158083 for ; Mon, 23 Sep 2024 11:12:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 813D6E2A31; Mon, 23 Sep 2024 11:12:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 615B7E2A31 for ; Mon, 23 Sep 2024 11:12:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 39A2D343180 for ; Mon, 23 Sep 2024 11:12:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C520827ED for ; Mon, 23 Sep 2024 11:12:05 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1727089916.6091414aa294862a44a98047c7a0f738b845d4cd.kangie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamav/files/, app-antivirus/clamav/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-antivirus/clamav/clamav-1.0.7.ebuild app-antivirus/clamav/files/clamav-1.0.7-cmake-python-version.patch X-VCS-Directories: app-antivirus/clamav/files/ app-antivirus/clamav/ X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 6091414aa294862a44a98047c7a0f738b845d4cd X-VCS-Branch: master Date: Mon, 23 Sep 2024 11:12:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 34bdaa0a-e8ab-4144-b062-c18b5d93e2ed X-Archives-Hash: 4b00d2c575f9b5b55ed5399bc737c780 commit: 6091414aa294862a44a98047c7a0f738b845d4cd Author: Matt Jolly gentoo org> AuthorDate: Mon Sep 23 11:09:13 2024 +0000 Commit: Matt Jolly gentoo org> CommitDate: Mon Sep 23 11:11:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6091414a app-antivirus/clamav: add 1.0.7 Bug: https://bugs.gentoo.org/940140 Signed-off-by: Matt Jolly gentoo.org> app-antivirus/clamav/clamav-1.0.7.ebuild | 404 +++++++++++++++++++++ .../files/clamav-1.0.7-cmake-python-version.patch | 51 +++ 2 files changed, 455 insertions(+) diff --git a/app-antivirus/clamav/clamav-1.0.7.ebuild b/app-antivirus/clamav/clamav-1.0.7.ebuild new file mode 100644 index 000000000000..fb626bfc7c34 --- /dev/null +++ b/app-antivirus/clamav/clamav-1.0.7.ebuild @@ -0,0 +1,404 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_MAX_SLOT=13 +PYTHON_COMPAT=( python3_{10..12} ) + +# Auto-Generated by cargo-ebuild 0.5.4-r1 +CRATES=" + adler@1.0.2 + autocfg@1.1.0 + bindgen@0.65.1 + bit_field@0.10.1 + bitflags@1.3.2 + block-buffer@0.10.3 + bumpalo@3.12.0 + bytemuck@1.13.0 + byteorder@1.4.3 + cbindgen@0.20.0 + cc@1.0.83 + cexpr@0.6.0 + cfg-if@1.0.0 + clang-sys@1.4.0 + color_quant@1.1.0 + cpufeatures@0.2.5 + crc32fast@1.3.2 + crossbeam-channel@0.5.8 + crossbeam-deque@0.8.2 + crossbeam-epoch@0.9.13 + crossbeam-utils@0.8.14 + crunchy@0.2.2 + crypto-common@0.1.6 + digest@0.10.6 + either@1.8.1 + errno@0.3.3 + errno-dragonfly@0.1.2 + exr@1.5.3 + fastrand@1.8.0 + fdeflate@0.3.4 + flate2@1.0.25 + flume@0.10.14 + futures-core@0.3.26 + futures-sink@0.3.26 + generic-array@0.14.6 + getrandom@0.2.8 + gif@0.11.4 + glob@0.3.1 + half@2.2.1 + hashbrown@0.12.3 + heck@0.3.3 + hermit-abi@0.2.6 + hermit-abi@0.3.3 + hex@0.4.3 + image@0.24.5 + indexmap@1.9.2 + instant@0.1.12 + io-lifetimes@1.0.11 + itoa@1.0.5 + jpeg-decoder@0.3.0 + js-sys@0.3.61 + lazy_static@1.4.0 + lazycell@1.3.0 + lebe@0.5.2 + libc@0.2.139 + libloading@0.7.4 + linux-raw-sys@0.1.4 + lock_api@0.4.9 + log@0.4.17 + memchr@2.5.0 + memoffset@0.7.1 + minimal-lexical@0.2.1 + miniz_oxide@0.6.2 + miniz_oxide@0.7.2 + nanorand@0.7.0 + nom@7.1.3 + num-complex@0.4.3 + num-integer@0.1.45 + num-rational@0.4.1 + num-traits@0.2.15 + num_cpus@1.15.0 + once_cell@1.17.0 + peeking_take_while@0.1.2 + pin-project@1.0.12 + pin-project-internal@1.0.12 + png@0.17.13 + prettyplease@0.2.4 + primal-check@0.3.3 + proc-macro2@1.0.66 + quote@1.0.26 + rayon@1.6.1 + rayon-core@1.10.2 + redox_syscall@0.2.16 + regex@1.7.1 + regex-syntax@0.6.28 + rustc-hash@1.1.0 + rustdct@0.7.1 + rustfft@6.1.0 + rustix@0.36.15 + ryu@1.0.12 + scoped_threadpool@0.1.9 + scopeguard@1.1.0 + serde@1.0.152 + serde_derive@1.0.152 + serde_json@1.0.93 + sha2@0.10.6 + shlex@1.3.0 + simd-adler32@0.3.4 + smallvec@1.10.0 + spin@0.9.8 + strength_reduce@0.2.4 + syn@1.0.107 + syn@2.0.15 + tempfile@3.4.0 + thiserror@1.0.38 + thiserror-impl@1.0.38 + threadpool@1.8.1 + tiff@0.8.1 + toml@0.5.11 + transpose@0.2.3 + typenum@1.16.0 + unicode-ident@1.0.6 + unicode-segmentation@1.10.1 + version_check@0.9.4 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen@0.2.84 + wasm-bindgen-backend@0.2.84 + wasm-bindgen-macro@0.2.84 + wasm-bindgen-macro-support@0.2.84 + wasm-bindgen-shared@0.2.84 + weezl@0.1.7 + which@4.4.0 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-sys@0.42.0 + windows-sys@0.45.0 + windows-sys@0.48.0 + windows-targets@0.42.2 + windows-targets@0.48.5 + windows_aarch64_gnullvm@0.42.2 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.42.2 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.42.2 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.42.2 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.42.2 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.42.2 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.42.2 + windows_x86_64_msvc@0.48.5 + zune-inflate@0.2.42 +" + +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" +SLOT="0/lts" +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? ( \ + "${ED}"/etc/clamav/clamd.conf || die + + sed -e "s:^\(Example\):\# \1:" \ + -e "s/^#\(PidFile .*\)/\1/" \ + -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/" \ + -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 +} diff --git a/app-antivirus/clamav/files/clamav-1.0.7-cmake-python-version.patch b/app-antivirus/clamav/files/clamav-1.0.7-cmake-python-version.patch new file mode 100644 index 000000000000..58ed0d29ee40 --- /dev/null +++ b/app-antivirus/clamav/files/clamav-1.0.7-cmake-python-version.patch @@ -0,0 +1,51 @@ +https://github.com/Cisco-Talos/clamav/commit/f4280e9a690f2a5b657118e515b089f494a1e464 +From: Matt Jolly +Date: Wed, 30 Nov 2022 16:14:39 +1100 +Subject: [PATCH] CMake: Enable selection of a specific python impl + +On distros with multiple python impls it can be useful to select +a specific version rather than whatever CMake thinks is appopriate. + +This patch enables users to instruct CMake to look for a specific +version of python by passing `-DPYTHON_FIND_VER`. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -223,20 +223,26 @@ if(ENABLE_TESTS) + find_package(Libcheck REQUIRED) + + # Used to generate the test files and for the application feature test framework +- find_package(Python3 REQUIRED) ++ # In distros that support multiple implementations of python it is helpful to specify the impl to use ++ if(DEFINED PYTHON_FIND_VERSION) ++ find_package(Python3 EXACT ${PYTHON_FIND_VERSION} REQUIRED) ++ else() ++ find_package(Python3 REQUIRED) ++ # Not requesting a specific python impl; try using pytest from the PATH ++ execute_process( ++ COMMAND pytest --version ++ RESULT_VARIABLE PYTEST_EXIT_CODE ++ ERROR_QUIET OUTPUT_QUIET ++ ) + +- # First try using pytest from the PATH +- execute_process( +- COMMAND pytest --version +- RESULT_VARIABLE PYTEST_EXIT_CODE +- ERROR_QUIET OUTPUT_QUIET +- ) ++ if(${PYTEST_EXIT_CODE} EQUAL 0) ++ # pytest found in the path. ++ set(PythonTest_COMMAND "pytest;-v") ++ endif() ++ endif() + +- if(${PYTEST_EXIT_CODE} EQUAL 0) +- # pytest found in the path. +- set(PythonTest_COMMAND "pytest;-v") +- else() +- # Not in the path, try using: python3 -m pytest ++ if("${PythonTest_COMMAND}" STREQUAL "") ++ # Not in the path or specified a python impl; try using: python3 -m pytest + execute_process( + COMMAND ${Python3_EXECUTABLE} -m pytest --version + RESULT_VARIABLE PYTEST_MODULE_EXIT_CODE