3 files changed, 395 insertions, 0 deletions
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index ecc1aad0e34d..fae8967e9eec 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index c3349593113d..c2af1a64dd97 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -55,6 +55,7 @@ DIST clamav-1.0.3.tar.gz 10341567 BLAKE2B 9530c5e57cf4908ee15800a5aa50b8defc7b86
 DIST clamav-1.1.0.tar.gz 10297532 BLAKE2B 36629f9bf23a55591002517ecbad798484d351f060220ab554797d4acd356b89cc68f83f81a415d532c51fde33f1882ddaaa847c1935abb6b12d571b3976d66f SHA512 1a1cfd2e43518eafa127304704193e96162410d676fca6c868fd42f871412bbe91f379bb5c74abd89c14cfa3d580339bb79c10868776e46427a7afd9b55dc851
 DIST clamav-1.1.3.tar.gz 10304772 BLAKE2B 2bf2f7822d8ed7bfa6040312345d6dfbf5149e6ee60d10d46fe0683b56028e0c72b3371e9b9bc4c780051f11899d7405a35484a3f1deafdfd9b0c18613f52b36 SHA512 1fab8754e793938182dd6a5f2742c4f3e236177e150ab1f1a6064d2e0f33ae1329396ba14ba12f72eee505fb6c8e6f302377ec7e3d5f172a52d1ec89b23da072
 DIST clamav-1.2.1.tar.gz 10370350 BLAKE2B bc875a92adecffca3b65976376529043a27520bc3821da2d7563e5cb69733ecf291a2800d2a3ad65b1cb0cc4f35a1605e29e27128dd0a775740a9f640c3436ef SHA512 abe0c1a84cb399df00485bf0f8726f01cb84ad129e40642b60146e5880981f7216d9da354e7569004711e417cf8b757ae33a6d5a39b615bce7c7e21e97c9df1d
+DIST clamav-1.2.2.tar.gz 10372690 BLAKE2B 47940236e38296ac908be4c5d1c5ce8bbc9ec5c69fa87b2472c941d2de9642e0ab6a59c63038aa706079e8efeb161083db69ad03eaaf27a6d05f4f1a5bb70aff SHA512 32562230f367a230f70dfca5ed5000ee8829a0da7452b0113e9dbaa47ef6b21901001f741b0e52ce52c02fe8f834bd559bcbdf1ea20495bead9c4976c3a4cc92
 DIST clang-sys-1.4.0.crate 38679 BLAKE2B d15bdae2142ed26b4f6bd037bd2062e8c4b7b87fc5b749b872a95ff1952d000066c255aa0984e5f9c4a5c88066db4a20cfd048db4ba5a59b331d5ffa5e9a281d SHA512 062189bb0a341e2e85de4987f4b564c1fc69e4005c9c42cfedb61dee5f48db9126a8114d1d97be1b9c21b8c885243751232fbe8cf532e1d2be593308fe45216a
 DIST clang-sys-1.6.1.crate 41346 BLAKE2B b70104e6c6b3c1b85caa111c2b1fb2c20d30eeb85059bc616afc49bce9409f7ee2dd8b800750a466accad6a74ef29d10c6a2ee4459d854a2c0c54050ff51cc4b SHA512 a6c62c1d3faae3796f5e7d98ed4f1a8119f0ffaf8fceee8e728cd4da57b0140e82631012450bb0c551cd13814a97065e9e47015320707a87bdfbb6fd317e952c
 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
@@ -314,4 +315,5 @@ EBUILD clamav-1.0.3.ebuild 10126 BLAKE2B 34c036854a0479df2cc6e01946cbcbd97fcb8ce
 EBUILD clamav-1.1.0.ebuild 10836 BLAKE2B 41f2c6615da9b43e587df568df57d614af383eaf7bc01da4fb850c0b1de772f4b64729f129833f74af9c81061353f4b392f52b9036753e1b57f4b4ec8bb2cf44 SHA512 65b7b1a03ebf03b535b69701d92e4393ff662b47f337f94fd64f084f852514573f02da72c942290faa394f457ac5c0a5da191f879dcb6b9e98b14a1063a8100a
 EBUILD clamav-1.1.3.ebuild 10659 BLAKE2B 4e6bb5c12c93f3cc9cd0c3b6b8e05692d262fd1fa9c5a527b474e3093732273c36977fb54227e7a65a4e7c9b8a95f50cf2b6848aa77c35f903a36f5c1922311b SHA512 e76db5e9a5595c1a679dd50e739f7b4673e180a2394868e405e848b37ce1ad5a5ae19a5ac5e17717f89e09ae2dc3671e472d6c984b4cc0a2a49f5d887057842b
 EBUILD clamav-1.2.1.ebuild 10827 BLAKE2B 5501bae5217a01c90422dec2dcf4d45d120a72b250b1bff3249e29956b9c1be7fc96e2db8d2ea66895e689e0ac5ee7ca00ad5489a7adbc09f4c5ca9724181312 SHA512 a4628100abf574e22031ab1a77f4a72d1acdf9bd1669fd8185c7454037e11022ce15cddbfa58207159f8d23f205d13f2642861eecd0da3cb694992fb38e616af
+EBUILD clamav-1.2.2.ebuild 10649 BLAKE2B c569ad5917b8218deed0e811e25af98e8ca30144e7657e022497cade89265aac580e52aabe13f8fb138901f1e8fd644318ae4dd9806e709e7c1850bcdf5d00bb SHA512 8479263fa16c6b5bc1c41e7d274ad51c4ac4400e5e5f081a181f079618bd95c875f071a83170d37efa1b0a8b82825f48527687818f42b73bef9f0a2967b1e777
 MISC metadata.xml 1730 BLAKE2B aba280ce07d3b1260cd558e66749acf65b47dc2878eda7e971492bd1851a487bff7eaaedc7f7279067efae11f428e78c46dcdfd50e4daeefd0b8a89ea37f9f10 SHA512 739eaa4f97410e9d4c5d4ce22be4867c4738b5d4ee92cc2b377a2f1505e705be6cfb3471482ab563eae10a64bdbeea19b82e23c371386201bd7f3b85a065f99d
diff --git a/app-antivirus/clamav/clamav-1.2.2.ebuild b/app-antivirus/clamav/clamav-1.2.2.ebuild
new file mode 100644
index 000000000000..1bd9569ed03f
--- /dev/null
+++ b/app-antivirus/clamav/clamav-1.2.2.ebuild
@@ -0,0 +1,393 @@
+# 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_{10..12} )
+
+CRATES="
+	adler@1.0.2
+	aho-corasick@1.0.5
+	autocfg@1.1.0
+	base64@0.21.3
+	bindgen@0.65.1
+	bit_field@0.10.2
+	bitflags@1.3.2
+	bitflags@2.4.0
+	block-buffer@0.10.4
+	bumpalo@3.13.0
+	bytemuck@1.14.0
+	byteorder@1.4.3
+	cbindgen@0.25.0
+	cc@1.0.83
+	cexpr@0.6.0
+	cfg-if@1.0.0
+	clang-sys@1.6.1
+	color_quant@1.1.0
+	cpufeatures@0.2.9
+	crc32fast@1.3.2
+	crossbeam-channel@0.5.8
+	crossbeam-deque@0.8.3
+	crossbeam-epoch@0.9.15
+	crossbeam-utils@0.8.16
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	digest@0.10.7
+	either@1.9.0
+	errno-dragonfly@0.1.2
+	errno@0.3.3
+	exr@1.7.0
+	fastrand@2.0.0
+	fdeflate@0.3.0
+	flate2@1.0.27
+	flume@0.10.14
+	futures-core@0.3.28
+	futures-sink@0.3.28
+	generic-array@0.14.7
+	getrandom@0.2.10
+	gif@0.12.0
+	glob@0.3.1
+	half@2.2.1
+	hashbrown@0.12.3
+	heck@0.4.1
+	hermit-abi@0.3.2
+	hex@0.4.3
+	home@0.5.5
+	image@0.24.7
+	indexmap@1.9.3
+	itoa@1.0.9
+	jpeg-decoder@0.3.0
+	js-sys@0.3.64
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	lebe@0.5.2
+	libc@0.2.147
+	libloading@0.7.4
+	linux-raw-sys@0.4.5
+	lock_api@0.4.10
+	log@0.4.20
+	memchr@2.6.3
+	memoffset@0.9.0
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.1
+	nanorand@0.7.0
+	nom@7.1.3
+	num-complex@0.4.4
+	num-integer@0.1.45
+	num-rational@0.4.1
+	num-traits@0.2.16
+	num_cpus@1.16.0
+	once_cell@1.18.0
+	peeking_take_while@0.1.2
+	pin-project-internal@1.1.3
+	pin-project@1.1.3
+	png@0.17.10
+	prettyplease@0.2.15
+	primal-check@0.3.3
+	proc-macro2@1.0.66
+	qoi@0.4.1
+	quote@1.0.33
+	rayon-core@1.11.0
+	rayon@1.7.0
+	redox_syscall@0.3.5
+	regex-automata@0.3.8
+	regex-syntax@0.7.5
+	regex@1.9.5
+	rustc-hash@1.1.0
+	rustdct@0.7.1
+	rustfft@6.1.0
+	rustix@0.38.11
+	ryu@1.0.15
+	scopeguard@1.2.0
+	serde@1.0.188
+	serde_derive@1.0.188
+	serde_json@1.0.105
+	sha1@0.10.5
+	sha2@0.10.7
+	shlex@1.2.0
+	simd-adler32@0.3.7
+	smallvec@1.11.0
+	spin@0.9.8
+	strength_reduce@0.2.4
+	syn@1.0.109
+	syn@2.0.31
+	tempfile@3.8.0
+	thiserror-impl@1.0.48
+	thiserror@1.0.48
+	tiff@0.9.0
+	toml@0.5.11
+	transpose@0.2.2
+	typenum@1.16.0
+	unicode-ident@1.0.11
+	unicode-segmentation@1.10.1
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.87
+	wasm-bindgen-macro-support@0.2.87
+	wasm-bindgen-macro@0.2.87
+	wasm-bindgen-shared@0.2.87
+	wasm-bindgen@0.2.87
+	weezl@0.1.7
+	which@4.4.2
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.48.0
+	windows-targets@0.48.5
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_msvc@0.48.5
+	windows_i686_gnu@0.48.5
+	windows_i686_msvc@0.48.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_msvc@0.48.5
+	zune-inflate@0.2.54
+"
+
+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_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" "clamd@.service"
+			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/" \
+				-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/" \
+				-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
+}