diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-antivirus/clamav | |
parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) |
gentoo resync : 15.12.2019
Diffstat (limited to 'app-antivirus/clamav')
-rw-r--r-- | app-antivirus/clamav/Manifest | 14 | ||||
-rw-r--r-- | app-antivirus/clamav/clamav-0.101.2-r1.ebuild | 1 | ||||
-rw-r--r-- | app-antivirus/clamav/clamav-0.101.3.ebuild | 1 | ||||
-rw-r--r-- | app-antivirus/clamav/clamav-0.101.4.ebuild | 1 | ||||
-rw-r--r-- | app-antivirus/clamav/clamav-0.101.5.ebuild | 176 | ||||
-rw-r--r-- | app-antivirus/clamav/clamav-0.102.1-r1.ebuild (renamed from app-antivirus/clamav/clamav-0.102.0-r2.ebuild) | 55 | ||||
-rw-r--r-- | app-antivirus/clamav/files/clamav-0.102.1-libxml2_pkgconfig.patch (renamed from app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch) | 51 |
7 files changed, 250 insertions, 49 deletions
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest index 3e94d26c9218..318924118f0a 100644 --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -1,7 +1,7 @@ AUX clamav-0.100.0_autotools.patch 369 BLAKE2B ee30a0fe90e4553b64a67d1e0646a9d6c5ee33858e657905e0d71da9c4b14176469f1b2960dd04b25d46823fd239b252490c172a51d64eae589894423b8aafb0 SHA512 d872a162040ba10476f463b9e0e77edea81f022a4c0d53d7a6d09ca5753036a5236cf7182f518515f659888a203b07366873b757cf5af15c3dee74bbad6b2d02 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.0-libxml2_pkgconfig.patch 3357 BLAKE2B bc15b0e1c143233beaa46b0c5b9c526006acc77ae6163b1fcc9744d0a79f574c8f1802ce1a7b83ac6d097f5f1b993943569c8ca16d74fb496ce1adc181798a97 SHA512 6b671596e638606b41fd88757f485186d056d9d0e7659c21e793e256d671d212422385dfa30aefc590fc37e535953c0002ed1b3088e4bfac95d7ba6d612df623 +AUX clamav-0.102.1-libxml2_pkgconfig.patch 4012 BLAKE2B 4c3e4fc3522d317c57bae942bbd1c9b91d11ddb782cfaa0593458180207ffb873f783cea892d8eefd2402f30b7a0c4dcbbd5b61e01a54f98432c1164b29e7d83 SHA512 ee6379c85f7d85e30bfa4efda728cf9207a5017905abed8a6241561825ca54ec58a6cec2c1a8452574a9356491c192e89f76d19c2e404602637dcc9576b3fdea 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 @@ -16,9 +16,11 @@ AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1a DIST clamav-0.101.2.tar.gz 21722932 BLAKE2B 5c2960e678510a6f829fc9333e05a45a57a704e13eb407e0f890dd5553a1f9644eb3b1122c677755237b8c682127319d447a508087bc9130d14cd2cfec92896a SHA512 f9ea4589a8081acf7b6d454d1a068da05ae6574a9070a08f9438935795cb6dc084ffb9222b11fb1623f31962f859e6536a2f5bd1de29ef6b9b314efa5edc8c7e DIST clamav-0.101.3.tar.gz 21389753 BLAKE2B f254846dad40bd9dda650ece9dd672ca040fe4779b4f46a5cfa087808711055745d02c65f24da9589420e979a777bc435f68d25f6940ebf283cd0a8f240908b5 SHA512 285e6011ef5b68683daae7287005b2a615d7ee2fb9dac28d6db347cf7fe101da627aaec800366e83551f41afb78c6b08517def7aa30d0f0c347e54344b0b14d3 DIST clamav-0.101.4.tar.gz 21408145 BLAKE2B 5eba85dcf203f56cbd943e479e660469dcc1972819674f5624207f4123ec74207b664cba3c9b0318665d261176da338f3c3fba9c938eeb626ce75174d525a43f SHA512 fae914a95b674fa6bdea044abec702401146590ca0aaaea1245deb1c4770641a794f60ff7b448b24d8c1923150cb7ba230848974837257c3a8ab20ea1e2f86d3 -DIST clamav-0.102.0.tar.gz 13211357 BLAKE2B b3ba01f7ff63dbb4fcba57955b3ea364b56da6b71c01770cb6fabbd48a60cf43935aa0a869ef8d96d8f7adc65c9ebc681d08e87c2e07bc7469584a0d9833a4fd SHA512 7228f5f572e5ca32a458c262a5d297694059de04cb4a64364dd92e1d2e4560d58263d05bfb2053641ea7521c4040bef5a49b3cea27e77b907c95195cf4a54d84 -EBUILD clamav-0.101.2-r1.ebuild 5547 BLAKE2B 391c8a6b259c11fe82ff6a58aa78ad43506623360adb6e3aad575b4ce090c56b22f6f4accb57e5b9c226584dec5291ae85e276e527f2d081a603333acf07ea70 SHA512 d301811b92594ab509a8dfe3e517665a18cbf543fecd872fd52206756b4d689cf7df94d3f0315cf52859fb1f9e73223ab86e792a11f1d03c04b7f0501b8662a7 -EBUILD clamav-0.101.3.ebuild 5556 BLAKE2B d051a2176e74f9247827737f7315ba4a1a5db3ac5e3a76d52bd693d6bd9333cc0fe606c80f402a9c05f1e8910defd6c38ed4ca5125d7244b696d806ad1858759 SHA512 e0b0bd68566807dcd280882c34ea024a77cc1a8acee865b22c845c146e1e1c5a74840a3f5b060aba425e0317c03b4f19f23c32a4953f18919e8e3484dae3ac8a -EBUILD clamav-0.101.4.ebuild 5548 BLAKE2B d102648b218b1e739a402c867dcc45f19738f69111a0f32373bf71b151c90fdd002e882cba9d09e624a731216bc0c36ea3a1b70ef7a720e0124b5bc56c33434e SHA512 b3ec73628fb8409920ab053eea527d70c4a203f32ea25c423bbf1ff3d87d9d8a230386f5419237c78a1871e834d0604051baa2b0fc8c5a6b9b5c0cd443fd664c -EBUILD clamav-0.102.0-r2.ebuild 6298 BLAKE2B ac8d09c53280836d1ecb957fb677d2dc7e3b8c2706182f6a071188fc914d479452e15ed341a786a6d0898c6c0e0668ce91d35a8b213b92e17907920eee48ea2d SHA512 25b917cbc035b4f097f4f1ebe8e968275a8f6b359e7b0ab6afc2f47fbe4de2e55b0a966d3ab20d98b7a3ae549e693a03d3489bf000ee800383916802a332e172 +DIST clamav-0.101.5.tar.gz 21423304 BLAKE2B b6468595f79f2040b414bf288efcfcd41ffcba377595b5d829a3bc24ab92c4ad7585f5f15b55430f591c50e85a47d49e1597264249b80dfe931a449086de1077 SHA512 14e2f79573ed8bf885e4ba47ac22e713060d46e1704467f6c83c3a3abf37ffbd3a1b20bb0de87059a8df6faca9c10efe0f01cdfee54edb62ad863679013e1966 +DIST clamav-0.102.1.tar.gz 13215586 BLAKE2B 653e5506ed0b19c154038e960184abf2773a8a12a775dda81ce4f69fe7e58c457c39d85e24ce43bda9f09f43766c81af69d5462e7459077b0e4886f73a2a5ba2 SHA512 2d0cd2dece771ab8228771f9a95eb0342e756083a0107b2bef31bd2f5f46c36aa692e15d7eb2ea321f535ea4e18c8df043c8663ae350d40fbe1bdb4d073dcb90 +EBUILD clamav-0.101.2-r1.ebuild 5574 BLAKE2B 6a81f3b8382419d3ff5292d44192e5ce56f9929a82ed7d23b35dc6acc5f891cf0d1a65ca07192c70395dbe13122b0267791ebb420ba80d77409de165515d2866 SHA512 1c90b67907aef36f8b2496dc8273919145f7388383545da4a98280f74ba0113ec31da45f815dcac80f37d918f36f3777647e2920c4dfc69ac6bce5da695678fe +EBUILD clamav-0.101.3.ebuild 5583 BLAKE2B 4f5a9713f6be41eaccfa8d32cd577f42fb5201b75dab50fa0778b1a905134cd2b9b54ae9df8cda12d57f351383531306bb2a26afc26ad86afdb6b2d3ed0487ec SHA512 6ee06499d3a98249b984a9a563b607fb48c398ade458847db962bc54a46e61efdaebb7100c164adbf1c9c8946016ea905ef47add478b359883b255a6cbe672be +EBUILD clamav-0.101.4.ebuild 5575 BLAKE2B 9b9c9cc85eafd5b34d5b027ed1f532eedaadbd363e49d26e516d0bea22290c43023dcfe52957843ba6a6361e6081cf100c4fdf8f03cd78ae6dbc2cbc7332407d SHA512 ebdb4e06350b524a844f42d8cb6f818135c2e541b088b4e49859440aebb4390438fb52198f9a65e0844c9e3d6fec2fe5c80b572289b965fb27b69cef06b02fd3 +EBUILD clamav-0.101.5.ebuild 5583 BLAKE2B 4f5a9713f6be41eaccfa8d32cd577f42fb5201b75dab50fa0778b1a905134cd2b9b54ae9df8cda12d57f351383531306bb2a26afc26ad86afdb6b2d3ed0487ec SHA512 6ee06499d3a98249b984a9a563b607fb48c398ade458847db962bc54a46e61efdaebb7100c164adbf1c9c8946016ea905ef47add478b359883b255a6cbe672be +EBUILD clamav-0.102.1-r1.ebuild 6293 BLAKE2B 08abfa9c070a5648c504f8c70c4f93e79bcc1db39d70ca6553174eed95dabd4dae6eeb03d075fcbfd06f480280a1e02e506afe48a885ece4daa880168d784d2e SHA512 50b2b83466f4bb9aca7618dfa65085df865c91cfbe2230a207ec0e929f2643c2177324c83460af9471f79e539672dcaea371e20bc89b4e1460784e4e3d96b4d9 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 index 4991a4a08280..f9e2b5caed66 100644 --- a/app-antivirus/clamav/clamav-0.101.2-r1.ebuild +++ b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild @@ -13,6 +13,7 @@ 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 ) diff --git a/app-antivirus/clamav/clamav-0.101.3.ebuild b/app-antivirus/clamav/clamav-0.101.3.ebuild index 4872ce687bf5..5530e25ebe2e 100644 --- a/app-antivirus/clamav/clamav-0.101.3.ebuild +++ b/app-antivirus/clamav/clamav-0.101.3.ebuild @@ -13,6 +13,7 @@ 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 ) diff --git a/app-antivirus/clamav/clamav-0.101.4.ebuild b/app-antivirus/clamav/clamav-0.101.4.ebuild index 4de9af941ffa..57d0df79beb1 100644 --- a/app-antivirus/clamav/clamav-0.101.4.ebuild +++ b/app-antivirus/clamav/clamav-0.101.4.ebuild @@ -13,6 +13,7 @@ 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 ) diff --git a/app-antivirus/clamav/clamav-0.101.5.ebuild b/app-antivirus/clamav/clamav-0.101.5.ebuild new file mode 100644 index 000000000000..5530e25ebe2e --- /dev/null +++ b/app-antivirus/clamav/clamav-0.101.5.ebuild @@ -0,0 +1,176 @@ +# 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 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 ) + !!<app-antivirus/clamav-0.99" +# hard block clamav < 0.99 due to linking problems Bug #567680 +# openssl is now *required* see this link as to why +# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html +DEPEND="${CDEPEND} + virtual/pkgconfig + test? ( dev-libs/check )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-clamav )" + +DOCS=( docs/UserManual.md docs/UserManual ) +HTML_DOCS=( docs/html ) + +PATCHES=( + "${FILESDIR}/${PN}-0.101.2-libxml2_pkgconfig.patch" #661328 + "${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729 +) + +pkg_setup() { + enewgroup clamav + enewuser clamav -1 -1 /dev/null clamav +} + +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 + + econf \ + $(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) \ + $(use_with metadata-analysis-api libjson /usr) \ + --with-system-libmspack \ + --cache-file="${S}"/config.cache \ + --disable-experimental \ + --disable-gcc-vcheck \ + --disable-zlib-vcheck \ + --enable-id-check \ + --with-dbdir="${EPREFIX}"/var/lib/clamav \ + --with-zlib="${EPREFIX}"/usr \ + --disable-llvm +} + +src_install() { + default + + rm -rf "${ED}"/var/lib/clamav + 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" + + keepdir /var/lib/clamav + fowners clamav:clamav /var/lib/clamav + keepdir /var/log/clamav + fowners clamav:clamav /var/log/clamav + + dodir /etc/logrotate.d + 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:" \ + "${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:" \ + "${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 + [[ -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.0-r2.ebuild b/app-antivirus/clamav/clamav-0.102.1-r1.ebuild index e768ec499d09..2c69d1693411 100644 --- a/app-antivirus/clamav/clamav-0.102.0-r2.ebuild +++ b/app-antivirus/clamav/clamav-0.102.1-r1.ebuild @@ -13,6 +13,7 @@ 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 ) @@ -43,12 +44,11 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-clamav )" -#DOCS=( docs/UserManual.md docs/UserManual ) -HTML_DOCS=( docs/html ) +HTML_DOCS=( docs/html/. ) PATCHES=( - "${FILESDIR}/${PN}-0.102.0-libxml2_pkgconfig.patch" #661328 "${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729 + "${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328 ) pkg_setup() { @@ -71,37 +71,38 @@ src_configure() { # but that does not work # do not add this, since --disable-xml seems to override # --without-xml - JSONUSE="" + JSONUSE="--without-libjson" - if [ use clamsubmit ] || [ use metadata-analysis-api ]; then + 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=/usr" - else - JSONUSE="--without-libjson" + JSONUSE="--with-libjson=${EPREFIX}/usr" fi - econf \ - $(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) \ - $(use_with metadata-analysis-api libjson /usr) \ - ${JSONUSE} \ - $(use_enable libclamav-only) \ - --with-system-libmspack \ - --cache-file="${S}"/config.cache \ - --disable-experimental \ - --disable-zlib-vcheck \ - --enable-id-check \ - --with-dbdir="${EPREFIX}"/var/lib/clamav \ - --with-zlib="${EPREFIX}"/usr \ + 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() { diff --git a/app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch b/app-antivirus/clamav/files/clamav-0.102.1-libxml2_pkgconfig.patch index 1a6303b5c8c2..ea39173c8ba1 100644 --- a/app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch +++ b/app-antivirus/clamav/files/clamav-0.102.1-libxml2_pkgconfig.patch @@ -1,8 +1,22 @@ -https://bugs.gentoo.org/661328 +From 25b9fccdae3a05561b6b7c9c82018a9a3dfec819 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Mon, 25 Nov 2019 15:54:09 +0100 +Subject: [PATCH] build: Use pkg-config to find libxml2 ---- clamav-0.102.0/m4/reorganization/libs/xml.m4 -+++ clamav-0.102.0/m4/reorganization/libs/xml.m4 -@@ -4,85 +4,29 @@ +Otherwise we get unneccesary linkage to icu and other unwanted stuff + +Bug: https://bugzilla.clamav.net/show_bug.cgi?id=12202 +Gentoo-bug: https://bugs.gentoo.org/661328 +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + m4/reorganization/libs/xml.m4 | 82 ++++++----------------------------- + 1 file changed, 13 insertions(+), 69 deletions(-) + +diff --git a/m4/reorganization/libs/xml.m4 b/m4/reorganization/libs/xml.m4 +index 24f0cfa92..d143e3a47 100644 +--- a/m4/reorganization/libs/xml.m4 ++++ b/m4/reorganization/libs/xml.m4 +@@ -4,85 +4,29 @@ AC_ARG_ENABLE([xml], [AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])], want_xml=$enableval, want_xml="auto") @@ -14,16 +28,8 @@ https://bugs.gentoo.org/661328 - AS_HELP_STRING([--with-xml@<:@=DIR@:>@], [path to directory containing libxml2 library - @<:@default=/usr/local or /usr if not found in /usr/local@:>@]), - [with_xml_val=$withval] -+ PKG_CHECK_MODULES([XML], [libxml-2.0], -+ [found_xml=yes], -+ [ -+ found_xml=no -+ AS_IF([test "x$want_xml" = xyes], -+ [AC_MSG_ERROR([--enable-xml set but cannot find libxml2])] -+ ) -+ ] - ) - +- ) +- - AS_IF([test "x$with_xml_val" = "xno"], [XML_HOME=""], - [test "x$with_xml_val" = "xyes"], [XML_HOME="/usr/local"], - [XML_HOME="$with_xml_val"]) @@ -74,7 +80,16 @@ https://bugs.gentoo.org/661328 - XML_LIBS="`$xmlconfig --libs`" - fi - esac -- ++ PKG_CHECK_MODULES([XML], [libxml-2.0], ++ [found_xml=yes], ++ [ ++ found_xml=no ++ AS_IF([test "x$want_xml" = xyes], ++ [AC_MSG_ERROR([--enable-xml set but cannot find libxml2])] ++ ) ++ ] ++ ) + working_xml="no" if test "X$found_xml" != "Xno"; then - @@ -87,8 +102,9 @@ https://bugs.gentoo.org/661328 - + XML_HOME=$(${PKG_CONFIG} --variable prefix libxml-2.0) AC_MSG_CHECKING([for xmlreader.h in $readerresult]) - +- - if test ! -f "$readerresult"; then ++ + if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then AC_MSG_RESULT([not found]) else @@ -99,3 +115,6 @@ https://bugs.gentoo.org/661328 CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $XML_LIBS" +-- +2.24.0 + |