From 1543573131710d2bbf11287803cf9269cece35be Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 15 Jan 2020 09:35:39 -0500 Subject: app-antivirus/clamav: new revision fixing libtool -> libltdl depend. As reported in bug 544910, libclamav is linked against libltdl.so: $ objdump -p /usr/lib64/libclamav.so | grep NEEDED NEEDED libbz2.so.1 NEEDED libltdl.so.7 ... and that library is provided by dev-libs/libltdl: $ equery b /usr/lib64/libltdl.so.7 * Searching for /usr/lib64/libltdl.so.7 ... dev-libs/libltdl-2.4.6 (/usr/lib64/libltdl.so.7.3.1) dev-libs/libltdl-2.4.6 (/usr/lib64/libltdl.so.7 -> libltdl.so.7.3.1) We've been pulling this in "accidentally," through sys-devel/libtool, but that's incorrect. This commit drops sys-devel/libtool and replaces it with dev-libs/libltdl. Closes: https://bugs.gentoo.org/544910 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Michael Orlitzky --- app-antivirus/clamav/clamav-0.102.1-r1.ebuild | 196 -------------------------- app-antivirus/clamav/clamav-0.102.1-r2.ebuild | 196 ++++++++++++++++++++++++++ 2 files changed, 196 insertions(+), 196 deletions(-) delete mode 100644 app-antivirus/clamav/clamav-0.102.1-r1.ebuild create mode 100644 app-antivirus/clamav/clamav-0.102.1-r2.ebuild diff --git a/app-antivirus/clamav/clamav-0.102.1-r1.ebuild b/app-antivirus/clamav/clamav-0.102.1-r1.ebuild deleted file mode 100644 index 2c69d1693411..000000000000 --- a/app-antivirus/clamav/clamav-0.102.1-r1.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic user 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 static-libs test uclibc xml" -RESTRICT="!test? ( test )" - -CDEPEND="bzip2? ( app-arch/bzip2 ) - clamdtop? ( sys-libs/ncurses:0 ) - iconv? ( virtual/libiconv ) - metadata-analysis-api? ( dev-libs/json-c:= ) - milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) - >=sys-libs/zlib-1.2.2:= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-devel/libtool - || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) - dev-libs/libmspack - xml? ( dev-libs/libxml2 ) - elibc_musl? ( sys-libs/fts-standalone ) - !libclamav-only? ( net-misc/curl ) - clamsubmit? ( net-misc/curl dev-libs/json-c:= ) - !!> "${ED}"/etc/conf.d/clamd <<-EOF - MILTER_NICELEVEL=19 - START_MILTER=no - EOF - - systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service - fi - - if use doc; then - einstalldocs - doman docs/man/*.[1-8] - fi - - for i in clamd freshclam clamav-milter - do - [[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,} - done - - prune_libtool_files --all -} - -src_test() { - 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 - if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then - ewarn "You must run freshclam manually to populate the virus database files" - ewarn "before starting clamav for the first time.\n" - fi - elog "For instructions on how to use clamonacc see https://www.clamav.net/documents/on-access-scanning" -} diff --git a/app-antivirus/clamav/clamav-0.102.1-r2.ebuild b/app-antivirus/clamav/clamav-0.102.1-r2.ebuild new file mode 100644 index 000000000000..8a85bf5c1129 --- /dev/null +++ b/app-antivirus/clamav/clamav-0.102.1-r2.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils flag-o-matic user 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 static-libs test uclibc xml" +RESTRICT="!test? ( test )" + +CDEPEND="bzip2? ( app-arch/bzip2 ) + clamdtop? ( sys-libs/ncurses:0 ) + iconv? ( virtual/libiconv ) + metadata-analysis-api? ( dev-libs/json-c:= ) + milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) + >=sys-libs/zlib-1.2.2:= + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + dev-libs/libltdl + || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) + dev-libs/libmspack + xml? ( dev-libs/libxml2 ) + elibc_musl? ( sys-libs/fts-standalone ) + !libclamav-only? ( net-misc/curl ) + clamsubmit? ( net-misc/curl dev-libs/json-c:= ) + !!> "${ED}"/etc/conf.d/clamd <<-EOF + MILTER_NICELEVEL=19 + START_MILTER=no + EOF + + systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service + fi + + if use doc; then + einstalldocs + doman docs/man/*.[1-8] + fi + + for i in clamd freshclam clamav-milter + do + [[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,} + done + + prune_libtool_files --all +} + +src_test() { + 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 + if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then + ewarn "You must run freshclam manually to populate the virus database files" + ewarn "before starting clamav for the first time.\n" + fi + elog "For instructions on how to use clamonacc see https://www.clamav.net/documents/on-access-scanning" +} -- cgit v1.2.3-65-gdbad