From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1393313-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 34DA1158090
for <garchives@archives.gentoo.org>; Fri, 6 May 2022 11:08:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 44EFEE0898;
Fri, 6 May 2022 11:08:27 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 264C6E0898
for <gentoo-commits@lists.gentoo.org>; Fri, 6 May 2022 11:08:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 4A844341D32
for <gentoo-commits@lists.gentoo.org>; Fri, 6 May 2022 11:08:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E3A0430
for <gentoo-commits@lists.gentoo.org>; Fri, 6 May 2022 11:08:24 +0000 (UTC)
From: "Michael Orlitzky" <mjo@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, "Michael Orlitzky" <mjo@gentoo.org>
Message-ID: <1651835266.366458c1825e3d02679535e2316da19ed0fd99af.mjo@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-0.103.5.ebuild
X-VCS-Directories: app-antivirus/clamav/
X-VCS-Committer: mjo
X-VCS-Committer-Name: Michael Orlitzky
X-VCS-Revision: 366458c1825e3d02679535e2316da19ed0fd99af
X-VCS-Branch: master
Date: Fri, 6 May 2022 11:08:24 +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: af405f56-8328-48a2-b5fc-a44167260b9c
X-Archives-Hash: a4bde185f9254ae01489f130d6d8ab76
commit: 366458c1825e3d02679535e2316da19ed0fd99af
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 11:07:46 2022 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri May 6 11:07:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=366458c1
app-antivirus/clamav: remove vulnerable clamav-0.103.5.ebuild.
Bug: https://bugs.gentoo.org/842813
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
app-antivirus/clamav/Manifest | 1 -
app-antivirus/clamav/clamav-0.103.5.ebuild | 239 -----------------------------
2 files changed, 240 deletions(-)
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index cf94a37f3ba3..085efa58f7ef 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,3 +1,2 @@
-DIST clamav-0.103.5.tar.gz 16434316 BLAKE2B c5a21b72419a8cd731656d8a8bbc79c5850895f1d8cc56cb5d19eabe2356a5dfcf88e7dc9553071a24b2719bae07cf1a941da3dbed69da8ac4ae3b8897ab32fe SHA512 242423b507eacbbd31dbae6dd0325dff87da25bb8072f2cee7a5e7cab4b8eb5ee6196c759570c1d75986a2777f0f79f92cfbd6250a30ae5b53390c75b238c29a
DIST clamav-0.103.6.tar.gz 16491761 BLAKE2B 3c43bcda4a613f81d1b31036e7323a7af7708e54af94ad30a659a8fb318d8f79f357086ce70703659298524d778374df886495cd8c75280bbbe4bae30795a85a SHA512 d39e1964678b8251bde3a9f3db30fe3d3d76cc566a86834297f4dd8489086dc9cc4c6541ca128089159f4c071d2d85b530455bd942987d3929ea0082b8ab272b
DIST clamav-0.104.2.tar.gz 11950409 BLAKE2B 7d7eb9d22ca519f7ad0c171b6cab4b59cb52787a897ab31b9567166be2223f9ea89e79f42f1e4e0caf32fcb4b008f5ce755fa136566f85fe1de7808b436f80fa SHA512 8c89a05dec6650677125177434cc49ec2298701525508cdda52358e8f98086d80892287f6267f8b7fda0aef2ca361616cb584c3059f3b066bfde65f7f1ba2df5
diff --git a/app-antivirus/clamav/clamav-0.103.5.ebuild b/app-antivirus/clamav/clamav-0.103.5.ebuild
deleted file mode 100644
index 57871e2f02fe..000000000000
--- a/app-antivirus/clamav/clamav-0.103.5.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic systemd tmpfiles
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="https://www.clamav.net/"
-SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test xml"
-
-REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
-
-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.
-CDEPEND="acct-group/clamav
- acct-user/clamav
- dev-libs/libltdl
- dev-libs/libmspack
- || ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
- dev-libs/tomsfastmath
- >=sys-libs/zlib-1.2.2:=
- bzip2? ( app-arch/bzip2 )
- clamdtop? ( sys-libs/ncurses:0 )
- clamsubmit? ( net-misc/curl dev-libs/json-c:= )
- elibc_musl? ( sys-libs/fts-standalone )
- iconv? ( virtual/libiconv )
- !libclamav-only? ( net-misc/curl )
- dev-libs/openssl:0=
- milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
- xml? ( dev-libs/libxml2 )"
-
-# We need at least autoconf-2.69-r5 because that's the first (patched)
-# version of it in Gentoo that supports ./configure --runstatedir.
-BDEPEND=">=sys-devel/autoconf-2.69-r5
- virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
- metadata-analysis-api? ( dev-libs/json-c:* )
- test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-clamav )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
- "${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
- "${FILESDIR}/${PN}-0.103.0-system-tomsfastmath.patch" # 649394
- "${FILESDIR}/${PN}-0.103.1-upstream-openrc.patch"
-)
-
-src_prepare() {
- default
-
- # Be extra sure that we're using the system copy of tomsfastmath
- einfo "removing bundled copy of dev-libs/tomsfastmath"
- rm -r libclamav/tomsfastmath || \
- die "failed to remove bundled tomsfastmath"
-
- AT_NO_RECURSIVE="yes" eautoreconf
-}
-
-src_configure() {
- use elibc_musl && append-ldflags -lfts
- use ppc64 && append-flags -mminimal-toc
-
- # according to configure help it should be
- # $(use_enable xml)
- # but that does not work
- # do not add this, since --disable-xml seems to override
- # --without-xml
- JSONUSE="--without-libjson"
-
- if use clamsubmit || use metadata-analysis-api; then
- # either of those 2 requires libjson.
- # clamsubmit will be built as soon as libjson and curl are found
- # but we only install the binary if requested
- JSONUSE="--with-libjson=${EPREFIX}/usr"
- fi
-
- local myeconfargs=(
- $(use_enable bzip2)
- $(use_enable clamonacc)
- $(use_enable clamdtop)
- $(use_enable ipv6)
- $(use_enable milter)
- $(use_enable test check)
- $(use_with xml)
- $(use_with iconv)
- ${JSONUSE}
- $(use_enable libclamav-only)
- $(use_with !libclamav-only libcurl)
- --with-system-libmspack
- --cache-file="${S}"/config.cache
- --disable-experimental
- --disable-static
- --disable-zlib-vcheck
- --enable-id-check
- --with-dbdir="${EPREFIX}"/var/lib/clamav
- # Don't call --with-zlib=/usr (see bug #699296)
- --with-zlib
- --disable-llvm
- --enable-openrc
- --runstatedir=/run
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm -rf "${ED}"/var/lib/clamav || die
-
- 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" "clamd@.service"
- systemd_dounit "${FILESDIR}/clamd.service"
- systemd_newunit "${FILESDIR}/freshclamd.service-r1" \
- "freshclamd.service"
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/clamd.logrotate" clamd
- newins "${FILESDIR}/freshclam.logrotate" freshclam
- use milter && \
- newins "${FILESDIR}/clamav-milter.logrotate-r1" clamav-milter
-
- # Modify /etc/{clamd,freshclam}.conf to be usable out of the box
- sed -i -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/clamd.conf.sample || die
-
- sed -i -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/clamd.conf:" \
- -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
- -e "s/^#\(DatabaseDirectory .*\)/\1/" \
- "${ED}"/etc/freshclam.conf.sample || die
-
- if use milter ; then
- # Note: only keep the "unix" ClamdSocket and MilterSocket!
- sed -i -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-milter.conf.sample || die
-
- cat >> "${ED}"/etc/conf.d/clamd <<-EOF
- MILTER_NICELEVEL=19
- START_MILTER=no
- EOF
-
- systemd_newunit "${FILESDIR}/clamav-milter.service-r1" 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
-
- if use doc ; then
- local HTML_DOCS=( docs/html/. )
- einstalldocs
-
- if ! use libclamav-only ; then
- doman docs/man/*.[1-8]
- fi
- fi
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-src_test() {
- if use libclamav-only ; then
- ewarn "Test target not available when USE=libclamav-only is set, skipping tests ..."
- return 0
- fi
-
- emake quick-check
-}
-
-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
-
- 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."
-}