From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1550711-garchives=archives.gentoo.org@lists.gentoo.org>
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 08A9A15800A
	for <garchives@archives.gentoo.org>; Wed, 30 Aug 2023 10:05:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E720D2BC01C;
	Wed, 30 Aug 2023 10:05:03 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id C07522BC01C
	for <gentoo-commits@lists.gentoo.org>; Wed, 30 Aug 2023 10:05:03 +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) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id C3F0733BEC7
	for <gentoo-commits@lists.gentoo.org>; Wed, 30 Aug 2023 10:05:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id F3FD710DD
	for <gentoo-commits@lists.gentoo.org>; Wed, 30 Aug 2023 10:05:00 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1693389864.1d9941cd780673c4182616dc32b09b0521398e39.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamav/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-antivirus/clamav/Manifest app-antivirus/clamav/clamav-1.0.2-r1.ebuild
X-VCS-Directories: app-antivirus/clamav/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 1d9941cd780673c4182616dc32b09b0521398e39
X-VCS-Branch: master
Date: Wed, 30 Aug 2023 10:05:00 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 12cfa81d-f204-44ad-9e4a-ef5626ff315e
X-Archives-Hash: d157c6962b084c0871e380a74b4a8c9a

commit:     1d9941cd780673c4182616dc32b09b0521398e39
Author:     Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Wed Aug 30 09:33:06 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 10:04:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d9941cd

app-antivirus/clamav: drop 1.0.2-r1

Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/32528
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-antivirus/clamav/Manifest               |   1 -
 app-antivirus/clamav/clamav-1.0.2-r1.ebuild | 381 ----------------------------
 2 files changed, 382 deletions(-)

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 092e8dfb603a..965dd3686b26 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -26,7 +26,6 @@ DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clamav-0.103.10.tar.gz 16538627 BLAKE2B 78251d37a926ac890cf6163a933edc874145df53ac68bb68f81a27027bf681625334a00a5cca952dfe42280907c413bceac9a79c9e2cf26f714b24757c696353 SHA512 fceda0297f32b0741a978e365a9fb9fe1c24c0d5027ee41665516917fbff405c01621cb0894bcfa70bc0884332987e1ecaa096a344580b67c3b401f2a77bc78c
 DIST clamav-0.103.8.tar.gz 16524716 BLAKE2B 207a6087de9134586215a4f3fe02cb071135c38fac792f6cb2d4c4a3c9e596bff5dd0a0ac3dd9f6018771d866fa9e64223933f96cec3ee6e8ce17a743c3d952f SHA512 8e030fef5788cf4df8f4d878363df1e5d9abcaa209b9f998f57334ede481d755b33958b5e9bb82be9643cb7442814711e4c9978314cadd7eb9161fee03b74439
-DIST clamav-1.0.2.tar.gz 10332308 BLAKE2B 98b95079bab6d4072fb301837d2c2a4f1c1b0f4feebc9c04a97f23408e7a17ee3d401c5ed087c70d8c324d49e9ee83afb363e884f62f8e4747d9c9306f8edc50 SHA512 6d3f52633e9a33c2608c3f8f33cf175e4ad5ed1639594f6683d23e47b9ef01305ff4f21643fcc7aacd5462bae1cc8022f609fe24c8181a148b545db84d8035c8
 DIST clamav-1.0.3.tar.gz 10341567 BLAKE2B 9530c5e57cf4908ee15800a5aa50b8defc7b86872e1fb3cf177fa5d2759aa6fde93c52d8d6da8890840990486474964b164eb184647de59ec9aec6e3a4adfae2 SHA512 9d0c0ffe473bde5733f6d114f73ffffd955e6b2b54079231ba51771268f15c285933061b102e86b101a97c64e5da0e02adecb3cb9ec5112b91eb42e06c561369
 DIST clamav-1.1.0.tar.gz 10297532 BLAKE2B 36629f9bf23a55591002517ecbad798484d351f060220ab554797d4acd356b89cc68f83f81a415d532c51fde33f1882ddaaa847c1935abb6b12d571b3976d66f SHA512 1a1cfd2e43518eafa127304704193e96162410d676fca6c868fd42f871412bbe91f379bb5c74abd89c14cfa3d580339bb79c10868776e46427a7afd9b55dc851
 DIST clamav-1.1.2.tar.gz 10305082 BLAKE2B 5c0a4c2d66fc8b3207746d752c76683115f720040095d109c272bb0355bd06a2c8f374f7ecc7d8b76e29fa2e8a3dae48e8ce28f125d5f4cbc0e2449dafba6b31 SHA512 1b9415dd5ca4c5357c5b01b04600694003ae35571b511b05db78574cfb4095eaa9a05df4fac5518cecb258bc70ebb75bd1799041e1e29b89228fa6e7aa31946b

diff --git a/app-antivirus/clamav/clamav-1.0.2-r1.ebuild b/app-antivirus/clamav/clamav-1.0.2-r1.ebuild
deleted file mode 100644
index a84aae216d09..000000000000
--- a/app-antivirus/clamav/clamav-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2023 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
-CRATES="
-	adler@1.0.2
-	ansi_term@0.12.1
-	atty@0.2.14
-	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
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	clang-sys@1.4.0
-	clap@2.34.0
-	color_quant@1.1.0
-	cpufeatures@0.2.5
-	crc32fast@1.3.2
-	crossbeam-channel@0.5.6
-	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
-	exr@1.5.3
-	fastrand@1.8.0
-	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.1.19
-	hermit-abi@0.2.6
-	hex@0.4.3
-	image@0.24.5
-	indexmap@1.9.2
-	instant@0.1.12
-	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
-	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
-	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.7
-	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
-	remove_dir_all@0.5.3
-	rustc-hash@1.1.0
-	rustdct@0.7.1
-	rustfft@6.1.0
-	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.1.0
-	simd-adler32@0.3.4
-	smallvec@1.10.0
-	spin@0.9.5
-	strength_reduce@0.2.4
-	strsim@0.8.0
-	syn@1.0.107
-	syn@2.0.15
-	tempfile@3.3.0
-	textwrap@0.11.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.2
-	typenum@1.16.0
-	unicode-ident@1.0.6
-	unicode-segmentation@1.10.1
-	unicode-width@0.1.10
-	vec_map@0.8.2
-	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
-	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? ( <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-doc/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
-}