diff options
Diffstat (limited to 'app-antivirus/clamav')
| -rw-r--r-- | app-antivirus/clamav/Manifest | 5 | ||||
| -rw-r--r-- | app-antivirus/clamav/clamav-0.99.3-r1.ebuild | 2 | ||||
| -rw-r--r-- | app-antivirus/clamav/clamav-0.99.4.ebuild | 156 | ||||
| -rw-r--r-- | app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch | 11 |
4 files changed, 172 insertions, 2 deletions
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest index ab808f61244e..99d313ff8394 100644 --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -5,6 +5,7 @@ AUX clamav-0.99.2-pcre2-compile-erroffset.patch 540 BLAKE2B 77ad84cedb0532902422 AUX clamav-0.99.2-tinfo.patch 656 BLAKE2B be926db8e63458f0ef9d6d5b6f26058c2100881997cd97b03cf2f893f0d0ef2b18ebc25e1f38f2a1df5aef3a7f647eb1cec66c0cc173175976048ca5ad57e782 SHA512 33e375e8f4e74f284e9d14adaa8ef095bdb67b2f62e4b7c5e9c38a3c5f955106173e402859fabf44ada40ae08cceb3fca79322f8854f47d850816064641f4451 AUX clamav-0.99.3-VMSF_DELTA-fix-CVE-2012-6706.patch 7631 BLAKE2B eb5ecde76d6cf748d3877ff18489c6b544b57a4a44375f3679d3ff8d45b99879af12840100e0eafc8461833eb6bb40ae4b26bf745cb28be9431b21a8ee5143c1 SHA512 11a4d299d719e43f22e7065d91785d4782d95ba0a167d43480b2409cbdd6ba3ba5c8552cee72c65a7bff0943fc24ac58cf6acc79ae364a7c42a8ab1a1fa6ebaf AUX clamav-0.99.3-fix-fd-leaks-in-cli_scanscript.patch 3554 BLAKE2B 36ce8580da5abc310caa29ae87478b811f2db9403cb79b01efb9394b3d19ced2be3dbf66a1ad2ea06c660156a03879ba3dbca4329569e349d7a70c12f034d237 SHA512 e0dfecff8adb1e30f4c7a20271fd8731ebbb20449a532d70977f7491d8539fc8ed74f851f6903f6265a2e660f9471341e68cc0651e5f94356179ff1f328ada0c +AUX clamav-0.99.4-pcre2-compile-erroffset.patch 510 BLAKE2B 888f5c0cf1205b5ca22ff5f445f194c9e62dd511fcf8a784be6592f700e0db6f7a36b00c88b73c5484cad2075822eb5c1e0c0f62c8ee12d6bac2d1b845a9aca5 SHA512 f03962fc47b10d729437f22374c17b773ee0f519cf537b1d7885ec6dbc1efd36d00372314faaabdf5400b85e781ab5b14e69b929c844b34520801e064d383dc2 AUX clamav-milter.README.gentoo 1124 BLAKE2B 41713f9ddd22b39748e812a03d5746d48b44f0506bd6e46886fd64233aedad0a7c4b2f8f7a3b0b1d14f831521c423ed5909eb9d9bc419540684fba065c3b9927 SHA512 1c6160e48eddd28f83ec5f24757f788781cef55789d1934dfccc12c7c5e5635a226d26b0983cab7344c142f5a2f1db172640b1d0e6c840a6fa83abed9be1211a AUX clamav-milter.service 284 BLAKE2B 7fbdce10ffa1d85aa671616f17ad45683177916269b434283582ecb53000f7a9a8978119e6a8170ddad8f7c0f14f09398fd7b893aad5d718083b002f6371ff21 SHA512 442148ac3c42ecbb893de5c6edde337b72a745d20f6c5ffa33131f9a0b2daadcffac39b686ada986a5ab500ea7b9153c448abc1b819e15fef488da1812bb0cee AUX clamav-milter.service-r1 303 BLAKE2B 55253d9a660699411e352bc80837add840dc6740afed4fe64a86def84610cad836ea3ea620664f540f242b917aab560201cca9c33b9fbc9b1cef2c8b29bfce36 SHA512 5dc30e3c57d9bff6595155e8299336c579c713aed429ab770f10d7678dd74691a135aa2070a825ddb726fdabcb001c19caeb993c1cd9a6fcf95d1d47f7160540 @@ -18,8 +19,10 @@ AUX freshclamd.service 191 BLAKE2B 5b517bf15d008454052bd0f7d5a10fb89284a5b64d1cd AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2 DIST clamav-0.99.2.tar.gz 16067497 BLAKE2B 4155e3125ccc45cc6828033f207b6b8d3514253dfb8156428ad4096c0901d5a8500f9dd253b8f40afdc49a6039b647627868f75d51829ab7bd247ada5f3b8383 SHA512 7744ba8a344b163cf98e9737cddfd25d2120b34ee9c4518380e028c9ec3cd50127b198b0dfa9fde30f5ce9aab0c0e6384712fbc11287e77d16ce052fd7b6ac44 DIST clamav-0.99.3.tar.gz 16082645 BLAKE2B 3be06e563f17a07e4c7e95eb3efbb61e80858bcb3dffc584f13ec30dc2ef9c5257aec78605f1c03e183b4b7ed5b08343a25b579b2b12e54458694eff624aa01e SHA512 0d3c75d571ed4aa4937ef2b743a39a9a144f5adfd6f56f71046e5a8387b8ed7c3c4d9a4196aa85750f9ec4dc545720fdd659289d0cce086ab13a7cc505a0ab3e +DIST clamav-0.99.4.tar.gz 16083015 BLAKE2B 3c2e7d11ee05fe846f75c3fb6501b5fd809a2e58f8e69c82e493e32fcbc87ca0e5b5f7ab83a0d7e251a5dc8e84aed1475c87c1248b393fa04b6924a2ab32b9bf SHA512 778d5ef510d8d4bdfac5dc33d92469ed4283c414b3d42da6e1a0b13ed70e37755d5c837622dc336bc728ba1f8bf5485fc8a8d3a67a90e9aaa9e4dc71ece0691d EBUILD clamav-0.99.2-r1.ebuild 5125 BLAKE2B 330ee8e4625368933a519481a204839153e6a08cf1480f0622a2632d470f9b44cda9a4f68919f356c5a8b95b81b87912e1c64d3b6e3c66fa9e1b122b2863b06e SHA512 96b2ff17e272cef6a23bfa4357b7a84a509a6e6e105439e70cc8db99b75a61a5732f7257cf494a19d48998c4d84c2d19213d48bf6104cf372eb77c41c5506908 EBUILD clamav-0.99.2-r3.ebuild 5182 BLAKE2B d635013b30e5ec0ea2ec7a9329d1534595bbbb51b0bd79c3d1e0e545993223dfc384cc28bf907f478f8ae354b8b3543df1c2f8bafd4a89d01d3fa5c6bbdd4099 SHA512 754c23b5f2dd0d664f79ad07d0dbf1944a58418f36c9d2e01f8fbf88eb6f883bf825cd16a43ca3916417a3dc4e0de8dda49f345a002e74f2caaa1b1e1da3fd97 -EBUILD clamav-0.99.3-r1.ebuild 5239 BLAKE2B 04bff202062f8f5fc9742ea74b38d92f42d20ce4cc1d1d4255471b80c6ec40eb9cda44e9347635a71cc45fde24f8d37bd8e9a2f9397cb50d72e964fdfaee7bc1 SHA512 e8daeafad7479fb4853610cfb4006648e5be5d421404de979a9bc499151b9c57a14721b5fcc4b8568d4064befc06f227fafe7f283928943b6008ddac064fd8bd +EBUILD clamav-0.99.3-r1.ebuild 5238 BLAKE2B 21836637c6f099309f59ef7bc317d14d11dcb5396a5c426fbc026f51a792a87560230101cd81ae23ba51e6e869532229cbcbc830fe4bca65fd7ba54be15d34c5 SHA512 df1fd4de0d11ba5db5de7d010ebf220c8c00aabb86c196ae5f7da0111ba605be17745afe15b1bcba1b9b795463efb4e61d62502332fc0365e6e1eff823d3da6b EBUILD clamav-0.99.3-r2.ebuild 5307 BLAKE2B 5d2378bd17e3664734df0ca1ab1cdfdc1e10b2bc5281dfdd7b05f2ac04a061874dbf8a55a075d223e7c8558c2fd02a1cb3871bc884bae97d5d26c615929c7be8 SHA512 da82fc72230d0f61fb69f69073217716e727e73f761f04fad229f81112f3f17e17ffdc040bf094cb8c0150e6d841daf9f36a3f1b9560c4d8172dc5f6a977d449 +EBUILD clamav-0.99.4.ebuild 5062 BLAKE2B 35e77bc4f949b867cac5838cc8050c9bcc3724c7ce7240949a298ac15bed397d6732823028b6e67b228cc502c28e4f970aab9c42f4fde20c2b2fdfe2b54763ff SHA512 7cfced7ba233b4f3d62a38094d4af7de17c80776fe2d73e99994449faf1a1486270307cd90e2165840aa4d92685d8dacfb2224e2af27604422007f6372d55e09 MISC metadata.xml 740 BLAKE2B 2cc1cd27896d7a032b476bbbe6a1b176c95657de5267cc77f6fc1ce1758603d9cf0caa0f3a614bc4a366695a089833474c30afc607ba1dee2caaff1dfc9e6c48 SHA512 baff0fa3285a5bfd17b408dc88ad573df07ec4de5e2827d352465347c5ebceb466172c4f369dac5680c927cad3a887a60721358e43b26e8cd7eaf3cebcaba832 diff --git a/app-antivirus/clamav/clamav-0.99.3-r1.ebuild b/app-antivirus/clamav/clamav-0.99.3-r1.ebuild index f9abad2121ff..cf59991c335c 100644 --- a/app-antivirus/clamav/clamav-0.99.3-r1.ebuild +++ b/app-antivirus/clamav/clamav-0.99.3-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc" CDEPEND="bzip2? ( app-arch/bzip2 ) diff --git a/app-antivirus/clamav/clamav-0.99.4.ebuild b/app-antivirus/clamav/clamav-0.99.4.ebuild new file mode 100644 index 000000000000..4839a5bdc557 --- /dev/null +++ b/app-antivirus/clamav/clamav-0.99.4.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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="http://www.clamav.net/" +SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc" + +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 ) ) + dev-libs/libtommath + >=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 ) + !!<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 +# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-clamav )" + +DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE ) +PATCHES=( + "${FILESDIR}/${P}-pcre2-compile-erroffset.patch" +) + +pkg_setup() { + enewgroup clamav + enewuser clamav -1 -1 /dev/null clamav +} + +src_prepare() { + default + + eautoconf +} + +src_configure() { + use ppc64 && append-flags -mminimal-toc + use uclibc && export ac_cv_type_error_t=yes + + econf \ + $(use_enable bzip2) \ + $(use_enable clamdtop) \ + $(use_enable ipv6) \ + $(use_enable milter) \ + $(use_enable static-libs static) \ + $(use_with iconv) \ + $(use_with metadata-analysis-api libjson /usr) \ + --cache-file="${S}"/config.cache \ + --disable-experimental \ + --disable-gcc-vcheck \ + --disable-zlib-vcheck \ + --enable-id-check \ + --with-dbdir="${EPREFIX}"/var/lib/clamav \ + --with-system-tommath \ + --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 + + 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/files/clamav-0.99.4-pcre2-compile-erroffset.patch b/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch new file mode 100644 index 000000000000..5585ea614534 --- /dev/null +++ b/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch @@ -0,0 +1,11 @@ +--- clamav-0.99.4/libclamav/regex_pcre.c_orig 2018-03-02 19:10:39.702899702 +0100 ++++ clamav-0.99.4/libclamav/regex_pcre.c 2018-03-02 19:09:27.600901912 +0100 +@@ -112,7 +112,8 @@ + #if USING_PCRE2 + int cli_pcre_compile(struct cli_pcre_data *pd, long long unsigned match_limit, long long unsigned match_limit_recursion, unsigned int options, int opt_override) + { +- int errornum, erroffset; ++ int errornum; ++ size_t erroffset; + pcre2_general_context *gctx; + pcre2_compile_context *cctx; |