commit:     3c15e9c20273d48f6437163ee57a48b8ba07a2d6
Author:     Thomas Raschbacher <lordvan <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 12 21:09:10 2022 +0000
Commit:     Thomas Raschbacher <lordvan <AT> gentoo <DOT> org>
CommitDate: Wed Jan 12 21:20:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c15e9c2

app-antivirus/clamav: new upstream security release

Bug: https://bugs.gentoo.org/831083
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Thomas Raschbacher <lordvan <AT> gentoo.org>

 app-antivirus/clamav/Manifest              |   1 +
 app-antivirus/clamav/clamav-0.104.2.ebuild | 215 +++++++++++++++++++++++++++++
 2 files changed, 216 insertions(+)

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index ac1d8fe982a8..e8f7c64aa8a7 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -2,3 +2,4 @@ DIST clamav-0.103.4.tar.gz 16425023 BLAKE2B 
beca05941ce462bd98473a5ac72b36e63afe
 DIST clamav-0.103.5.tar.gz 16434316 BLAKE2B 
c5a21b72419a8cd731656d8a8bbc79c5850895f1d8cc56cb5d19eabe2356a5dfcf88e7dc9553071a24b2719bae07cf1a941da3dbed69da8ac4ae3b8897ab32fe
 SHA512 
242423b507eacbbd31dbae6dd0325dff87da25bb8072f2cee7a5e7cab4b8eb5ee6196c759570c1d75986a2777f0f79f92cfbd6250a30ae5b53390c75b238c29a
 DIST clamav-0.104.0.tar.gz 11896747 BLAKE2B 
c3ca32c1277052301a8bff94fec66a2df8f589bc9a673a00d0f45aaf9d8fd23e8bb87dde787d4188a6318d6677c3364e377ccec16d8e44667430713ce7e2a78d
 SHA512 
7a052e6310ef92068acc384d10a64eed6d54d2d408d203dab92defbb1a276e8a193a2096a8028c8982323ba0be83d25602f026aeffa056878ce36aa325c0046c
 DIST clamav-0.104.1.tar.gz 11953064 BLAKE2B 
9ec419349674cd50ca6fed1167eb6bad8eebc5a4d949041da628ebc32426b826769a292c901c2c255cfa3516e398e4ca60f6338ef3780a93e6246561fe695c5d
 SHA512 
2cd4f73de73a2bbc002e1aa85326ea30cce0073fc1a2d5d7d220465217a84eb97fac759010ae0af54d2f0ed725112a51a65a486491fa52388cd7652d7b5cfa5a
+DIST clamav-0.104.2.tar.gz 11950409 BLAKE2B 
7d7eb9d22ca519f7ad0c171b6cab4b59cb52787a897ab31b9567166be2223f9ea89e79f42f1e4e0caf32fcb4b008f5ce755fa136566f85fe1de7808b436f80fa
 SHA512 
8c89a05dec6650677125177434cc49ec2298701525508cdda52358e8f98086d80892287f6267f8b7fda0aef2ca361616cb584c3059f3b066bfde65f7f1ba2df5

diff --git a/app-antivirus/clamav/clamav-0.104.2.ebuild 
b/app-antivirus/clamav/clamav-0.104.2.ebuild
new file mode 100644
index 000000000000..f5575a423312
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.104.2.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake flag-o-matic python-any-r1 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="doc clamonacc +clamapp libclamav-only milter rar selinux 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.
+CDEPEND="acct-group/clamav
+       acct-user/clamav
+       dev-libs/libltdl
+       dev-libs/libmspack
+       dev-libs/json-c:=
+       dev-libs/libpcre2
+       >=sys-libs/zlib-1.2.2:=
+       app-arch/bzip2
+       clamapp? ( sys-libs/ncurses:= net-misc/curl )
+       elibc_musl? ( sys-libs/fts-standalone )
+       virtual/libiconv
+       !libclamav-only? ( net-misc/curl )
+       dev-libs/openssl:=
+       milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+       dev-libs/libxml2
+       rar? ( app-arch/unrar )
+       test? ( dev-python/pytest )"
+# TODO: there is no way to use this with the new build system instead of the 
bundled one
+#      dev-libs/tomsfastmath
+BDEPEND="virtual/pkgconfig
+       doc? ( app-doc/doxygen )
+       test? (
+               ${PYTHON_DEPS}
+               $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+       )"
+DEPEND="${CDEPEND}
+       test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+       selinux? ( sec-policy/selinux-clamav )"
+
+python_check_deps() {
+       has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+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=(
+               -DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav
+               -DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav
+               -DENABLE_EXPERIMENTAL=OFF
+               -DENABLE_JSON_SHARED=ON
+               -DENABLE_APP=$(usex clamapp ON OFF)
+               -DENABLE_MILTER=$(usex milter ON OFF)
+               -DENABLE_CLAMONACC=$(usex clamonacc ON OFF)
+               -DCLAMAV_USER="clamav"
+               -DCLAMAV_GROUP="clamav"
+               -DBYTECODE_RUNTIME=interpreter
+               -DOPTIMIZE=ON
+               -DENABLE_EXTERNAL_MSPACK=ON
+               -DENABLE_MAN_PAGES=ON
+               -DENABLE_DOXYGEN=$(usex doc)
+               -DENABLE_UNRAR=$(usex rar ON OFF)
+               -DENABLE_TESTS=$(usex test ON OFF)
+               # Used to enable some more tests but doesn't behave well in
+               # sandbox necessarily(?) + needs certain debug symbols present
+               # in e.g. glibc.
+               -DCMAKE_DISABLE_FIND_PACKAGE_Valgrind=ON
+               -DENABLE_STATIC_LIB=OFF
+               -DENABLE_SHARED_LIB=ON
+               -DENABLE_SYSTEMD=$(usex systemd ON OFF)
+       )
+       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
+
+       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-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/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
+
+       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."
+}

Reply via email to