forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app-antivirus/clamav: ClamAV 0.103.2 security patch release
Fixes CVE-2021-1386, CVE-2021-1252, CVE-2021-1404, CVE-2021-1405 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Thomas Raschbacher <[email protected]>
- Loading branch information
Showing
2 changed files
with
236 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| DIST clamav-0.102.4.tar.gz 13234444 BLAKE2B 7109da3e2281472032777b8a9d14ca6ff345aead33e5aaf0b9d1ff4721459926062f789dd1f7e8637155e4b9f3bce9f78127bf450f32baf3f1006b8083d3431a SHA512 29893deb8d2d913dff72331875d3dc3a10356bfb254ddfe1c1933b3ea4f8b76c96a1b840f95e72be36cbc0e00b9ec35e395225ef264761f53e709bb1026a4f09 | ||
| DIST clamav-0.103.1.tar.gz 13369791 BLAKE2B 974716a17e67240ef606b074584a1ac344f1d5915347aaa02b388570ea543981433c482423b99f5d07054bdf4dce8a0d043afdd52b42d49ace468f3d801c3353 SHA512 f13e9542898ef42c0db6f7826bcb220b9cb57de2a88bfedc6c991b76ff06c59290522d31119132eaa2093da58c5069d63103f6260e271497bda2b472c3cd6ffb | ||
| DIST clamav-0.103.2.tar.gz 13387954 BLAKE2B de0ececd2fe4486d2e8194dbeb45bfb74086ab3eb45fcab7590e75aa5a2242981066a4e8fa99b571cf7278f4516d986ad1a24254a8fe2c5caf4c870b3179c4b6 SHA512 87d47c4529a57da0b47b3744a279996ca24fa74ce10d7e27a53c19c1e13098af680e0e48ed767122bb2bbd3f927302451da84ccf51a933e7e3556ef43cbe9f45 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,235 @@ | ||
| # Copyright 1999-2021 Gentoo Authors | ||
| # Distributed under the terms of the GNU General Public License v2 | ||
|
|
||
| EAPI=7 | ||
|
|
||
| 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" | ||
| IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux systemd test uclibc 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 ) | ||
| !libressl? ( dev-libs/openssl:0= ) | ||
| libressl? ( dev-libs/libressl: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 | ||
| 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 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" "[email protected]" | ||
| 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" 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 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." | ||
| } |