summaryrefslogtreecommitdiff
path: root/app-antivirus/clamav
diff options
context:
space:
mode:
Diffstat (limited to 'app-antivirus/clamav')
-rw-r--r--app-antivirus/clamav/Manifest13
-rw-r--r--app-antivirus/clamav/clamav-0.100.1-r1.ebuild4
-rw-r--r--app-antivirus/clamav/clamav-0.101.2.ebuild (renamed from app-antivirus/clamav/clamav-0.100.0.ebuild)38
-rw-r--r--app-antivirus/clamav/clamav-0.99.4-r1.ebuild157
-rw-r--r--app-antivirus/clamav/clamav-0.99.4-r2.ebuild157
-rw-r--r--app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch54
-rw-r--r--app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch11
-rw-r--r--app-antivirus/clamav/metadata.xml4
8 files changed, 30 insertions, 408 deletions
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 7401000fb148..5a009e33bfa7 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,6 +1,4 @@
AUX clamav-0.100.0_autotools.patch 369 BLAKE2B ee30a0fe90e4553b64a67d1e0646a9d6c5ee33858e657905e0d71da9c4b14176469f1b2960dd04b25d46823fd239b252490c172a51d64eae589894423b8aafb0 SHA512 d872a162040ba10476f463b9e0e77edea81f022a4c0d53d7a6d09ca5753036a5236cf7182f518515f659888a203b07366873b757cf5af15c3dee74bbad6b2d02
-AUX clamav-0.99.4-fix-newer-zlib.patch 1721 BLAKE2B 5595696cb0fe1efbcf85d64fa2b9f9bd760ab38467a3d3c2996272d2e533b633d9a4d176096786a4ce666638902698be239d25762a61dec956100f6e33b3f9de SHA512 0b87152c6ecbdafabdb6fdef0e53c12c7651c8c47baa3c46497e19a7a220f4e1f9c1a79c99fb15399848d264ede38b3cddd3a369797a761069b370f367aa723d
-AUX clamav-0.99.4-pcre2-compile-erroffset.patch 510 BLAKE2B 888f5c0cf1205b5ca22ff5f445f194c9e62dd511fcf8a784be6592f700e0db6f7a36b00c88b73c5484cad2075822eb5c1e0c0f62c8ee12d6bac2d1b845a9aca5 SHA512 f03962fc47b10d729437f22374c17b773ee0f519cf537b1d7885ec6dbc1efd36d00372314faaabdf5400b85e781ab5b14e69b929c844b34520801e064d383dc2
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,18 +10,15 @@ 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.100.0.tar.gz 16036757 BLAKE2B c51edfb05726e16e2ff1ef1fee9f174af5a0d65396f847a4f6e1246d5844b92eb70896fc598d2c73719b1315ff3c41aca503823431e0918d52f56d29399dd796 SHA512 57e1da86a32fdfb66887c4aeed03008bc070ce3cb6b881db411332f2f2e640b73dca84d990f5886526b3d6bd0c2770c7dcce5b4e7cf48323824c362452593549
DIST clamav-0.100.1.tar.gz 16154415 BLAKE2B df4ddde28b0b263765f4a571a407390b30aa6fe58d07e1b8fe427e70141219fb3d7c5addfbf30a350c6c08324dee1ec3dd80319306df7578ed87138c6513b99d SHA512 13a4e050e030ac3d1cc07b12bdd56c455e266e0b205a4c9bc9f18e53f6d8913a66eed2296abf857f395227ab0ed5c7bc90bc357bcb314dc9e18a9c6177dcc5b2
DIST clamav-0.100.2.tar.gz 15926420 BLAKE2B 0a64a08b6cdad94f55852041df06b5517bcfa3bacb5871c694bf51692c4698ffd39f09c92fe2af167fcf2b27806a7175a9b649e6d6d5ffc65755509e3574d374 SHA512 70b51eafb11dc727188e7d4554b8095a9e0406e76b78778fede94f8a4c78146034478197217039384eb1fd15532e822cfa6b51707e431e9397ec21d5e393a60c
DIST clamav-0.101.0.tar.gz 21686531 BLAKE2B ea3ae1e5b31d6b10600eac8f0ea93c9460f0e337de7a3f43345c26e0efb0b3f664d1f640b723795eac6491f959492202a249222b561917072811df86314ea9d8 SHA512 faf6186b51b332eca67684bfe72f473a910577093964338278656ab67c61d28f66f7f501f4db5e1bb37112d66ad4433d792c50af70aceefd5bcbc5dab7ac7aa0
DIST clamav-0.101.1.tar.gz 21691396 BLAKE2B e9a63ba90bef5504aac1020293f26cf957323677ed229543f0e7784b80e11837683e72432890f3109b040a2ba08029383892a6f40f64050d3caa3fe94c0571aa SHA512 eb72fe21a9485d2906aec7f9a3dc955bbe4bb0fa812d622bc9c6c5c019eb2238a7370cb5dc1ba3886764269a925f7dcbe93255c77920bb489af4f3f81680d4c8
-DIST clamav-0.99.4.tar.gz 16083015 BLAKE2B 3c2e7d11ee05fe846f75c3fb6501b5fd809a2e58f8e69c82e493e32fcbc87ca0e5b5f7ab83a0d7e251a5dc8e84aed1475c87c1248b393fa04b6924a2ab32b9bf SHA512 778d5ef510d8d4bdfac5dc33d92469ed4283c414b3d42da6e1a0b13ed70e37755d5c837622dc336bc728ba1f8bf5485fc8a8d3a67a90e9aaa9e4dc71ece0691d
-EBUILD clamav-0.100.0.ebuild 5258 BLAKE2B 79c3b2fa7d2acd9288785ecec5761132bd3b1fe9219513d59133dc0877d2802e1b57927a686dc55bc397e66fdc79c943d629e512dda99ded6f995139e9cc450e SHA512 2b1fde01326f798c7e52494090eef039400fec3d225d932b0a004728926a3d57559bb2ea0beb7584c624b037d5d3f14861408ec073f6be9a52bec77353ad50fd
-EBUILD clamav-0.100.1-r1.ebuild 5337 BLAKE2B 16b5beb72422f5399c76f96d6a0b5427d21e91929615818950769227296939016924692f89cf32ea9bd799a21a589dad2a2d3a68197d42a2b1fb80f59ce77b41 SHA512 ae405b7ecae1293f242ef120cb90476f698c07588c17b663f94cd10366eb23314a5b7a47c6fb912abf06d5da511bda8b218715a2aa223a9555c5d7d6651401e7
+DIST clamav-0.101.2.tar.gz 21722932 BLAKE2B 5c2960e678510a6f829fc9333e05a45a57a704e13eb407e0f890dd5553a1f9644eb3b1122c677755237b8c682127319d447a508087bc9130d14cd2cfec92896a SHA512 f9ea4589a8081acf7b6d454d1a068da05ae6574a9070a08f9438935795cb6dc084ffb9222b11fb1623f31962f859e6536a2f5bd1de29ef6b9b314efa5edc8c7e
+EBUILD clamav-0.100.1-r1.ebuild 5336 BLAKE2B e3faf3ef330c9a9eb0ad880801ca2f0e90e6d15d8ab724dcd4725bcd2558b21b33fb755b12139e042d0f6831bfabd7ae251ba490d8edbe71ad9aa35ca516b55e SHA512 bd29e5963e5f29942988cea7580cfb6c027351010170c5a74b81ebe4e630de1a22adf32fc67e26dab21fc889dec63c94221edf92a0f11c0a7e8bbe96ce0fb69c
EBUILD clamav-0.100.1.ebuild 5263 BLAKE2B 48e800ac532b6d6f42d6e1d5766d4cb9fa33e3c9452fc5b5df0e72a5287c7124aefaaad0164b8863f85a58461aab0a3222bd5983731c828a8e3f2b73eb2ce990 SHA512 51c138ff3680b89770830f891fec9ae3bb69a169501cd550d23b8d954eb0d4a7273ddc671dac789544637a3a6c785a54572ad8922d6c9598a4f69b6479c72315
EBUILD clamav-0.100.2.ebuild 5517 BLAKE2B 9de363bf86a77e276d2c150079354a49f7b184e4782279920af51adccbf64b44d310c4fb1396c084472a54df2149fe3d2c480ca512f628e1175225bf3025793b SHA512 d765955e0787f037710597de836ccea9f19b3987bd8cb308d007fbb0b2500101225852d81c01ed43a98eb1e17ca759fdde85fa32b93b5e3bd72ce137052d3875
EBUILD clamav-0.101.0.ebuild 5491 BLAKE2B 12f2560645cfe618c67f3fb37679a821f8cbee23ec444d531891c5abd5a3abff2ec7e532bf6c32c353284604a53722d74501fe79ba4474cdc2c3ba73e0663faa SHA512 22e2e350450ffa512777d676f2dd88e19a32a56da363487488ba1f04e34c15f996dae2204b392db78fbeeaec58ea5c67839d15691f88fb6d0e06b272a1eeb802
EBUILD clamav-0.101.1.ebuild 5498 BLAKE2B 8f410d5caf1f6caa3c2bab34d8dc09abb6dc134e386ade36776b7680feea489c07bb1efa98bf4b5f3eed17178587c19c590777e557e35a01d2f06fb9e337e144 SHA512 b36238c4e6875952ec7dbd87cced6ed448e8317aff438e3a054e5a0fb4733cb69951553a2f54930ba4cf8025be3fdfbf096ee5109b38c8d23d854464158a8618
-EBUILD clamav-0.99.4-r1.ebuild 5117 BLAKE2B 1af1ba195eec3e7c9154386101719e08d7e0f2a28f74871374195b9619cdd99b5306d203eec88fe1041f5f024ec9baadfd02ed1f269dcf806dd6b3341ac1fd59 SHA512 f211a3bcb516f86a2d2143aea40e61e0c4e54064dfd7e37f1130ae38323efbd70c4d93eec321669ec7274b1eaadd2acf16dc9ad41bb290b4a1136b16e505dd8e
-EBUILD clamav-0.99.4-r2.ebuild 5117 BLAKE2B 1af1ba195eec3e7c9154386101719e08d7e0f2a28f74871374195b9619cdd99b5306d203eec88fe1041f5f024ec9baadfd02ed1f269dcf806dd6b3341ac1fd59 SHA512 f211a3bcb516f86a2d2143aea40e61e0c4e54064dfd7e37f1130ae38323efbd70c4d93eec321669ec7274b1eaadd2acf16dc9ad41bb290b4a1136b16e505dd8e
-MISC metadata.xml 870 BLAKE2B 8cf11482134a16789726d801ea4562fd31cad0c107e2deeab8d0442d9f868a48445ac99245926278d781eee9d2883effeab2f4b3d036442e8f0876b47680f51b SHA512 6791e9ef08015b4ff640beae21b61c609f5e4c942b87acbd8eb2c67e7686729e1752affb7d6cd19233878d9608fe04f52367d7247ba92496e89abf561007e855
+EBUILD clamav-0.101.2.ebuild 5495 BLAKE2B 00512c776dc0da8f565975d9381b064906c8e03dad9b684601b752c4d36b19af256e4998e9a2d740908be35c9a0d7d2e01ffd6fd8bdc0634589936ca38566640 SHA512 623e1106d269fda8b631b35601a593f07c53357eeec030baac0c2da4066889d209f0abe0435d62f0ca40a1f3d4bf5d798392706da964a094d82ab81d0681096d
+MISC metadata.xml 759 BLAKE2B a2984c1fd662ee8da7520b637840742d469a39132a218d8e007874b985e8a4581067d2a26c09678d907bc251a3e990c544c41f5782ba2b6a7f25ea520c42824c SHA512 1f5687e2db7e8e9626a7695e52b17b1b08d8cffa0ec9767d1c90cd2b3e7d63b0ca50d78be2084a132caf09f491e5a981953d6936296e7808dda792a5da215434
diff --git a/app-antivirus/clamav/clamav-0.100.1-r1.ebuild b/app-antivirus/clamav/clamav-0.100.1-r1.ebuild
index f86c5fdd38d6..89955613a3e0 100644
--- a/app-antivirus/clamav/clamav-0.100.1-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.100.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs system-libmspack test uclibc"
CDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-antivirus/clamav/clamav-0.100.0.ebuild b/app-antivirus/clamav/clamav-0.101.2.ebuild
index baf3b3b8f342..37f126e9ef27 100644
--- a/app-antivirus/clamav/clamav-0.100.0.ebuild
+++ b/app-antivirus/clamav/clamav-0.101.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,8 +11,8 @@ 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 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs system-libmspack test uclibc"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~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"
CDEPEND="bzip2? ( app-arch/bzip2 )
clamdtop? ( sys-libs/ncurses:0 )
@@ -24,7 +24,9 @@ CDEPEND="bzip2? ( app-arch/bzip2 )
libressl? ( dev-libs/libressl:0= )
sys-devel/libtool
|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
- system-libmspack? ( dev-libs/libmspack )
+ 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
@@ -35,28 +37,35 @@ DEPEND="${CDEPEND}
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-clamav )"
-DOCS=( docs/clamdoc.pdf docs/phishsigs_howto.pdf docs/signatures.pdf )
+DOCS=( docs/UserManual.md docs/UserManual )
HTML_DOCS=( docs/html )
-PATCHES=(
- "${FILESDIR}/${P}_autotools.patch"
-)
+#PATCHES=(
+# "${FILESDIR}/clamav-0.100.0_autotools.patch"
+#)
pkg_setup() {
enewgroup clamav
enewuser clamav -1 -1 /dev/null clamav
}
-src_prepare() {
- default
-
- eautoconf
-}
+#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) \
@@ -64,9 +73,10 @@ src_configure() {
$(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) \
- $(use_with system-libmspack) \
+ --with-system-libmspack \
--cache-file="${S}"/config.cache \
--disable-experimental \
--disable-gcc-vcheck \
diff --git a/app-antivirus/clamav/clamav-0.99.4-r1.ebuild b/app-antivirus/clamav/clamav-0.99.4-r1.ebuild
deleted file mode 100644
index 9e65d1d592f0..000000000000
--- a/app-antivirus/clamav/clamav-0.99.4-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 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 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 test 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 ) )
- >=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
-# 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=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-PATCHES=(
- "${FILESDIR}"/${PN}-0.99.4-fix-newer-zlib.patch
- "${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_enable test check) \
- $(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-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/clamav-0.99.4-r2.ebuild b/app-antivirus/clamav/clamav-0.99.4-r2.ebuild
deleted file mode 100644
index 9e65d1d592f0..000000000000
--- a/app-antivirus/clamav/clamav-0.99.4-r2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 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 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 test 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 ) )
- >=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
-# 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=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-PATCHES=(
- "${FILESDIR}"/${PN}-0.99.4-fix-newer-zlib.patch
- "${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_enable test check) \
- $(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-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-fix-newer-zlib.patch b/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch
deleted file mode 100644
index 18673419a584..000000000000
--- a/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/649516
-
-Description: fix compatibility with zlib 1.2.9 and newer
-Author: Marc Deslauriers <marc.deslauriers@canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/clamav/+bug/1692073
-
-Index: clamav-0.99.2+dfsg/libclamav/bytecode_api.c
-===================================================================
---- clamav-0.99.2+dfsg.orig/libclamav/bytecode_api.c 2017-08-08 15:20:06.651685637 -0400
-+++ clamav-0.99.2+dfsg/libclamav/bytecode_api.c 2017-08-15 15:45:14.645714766 -0400
-@@ -811,8 +811,20 @@ int32_t cli_bcapi_inflate_init(struct cl
- cli_dbgmsg("bytecode api: inflate_init: invalid buffers!\n");
- return -1;
- }
-- memset(&stream, 0, sizeof(stream));
-- ret = inflateInit2(&stream, windowBits);
-+
-+ b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
-+ if (!b) {
-+ return -1;
-+ }
-+ ctx->inflates = b;
-+ ctx->ninflates = n;
-+ b = &b[n-1];
-+
-+ b->from = from;
-+ b->to = to;
-+ b->needSync = 0;
-+ memset(&b->stream, 0, sizeof(stream));
-+ ret = inflateInit2(&b->stream, windowBits);
- switch (ret) {
- case Z_MEM_ERROR:
- cli_dbgmsg("bytecode api: inflateInit2: out of memory!\n");
-@@ -829,20 +841,6 @@ int32_t cli_bcapi_inflate_init(struct cl
- cli_dbgmsg("bytecode api: inflateInit2: unknown error %d\n", ret);
- return -1;
- }
--
-- b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
-- if (!b) {
-- inflateEnd(&stream);
-- return -1;
-- }
-- ctx->inflates = b;
-- ctx->ninflates = n;
-- b = &b[n-1];
--
-- b->from = from;
-- b->to = to;
-- b->needSync = 0;
-- memcpy(&b->stream, &stream, sizeof(stream));
- return n-1;
- }
-
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
deleted file mode 100644
index 5585ea614534..000000000000
--- a/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
index e81808edb4ed..e7a8dcd9494d 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -5,10 +5,6 @@
<email>antivirus@gentoo.org</email>
<name>Gentoo Antivirus Project</name>
</maintainer>
- <maintainer type="project">
- <email>net-mail@gentoo.org</email>
- <name>Net-Mail</name>
- </maintainer>
<use>
<flag name="clamdtop">A Top like tool which shows what clamd is currently scanning amongst other things</flag>
<flag name="metadata-analysis-api">Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.</flag>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 21:58:48 +0000