From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1188383-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 022A8138359
for <garchives@archives.gentoo.org>; Fri, 17 Jul 2020 15:45:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 11AB7E087E;
Fri, 17 Jul 2020 15:45:39 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id AFC89E087E
for <gentoo-commits@lists.gentoo.org>; Fri, 17 Jul 2020 15:45:38 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id DF33B34F309
for <gentoo-commits@lists.gentoo.org>; Fri, 17 Jul 2020 15:45:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id EFD6E29A
for <gentoo-commits@lists.gentoo.org>; Fri, 17 Jul 2020 15:45:32 +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: <1595000599.27642167dbd73da270d499aa4ab19617576f3c96.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.102.3.ebuild
X-VCS-Directories: app-antivirus/clamav/
X-VCS-Committer: mjo
X-VCS-Committer-Name: Michael Orlitzky
X-VCS-Revision: 27642167dbd73da270d499aa4ab19617576f3c96
X-VCS-Branch: master
Date: Fri, 17 Jul 2020 15:45:32 +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: e67108e7-9e99-4a6c-b20f-f90d3dba2dbd
X-Archives-Hash: 95ab3667441292ee3f4b952c6a1f50a0
commit: 27642167dbd73da270d499aa4ab19617576f3c96
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 17 15:43:19 2020 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Jul 17 15:43:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27642167
app-antivirus/clamav: remove old vulnerable version.
Bug: https://bugs.gentoo.org/732944
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
app-antivirus/clamav/Manifest | 1 -
app-antivirus/clamav/clamav-0.102.3.ebuild | 214 -----------------------------
2 files changed, 215 deletions(-)
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index e0ddd86c54d..fdf9ea6c972 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,2 +1 @@
-DIST clamav-0.102.3.tar.gz 13226108 BLAKE2B 741c0cc6a088ffe880eabb7a59151b3c13c5754f9cb36582ffca9cbeea6b039e3c49b7155ba14fa302e9ee4bfa6adf8b98f0e29f2354ea8569b11b1ed2b2532c SHA512 d239718814b303fb0f1655d9bdaf3675d888eea57e786d927eafabb7b6f58cd7f5fb7dc149511c2af6f800dcc919f2e1d6954110d45b9e16619c632e8d2b37f2
DIST clamav-0.102.4.tar.gz 13234444 BLAKE2B 7109da3e2281472032777b8a9d14ca6ff345aead33e5aaf0b9d1ff4721459926062f789dd1f7e8637155e4b9f3bce9f78127bf450f32baf3f1006b8083d3431a SHA512 29893deb8d2d913dff72331875d3dc3a10356bfb254ddfe1c1933b3ea4f8b76c96a1b840f95e72be36cbc0e00b9ec35e395225ef264761f53e709bb1026a4f09
diff --git a/app-antivirus/clamav/clamav-0.102.3.ebuild b/app-antivirus/clamav/clamav-0.102.3.ebuild
deleted file mode 100644
index 53ece5a2bf2..00000000000
--- a/app-antivirus/clamav/clamav-0.102.3.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux test uclibc xml"
-
-REQUIRED_USE="libclamav-only? ( !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 )
- >=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 )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
- xml? ( dev-libs/libxml2 )"
-
-BDEPEND="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.101.2-tinfo.patch" #670729
- "${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
- "${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
-)
-
-src_prepare() {
- default
- eautoconf
-}
-
-src_configure() {
- use elibc_musl && append-ldflags -lfts
- use ppc64 && append-flags -mminimal-toc
- use uclibc && export ac_cv_type_error_t=yes
-
- # 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 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
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm -rf "${ED}"/var/lib/clamav || die
-
- if ! use libclamav-only ; then
- newinitd "${FILESDIR}"/clamd.initd-r6 clamd
- newconfd "${FILESDIR}"/clamd.conf-r1 clamd
-
- systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
- systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
- systemd_dounit "${FILESDIR}/clamd.service"
- systemd_dounit "${FILESDIR}/freshclamd.service"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/clamav.logrotate clamav
-
- # Modify /etc/{clamd,freshclam}.conf to be usable out of the box
- sed -i -e "s:^\(Example\):\# \1:" \
- -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
- -e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
- -e "s:.*\(User\) .*:\1 clamav:" \
- -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
- -e "s:^\#\(LogTime\).*:\1 yes:" \
- -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
- -e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
- "${ED}"/etc/clamd.conf.sample || die
-
- sed -i -e "s:^\(Example\):\# \1:" \
- -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
- -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
- -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:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
- -e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
- "${ED}"/etc/freshclam.conf.sample || die
-
- if use milter ; then
- # MilterSocket one to include ' /' because there is a 2nd line for
- # inet: which we want to leave
- ##dodoc "${FILESDIR}"/clamav-milter.README.gentoo
- sed -i -e "s:^\(Example\):\# \1:" \
- -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
- -e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
- -e "s:.*\(User\) .*:\1 clamav:" \
- -e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
- -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
- -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 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
-
- elog "For instructions on how to use clamonacc, see"
- elog
- elog " https://www.clamav.net/documents/on-access-scanning"
-}