commit:     ee7b07b3f45bdef3bda63cb106678dc28aba3dc7
Author:     Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Wed Aug 30 04:06:08 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 04:18:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee7b07b3

app-antivirus/clamav: drop 1.2.0_rc

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

 app-antivirus/clamav/Manifest               |   1 -
 app-antivirus/clamav/clamav-1.2.0_rc.ebuild | 403 ----------------------------
 2 files changed, 404 deletions(-)

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index ef97e3368c0f..077243f07008 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -29,7 +29,6 @@ DIST clamav-0.103.8.tar.gz 16524716 BLAKE2B 
207a6087de9134586215a4f3fe02cb071135
 DIST clamav-1.0.2.tar.gz 10332308 BLAKE2B 
98b95079bab6d4072fb301837d2c2a4f1c1b0f4feebc9c04a97f23408e7a17ee3d401c5ed087c70d8c324d49e9ee83afb363e884f62f8e4747d9c9306f8edc50
 SHA512 
6d3f52633e9a33c2608c3f8f33cf175e4ad5ed1639594f6683d23e47b9ef01305ff4f21643fcc7aacd5462bae1cc8022f609fe24c8181a148b545db84d8035c8
 DIST clamav-1.1.0.tar.gz 10297532 BLAKE2B 
36629f9bf23a55591002517ecbad798484d351f060220ab554797d4acd356b89cc68f83f81a415d532c51fde33f1882ddaaa847c1935abb6b12d571b3976d66f
 SHA512 
1a1cfd2e43518eafa127304704193e96162410d676fca6c868fd42f871412bbe91f379bb5c74abd89c14cfa3d580339bb79c10868776e46427a7afd9b55dc851
 DIST clamav-1.1.2.tar.gz 10305082 BLAKE2B 
5c0a4c2d66fc8b3207746d752c76683115f720040095d109c272bb0355bd06a2c8f374f7ecc7d8b76e29fa2e8a3dae48e8ce28f125d5f4cbc0e2449dafba6b31
 SHA512 
1b9415dd5ca4c5357c5b01b04600694003ae35571b511b05db78574cfb4095eaa9a05df4fac5518cecb258bc70ebb75bd1799041e1e29b89228fa6e7aa31946b
-DIST clamav-1.2.0-rc.tar.gz 10361345 BLAKE2B 
3379c077e29c213cfb861cef4250c930e184ac3de40ac97310cdb05871e1c91168d6c5caf54af5f120eb589f963407d44f0709e438879e334342929226751852
 SHA512 
8bf764eb1f507f0a06b00511a84888c3a56208819e451d3923dd79d678f326d9de5c1aafe5fa808c852d8f5f7ed47416d592a63194b4b533ff8077d4a6593d71
 DIST clamav-1.2.0.tar.gz 10369807 BLAKE2B 
7f3a21e0c32766be27ffce82eb55139df2bb50239d58329c3da83d3c3cb1f803ad24fe957452c9f870e93906435658346d98bfe7c51d03eb800af8378eabf3ea
 SHA512 
4ce0a50137f73922263045dc0eff2b3c55a5db69ff2a2a42367ba32a610738152cfb6d1393208d6cd2e9313e42b7d14465f976f48b88d4a95205a4569325fcb2
 DIST clang-sys-1.4.0.crate 38679 BLAKE2B 
d15bdae2142ed26b4f6bd037bd2062e8c4b7b87fc5b749b872a95ff1952d000066c255aa0984e5f9c4a5c88066db4a20cfd048db4ba5a59b331d5ffa5e9a281d
 SHA512 
062189bb0a341e2e85de4987f4b564c1fc69e4005c9c42cfedb61dee5f48db9126a8114d1d97be1b9c21b8c885243751232fbe8cf532e1d2be593308fe45216a
 DIST clang-sys-1.6.1.crate 41346 BLAKE2B 
b70104e6c6b3c1b85caa111c2b1fb2c20d30eeb85059bc616afc49bce9409f7ee2dd8b800750a466accad6a74ef29d10c6a2ee4459d854a2c0c54050ff51cc4b
 SHA512 
a6c62c1d3faae3796f5e7d98ed4f1a8119f0ffaf8fceee8e728cd4da57b0140e82631012450bb0c551cd13814a97065e9e47015320707a87bdfbb6fd317e952c

diff --git a/app-antivirus/clamav/clamav-1.2.0_rc.ebuild 
b/app-antivirus/clamav/clamav-1.2.0_rc.ebuild
deleted file mode 100644
index 634cb887c9f3..000000000000
--- a/app-antivirus/clamav/clamav-1.2.0_rc.ebuild
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright 1999-2023 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} )
-
-# Auto-Generated by cargo-ebuild 0.5.4
-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]+wasi-snapshot-preview1
-       [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]
-"
-
-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-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" 
"[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/" \
-                               -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
-}

Reply via email to