commit:     74eede5d3485d1ac7022221ce0e34c4b01c4ea17
Author:     Thomas Raschbacher <lordvan <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 12 12:12:04 2018 +0000
Commit:     Thomas Raschbacher <lordvan <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 12:13:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74eede5d

new version + autotools patch

 app-antivirus/clamav/Manifest                      |   1 +
 app-antivirus/clamav/clamav-0.100.0.ebuild         | 160 +++++++++++++++++++++
 .../clamav/files/clamav-0.100.0_autotools.patch    |  10 ++
 app-antivirus/clamav/metadata.xml                  |   1 +
 4 files changed, 172 insertions(+)

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 1296e9f756b..a0ce2687d0b 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,3 +1,4 @@
+DIST clamav-0.100.0.tar.gz 16036757 BLAKE2B 
c51edfb05726e16e2ff1ef1fee9f174af5a0d65396f847a4f6e1246d5844b92eb70896fc598d2c73719b1315ff3c41aca503823431e0918d52f56d29399dd796
 SHA512 
57e1da86a32fdfb66887c4aeed03008bc070ce3cb6b881db411332f2f2e640b73dca84d990f5886526b3d6bd0c2770c7dcce5b4e7cf48323824c362452593549
 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

diff --git a/app-antivirus/clamav/clamav-0.100.0.ebuild 
b/app-antivirus/clamav/clamav-0.100.0.ebuild
new file mode 100644
index 00000000000..1abf0370982
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.100.0.ebuild
@@ -0,0 +1,160 @@
+# 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="~amd64 ~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 system-libmspack 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 ) )
+       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 )
+       system-libmspack? ( dev-libs/libmspack )
+       !!<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
+       test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+       selinux? ( sec-policy/selinux-clamav )"
+
+DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
+PATCHES=(
+       "${FILESDIR}/${P}_autotools.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) \
+               $(use_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-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.100.0_autotools.patch 
b/app-antivirus/clamav/files/clamav-0.100.0_autotools.patch
new file mode 100644
index 00000000000..58c3b4e324f
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.100.0_autotools.patch
@@ -0,0 +1,10 @@
+--- clamav-0.100.0/configure.ac_orig   2018-04-12 13:12:58.201729248 +0200
++++ clamav-0.100.0/configure.ac        2018-04-12 13:23:44.982679360 +0200
+@@ -47,6 +47,7 @@
+ LT_CONFIG_LTDL_DIR([libltdl])
+ LT_INIT([dlopen disable-static])
+ LTDL_INIT([recursive])
++PKG_PROG_PKG_CONFIG(0.16)
+ 
+ m4_include([m4/reorganization/build_tools.m4])
+ m4_include([m4/reorganization/headers.m4])

diff --git a/app-antivirus/clamav/metadata.xml 
b/app-antivirus/clamav/metadata.xml
index 7d510408a04..5ddb818cae4 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -12,6 +12,7 @@
   <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>
+    <flag name="system-libmspack">Use system libmspack instead of built 
in</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">clamav</remote-id>

Reply via email to