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: new revision to unbundle tomsfastmath.
Now that dev-libs/tomsfastmath is in the tree, add a new revision of clamav that (a) deletes the bundled copy from the source tree, and (b) patches in the system copy. Thanks to sam_c for taking this on! Closes: https://bugs.gentoo.org/649394 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Michael Orlitzky <[email protected]>
- Loading branch information
Showing
2 changed files
with
335 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 |
|---|---|---|
| @@ -0,0 +1,222 @@ | ||
| # 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 ) | ||
| 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 )" | ||
|
|
||
| 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 | ||
| "${FILESDIR}/${P}-system-tomsfastmath.patch" # 649394 | ||
| ) | ||
|
|
||
| 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 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" "[email protected]" | ||
| 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" | ||
| } |
113 changes: 113 additions & 0 deletions
113
app-antivirus/clamav/files/clamav-0.102.3-system-tomsfastmath.patch
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,113 @@ | ||
| From bcf63fa6bbd519bc61c2b2553fb1913f802eb96e Mon Sep 17 00:00:00 2001 | ||
| From: Andreas Cadhalpun <[email protected]> | ||
| Date: Wed, 11 Mar 2015 20:03:15 +0100 | ||
| Subject: add support for system tomsfastmath | ||
|
|
||
| Patch-Name: add-support-for-system-tomsfastmath.patch | ||
| --- | ||
| configure.ac | 2 ++ | ||
| libclamav/Makefile.am | 10 ++++++++-- | ||
| libclamav/bignum.h | 6 +++++- | ||
| libclamav/xdp.c | 2 +- | ||
| m4/reorganization/libs/tomsfastmath.m4 | 12 ++++++++++++ | ||
| 5 files changed, 28 insertions(+), 4 deletions(-) | ||
| create mode 100644 m4/reorganization/libs/tomsfastmath.m4 | ||
|
|
||
| diff --git a/configure.ac b/configure.ac | ||
| index 8375971..3cacfb8 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -98,6 +98,7 @@ m4_include([m4/reorganization/libs/libmspack.m4]) | ||
| if test "x$use_internal_mspack" = "xno"; then | ||
| mspack_msg="External, $LIBMSPACK_CFLAGS $LIBMSPACK_LIBS" | ||
| fi | ||
| +m4_include([m4/reorganization/libs/tomsfastmath.m4]) | ||
|
|
||
| AM_MAINTAINER_MODE | ||
| m4_include([m4/reorganization/libs/libz.m4]) | ||
| @@ -356,6 +357,7 @@ fi | ||
| CL_MSG_STATUS([yara ],[$enable_yara],[$enable_yara]) | ||
| CL_MSG_STATUS([fts ],[yes],[$lfs_fts_msg]) | ||
|
|
||
| +CL_MSG_STATUS([tomsfastmath],[yes],[$tomsfastmath_msg]) | ||
|
|
||
| # Yep, downgrading the compiler avoids the bug too: | ||
| # 4.0.x, and 4.1.0 are the known buggy versions | ||
| diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am | ||
| index 699d033..3282272 100644 | ||
| --- a/libclamav/Makefile.am | ||
| +++ b/libclamav/Makefile.am | ||
| @@ -602,8 +602,10 @@ libclamav_la_SOURCES += yara_arena.c \ | ||
| yara_clam.h | ||
| endif | ||
|
|
||
| -libclamav_la_SOURCES += bignum.h\ | ||
| - bignum_fast.h\ | ||
| +libclamav_la_SOURCES += bignum.h | ||
| + | ||
| +if !SYSTEM_TOMSFASTMATH | ||
| +libclamav_la_SOURCES += bignum_fast.h\ | ||
| tomsfastmath/addsub/fp_add.c\ | ||
| tomsfastmath/addsub/fp_add_d.c\ | ||
| tomsfastmath/addsub/fp_addmod.c\ | ||
| @@ -685,6 +687,10 @@ libclamav_la_SOURCES += bignum.h\ | ||
| tomsfastmath/sqr/fp_sqr_comba_generic.c\ | ||
| tomsfastmath/sqr/fp_sqr_comba_small_set.c\ | ||
| tomsfastmath/sqr/fp_sqrmod.c | ||
| +else | ||
| +libclamav_la_CFLAGS += $(TOMSFASTMATH_CFLAGS) | ||
| +libclamav_la_LIBADD += $(TOMSFASTMATH_LIBS) | ||
| +endif | ||
|
|
||
| .PHONY2: version.h.tmp | ||
| version.c: version.h | ||
| diff --git a/libclamav/bignum.h b/libclamav/bignum.h | ||
| index 8fdc956..56dfa95 100644 | ||
| --- a/libclamav/bignum.h | ||
| +++ b/libclamav/bignum.h | ||
| @@ -1,9 +1,13 @@ | ||
| #ifndef BIGNUM_H_ | ||
| #define BIGNUM_H_ | ||
|
|
||
| +#if HAVE_SYSTEM_TOMSFASTMATH | ||
| +#include <tfm.h> | ||
| +#else | ||
| #define TFM_CHECK | ||
| - | ||
| #include "bignum_fast.h" | ||
| +#endif | ||
| + | ||
| typedef fp_int mp_int; | ||
| #define mp_cmp fp_cmp | ||
| #define mp_toradix_n(a, b, c, d) fp_toradix_n(a, b, c, d) | ||
| diff --git a/libclamav/xdp.c b/libclamav/xdp.c | ||
| index d5a4c4b..cc3b40d 100644 | ||
| --- a/libclamav/xdp.c | ||
| +++ b/libclamav/xdp.c | ||
| @@ -52,7 +52,7 @@ | ||
| #include "scanners.h" | ||
| #include "conv.h" | ||
| #include "xdp.h" | ||
| -#include "bignum_fast.h" | ||
| +#include "bignum.h" | ||
| #include "filetypes.h" | ||
|
|
||
| static char *dump_xdp(cli_ctx *ctx, const char *start, size_t sz); | ||
| diff --git a/m4/reorganization/libs/tomsfastmath.m4 b/m4/reorganization/libs/tomsfastmath.m4 | ||
| new file mode 100644 | ||
| index 0000000..2a821a1 | ||
| --- /dev/null | ||
| +++ b/m4/reorganization/libs/tomsfastmath.m4 | ||
| @@ -0,0 +1,12 @@ | ||
| +dnl Check for system tomsfastmath | ||
| +PKG_CHECK_MODULES([TOMSFASTMATH], [tomsfastmath], [have_system_tomsfastmath=yes], [have_system_tomsfastmath=no]) | ||
| + | ||
| +AM_CONDITIONAL([SYSTEM_TOMSFASTMATH], [test "x$have_system_tomsfastmath" = "xyes"]) | ||
| + | ||
| +if test "x$have_system_tomsfastmath" = "xyes"; then | ||
| + AC_DEFINE([HAVE_SYSTEM_TOMSFASTMATH], [1], [link against system-wide tomsfastmath library]) | ||
| + tomsfastmath_msg="External, $TOMSFASTMATH_CFLAGS $TOMSFASTMATH_LIBS" | ||
| +else | ||
| + AC_DEFINE([HAVE_SYSTEM_TOMSFASTMATH], [0], [don't link against system-wide tomsfastmath library]) | ||
| + tomsfastmath_msg="Internal" | ||
| +fi |