From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- app-antivirus/clamav/Manifest | 9 +- app-antivirus/clamav/clamav-0.101.2-r1.ebuild | 176 ----------------- app-antivirus/clamav/clamav-0.101.4.ebuild | 176 ----------------- app-antivirus/clamav/clamav-0.102.1-r3.ebuild | 197 ------------------- app-antivirus/clamav/clamav-0.102.2-r1.ebuild | 214 +++++++++++++++++++++ app-antivirus/clamav/clamav-0.102.2.ebuild | 198 ------------------- .../files/clamav-0.102.2-fix-curl-detection.patch | 26 +++ 7 files changed, 242 insertions(+), 754 deletions(-) delete mode 100644 app-antivirus/clamav/clamav-0.101.2-r1.ebuild delete mode 100644 app-antivirus/clamav/clamav-0.101.4.ebuild delete mode 100644 app-antivirus/clamav/clamav-0.102.1-r3.ebuild create mode 100644 app-antivirus/clamav/clamav-0.102.2-r1.ebuild delete mode 100644 app-antivirus/clamav/clamav-0.102.2.ebuild create mode 100644 app-antivirus/clamav/files/clamav-0.102.2-fix-curl-detection.patch (limited to 'app-antivirus/clamav') diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest index 3e8742ae6d47..199d076ad8f5 100644 --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -1,6 +1,7 @@ AUX clamav-0.101.2-libxml2_pkgconfig.patch 2298 BLAKE2B 55c3cf4d4dda55816cb8830df0ba3d865559ffd7068c819c46788a8dbb9940c18a47d23333e5660c57d0b8e488c5359a7bf3d0d1d5024999fe230b080857787d SHA512 4ae92f85a1623fcc6a40f53af0d08bd6e3bf9f3283036f36924cf2b2559531174b7a19c667b496b391a1bfa901e0451a52546d5be7168983c82c2790af3ca738 AUX clamav-0.101.2-tinfo.patch 854 BLAKE2B 46479552a2dffcf56c7b142062896e8ae34e3721bb604011c7f4d439a0475f7b20fc04b8027958e72eba6c97de4adee0de9f737cc4899bac194ad6fba8f0c475 SHA512 e78e1c13ba9398a59449376ba60f2728ce36feaa94342f675d2f7fe8245703f4c632028ca2bf161e6fe5c3238c540e49849c191b1b080b5486913803384882d9 AUX clamav-0.102.1-libxml2_pkgconfig.patch 4012 BLAKE2B 4c3e4fc3522d317c57bae942bbd1c9b91d11ddb782cfaa0593458180207ffb873f783cea892d8eefd2402f30b7a0c4dcbbd5b61e01a54f98432c1164b29e7d83 SHA512 ee6379c85f7d85e30bfa4efda728cf9207a5017905abed8a6241561825ca54ec58a6cec2c1a8452574a9356491c192e89f76d19c2e404602637dcc9576b3fdea +AUX clamav-0.102.2-fix-curl-detection.patch 844 BLAKE2B a813b1f6003b9cff03fca8d72dbd44d6a4f700e3d60aee83f782a87893a3c6753698ca8715237155185660301dd81dc55bf6a6e3b9095f57b099607182c90bf5 SHA512 27e6aa5ad418eaa32b56ea7bbdab0b5b4cd649e55d34eb094b5f02d7e68d8913f39664ffd6bc4a07faf88f60bdbd15b0c381fbbd6d9c1c62cc36e72e34cabd19 AUX clamav-milter.README.gentoo 2284 BLAKE2B 7afc18f3dad57c2d7595257b356943efb3d1af28d55ac8f09f0506430fd0dedf0820906ced666a7237e3af44a9bc1b43fff017c03faad844f96b132ca4c5dde6 SHA512 38eadf2d919a0c48345600ea5a39c90e766b62e8b1ffc7bb01969a8fd93c4545f2030058a470ac7efb75a1d6c74f9930438f58aeff5035e19e38241ed381f7b3 AUX clamav-milter.service 284 BLAKE2B 7fbdce10ffa1d85aa671616f17ad45683177916269b434283582ecb53000f7a9a8978119e6a8170ddad8f7c0f14f09398fd7b893aad5d718083b002f6371ff21 SHA512 442148ac3c42ecbb893de5c6edde337b72a745d20f6c5ffa33131f9a0b2daadcffac39b686ada986a5ab500ea7b9153c448abc1b819e15fef488da1812bb0cee AUX clamav-milter.service-r1 303 BLAKE2B 55253d9a660699411e352bc80837add840dc6740afed4fe64a86def84610cad836ea3ea620664f540f242b917aab560201cca9c33b9fbc9b1cef2c8b29bfce36 SHA512 5dc30e3c57d9bff6595155e8299336c579c713aed429ab770f10d7678dd74691a135aa2070a825ddb726fdabcb001c19caeb993c1cd9a6fcf95d1d47f7160540 @@ -12,12 +13,6 @@ AUX clamd.service 202 BLAKE2B 4d02132cdb44a7155e881037b45bab28f42445808d1d3ff582 AUX clamd_at.service 228 BLAKE2B 85181b02329a86495d0737308417dd873424da0bb1cd376725e7857b8b911c841df89ce63ed665a1d0ca6d30f9456c9d47c370b36a2cf8df1e2f3f520d121fe0 SHA512 69a0ca31a7288b5494d8c85ce5ff859a8f34b8a93f573eded90c270099ecac30e01d8549a07a160d74bfdc3c5401c3fd625b178080ea2c02520aab91252739e7 AUX freshclamd.service 240 BLAKE2B 1b72ffee3b0b1b51811aa5f3c7a52678b3beb260f020dd326a437d6abf4bc515392d0b263eeb0773de128b9c0eff1c1f0b7b604dd14b9dffd50aba31909963e1 SHA512 28da28d633f487806448e17aec36648b6ba12f549549485704607e403e64643caea6ee9420e8101f11b3edebe62b651e6d6c338ab232f33b97b315d64b3789ac AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2 -DIST clamav-0.101.2.tar.gz 21722932 BLAKE2B 5c2960e678510a6f829fc9333e05a45a57a704e13eb407e0f890dd5553a1f9644eb3b1122c677755237b8c682127319d447a508087bc9130d14cd2cfec92896a SHA512 f9ea4589a8081acf7b6d454d1a068da05ae6574a9070a08f9438935795cb6dc084ffb9222b11fb1623f31962f859e6536a2f5bd1de29ef6b9b314efa5edc8c7e -DIST clamav-0.101.4.tar.gz 21408145 BLAKE2B 5eba85dcf203f56cbd943e479e660469dcc1972819674f5624207f4123ec74207b664cba3c9b0318665d261176da338f3c3fba9c938eeb626ce75174d525a43f SHA512 fae914a95b674fa6bdea044abec702401146590ca0aaaea1245deb1c4770641a794f60ff7b448b24d8c1923150cb7ba230848974837257c3a8ab20ea1e2f86d3 -DIST clamav-0.102.1.tar.gz 13215586 BLAKE2B 653e5506ed0b19c154038e960184abf2773a8a12a775dda81ce4f69fe7e58c457c39d85e24ce43bda9f09f43766c81af69d5462e7459077b0e4886f73a2a5ba2 SHA512 2d0cd2dece771ab8228771f9a95eb0342e756083a0107b2bef31bd2f5f46c36aa692e15d7eb2ea321f535ea4e18c8df043c8663ae350d40fbe1bdb4d073dcb90 DIST clamav-0.102.2.tar.gz 13227538 BLAKE2B 09d18f507a439f1dd63ebc038b129e0ead75bb344bfad2b5bd36e2c0c76af01f42fcacc60ff40b5676cb5fb7b38b90747452654a5d104b9b7b5e2d5a06b3dc2d SHA512 7db53e0e2b4d6b0e4cf5048d3c9dfbcabcffd680c3a2b718c763b9599b0c1c14e56bae70c54c251ee9e8fd1acd3134657196dbaad2d23a16bad76a088c6fc41f -EBUILD clamav-0.101.2-r1.ebuild 5583 BLAKE2B 7014976833b5f6d2376639da89d1d8de0c02936d4d6c2c5f1abe823973da72fbf8d39d6bebbecd6fea0cd82532f03614e530c4458c1d42985b8ac0ec8ccd259f SHA512 54a9f2a33fb50d5f1772d38af8eaeb48cb9569cb7a3cfc057468f15a4341568a24fe641dc9e4266f80c1ef852a89960abc95a8eeb974b28f5b67be3ac7e52207 -EBUILD clamav-0.101.4.ebuild 5583 BLAKE2B 7014976833b5f6d2376639da89d1d8de0c02936d4d6c2c5f1abe823973da72fbf8d39d6bebbecd6fea0cd82532f03614e530c4458c1d42985b8ac0ec8ccd259f SHA512 54a9f2a33fb50d5f1772d38af8eaeb48cb9569cb7a3cfc057468f15a4341568a24fe641dc9e4266f80c1ef852a89960abc95a8eeb974b28f5b67be3ac7e52207 -EBUILD clamav-0.102.1-r3.ebuild 6510 BLAKE2B 0f393d4073e0b0f0b79fd9d48d3104a14f368be652a710fd5b5ece02cfb267c53e2409eabdb880e775ef216a71dc0d10a9b383769e7c9f579561716a099001ee SHA512 ecaae4b0db94af03d1a07ab3dd407b827315c58784cba5c009bea10f20f8811cacac9c1d4299605f5c6454bfab8455c127d1ec71e1a3f5e5cfa7cc8aa80fff8f -EBUILD clamav-0.102.2.ebuild 6304 BLAKE2B be7dfb9b17b2b88d4625e26cd96d95d0fd5f9747a6c75761bf879732139199f905ac13d362836487f0b6756e64cb54cab989de43c0e09e3fad08df1b570ba8a8 SHA512 507489d6dfe1d089e14291d285cbe03cfc9999bb1e9fbb00fa4cb8e7c1280a63469b6620e2b1f1f48ed8486652da67b04d06afa427c17a025070c8fb13570b15 +EBUILD clamav-0.102.2-r1.ebuild 6672 BLAKE2B 3c1f209b0e8acec2707188ed1b3530bb0ecef2e0a655ae21501be78c9596fd9167b21755b4aaa50b63f0c3bbfecdb88768a089a445f461c49743283852ed4892 SHA512 8e627bbce15dbfbd16b8f34502dbf1dcb7bc7cf5a879361a42f1a47a7472a17017286c876e75d9dd5d9c7d2a7b06aee54f06cdded1c303a9892734a05d424c66 MISC metadata.xml 861 BLAKE2B fa97cb689d37536e3d128d2033038b1a6331ae3d8f435e39330506731c96f742b55f579ca02c678393c0af21fbab88189de8754d80b97fba35cf5a4f4eb2dd9a SHA512 5e2c58dfbb033270cfa014bc207d83799be06aaa02d1b490d6c202ffc151b54be72cd4e15380faffed2e3957c395e43b6853d1abfee99fa42de81159b7656a00 diff --git a/app-antivirus/clamav/clamav-0.101.2-r1.ebuild b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild deleted file mode 100644 index bc2d793eef5e..000000000000 --- a/app-antivirus/clamav/clamav-0.101.2-r1.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic ltprune 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 iconv ipv6 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 ) - !!> "${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 -} diff --git a/app-antivirus/clamav/clamav-0.101.4.ebuild b/app-antivirus/clamav/clamav-0.101.4.ebuild deleted file mode 100644 index bc2d793eef5e..000000000000 --- a/app-antivirus/clamav/clamav-0.101.4.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic ltprune 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 iconv ipv6 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 ) - !!> "${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 -} diff --git a/app-antivirus/clamav/clamav-0.102.1-r3.ebuild b/app-antivirus/clamav/clamav-0.102.1-r3.ebuild deleted file mode 100644 index 9b4a4cda437c..000000000000 --- a/app-antivirus/clamav/clamav-0.102.1-r3.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic ltprune 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 )" - -# 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 - 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 - - # 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 -} - -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.2-r1.ebuild b/app-antivirus/clamav/clamav-0.102.2-r1.ebuild new file mode 100644 index 000000000000..8809377758e3 --- /dev/null +++ b/app-antivirus/clamav/clamav-0.102.2-r1.ebuild @@ -0,0 +1,214 @@ +# 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 static-libs 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 static-libs static) + $(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-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" +} diff --git a/app-antivirus/clamav/clamav-0.102.2.ebuild b/app-antivirus/clamav/clamav-0.102.2.ebuild deleted file mode 100644 index 1a823eafef4e..000000000000 --- a/app-antivirus/clamav/clamav-0.102.2.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic ltprune 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 )" - -# 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 - 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:= )" -REQUIRED_USE=" - libclamav-only? ( !clamsubmit ) - clamsubmit? ( !libclamav-only ) -" - -DEPEND="${CDEPEND} - virtual/pkgconfig - test? ( dev-libs/check )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-clamav )" - -HTML_DOCS=( docs/html/. ) - -PATCHES=( - "${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729 - "${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328 -) - -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 static-libs static) - $(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-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 - 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 - - if use doc; then - einstalldocs - doman docs/man/*.[1-8] - fi - - for i in clamd freshclam clamav-milter - do - if [[ -f "${D}"/etc/"${i}".conf.sample ]]; then - mv "${D}"/etc/"${i}".conf{.sample,} || die - fi - done - - prune_libtool_files --all - - # 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 -} - -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 - local databases=( "${ROOT}"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" -} diff --git a/app-antivirus/clamav/files/clamav-0.102.2-fix-curl-detection.patch b/app-antivirus/clamav/files/clamav-0.102.2-fix-curl-detection.patch new file mode 100644 index 000000000000..f89a704ea3e0 --- /dev/null +++ b/app-antivirus/clamav/files/clamav-0.102.2-fix-curl-detection.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/709616 + +--- a/configure.ac ++++ b/configure.ac +@@ -197,6 +197,10 @@ AC_CONFIG_FILES([ + clamav-types.h + clamav-version.h]) + if test "x$enable_libclamav_only" != "xyes"; then ++ if test "$have_curl" = "no"; then ++ AC_MSG_ERROR([libcurl not found. libcurl (e.g. libcurl-devel) is required in order to build freshclam and clamsubmit.]) ++ fi ++ + AC_CONFIG_FILES([ + clamscan/Makefile + database/Makefile +--- a/m4/reorganization/libs/curl.m4 ++++ b/m4/reorganization/libs/curl.m4 +@@ -92,8 +92,6 @@ if test "X$have_curl" = "Xyes"; then + ) + + LDFLAGS="$save_LDFLAGS" +-else +- AC_MSG_ERROR([libcurl not found. libcurl (e.g. libcurl-devel) is required in order to build freshclam and clamsubmit.]) + fi + + AC_SUBST([CLAMSUBMIT_LIBS]) -- cgit v1.2.3