<pre style='margin:0'>
Daniel J. Luke (danielluke) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/da39bf18b05baa7a49025817935a5c9ae6d98bfc">https://github.com/macports/macports-ports/commit/da39bf18b05baa7a49025817935a5c9ae6d98bfc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new da39bf18b05 clamav: update to 0.104.0, new cmake-based build
</span>da39bf18b05 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit da39bf18b05baa7a49025817935a5c9ae6d98bfc
</span>Author: Daniel J. Luke <dluke@macports.org>
AuthorDate: Thu Sep 16 16:23:18 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> clamav: update to 0.104.0, new cmake-based build
</span>---
sysutils/clamav/Portfile | 77 ++++++++--------------
sysutils/clamav/files/patch-configure.diff | 23 -------
.../clamav/files/patch-libclamav-Makefile.diff | 11 ----
3 files changed, 28 insertions(+), 83 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/clamav/Portfile b/sysutils/clamav/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 644ebd387e3..8a35cec0ea8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/clamav/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/clamav/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,9 @@
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span> PortGroup legacysupport 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
name clamav
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.103.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.104.0
</span> categories sysutils
maintainers {geeklair.net:dluke @danielluke}
description clamav antivirus software
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,27 +15,24 @@ long_description Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The \
</span>
homepage http://www.clamav.net
master_sites http://www.clamav.net/downloads/production
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 537e622e85490b64591734160820422da7d31777 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9f6e3d18449f3d1a3992771d696685249dfa12736fe2b2929858f2c7d8276ae9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 13389239
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6cae80695cb2e2f5214ce6b999517e1f1f2a4305 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a079d64cd55d6184510adfe0f341b2f278f7fb1bcc080d28d374298160f19cb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11896747
</span>
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-zlib=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-openssl=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pcre=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xml=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libcurl=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libjson=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-llvm=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#- disable llvm because of upstream bug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#- https://bugzilla.clamav.net/show_bug.cgi?id=11309
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable tests to avoid extra dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -D ENABLE_TESTS=OFF
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#Parallel build causes build failures as of 0.104.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#use_parallel_build yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:git:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#depends_test port:check \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port:py39-pytest
</span>
depends_lib port:libiconv \
port:zlib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,11 +45,6 @@ depends_lib port:libiconv \
</span> port:json-c \
port:libtool
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#- makefile hack to build even when chmlib is installed with its own lzx.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#- configure hack to use pkgc-config for libxml2 libraries because
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#- xml2-config includes the icu libraries and we overlink otherwiwse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-libclamav-Makefile.diff patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ## older systems support
# use linux version of openssl cert util on systems < 10.7 that don't support the macOS version
# ./shared/linux/cert_util_linux.c -> ./shared/mac/cert_util_mac.m
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,34 +58,22 @@ post-extract {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_dont_diff ${prefix}/bin/clamav-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin 8 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags {-O0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #muniversal should allow this to be hooked in some way that's less gross
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #this code copied from nspr's portfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${destroot}${prefix}/bin/${build_arch}-clamav-config ${destroot}${prefix}/bin/bak-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach file [glob ${destroot}${prefix}/bin/*clamav-config] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete $file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/bin/bak-config ${destroot}${prefix}/bin/clamav-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-arch ${build_arch}||g" ${destroot}${prefix}/bin/clamav-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-L\$\{exec_prefix\}/lib/${build_arch}||g" ${destroot}${prefix}/bin/clamav-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-R${prefix}/lib||g" ${destroot}${prefix}/bin/clamav-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -D OPTIMIZE=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
variant clamav_milter description {build with libmilter support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libmilter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-milter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libmilter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -D ENABLE_MILTER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#tests fail if this version of the port isn't installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#should fix it to look in build directory first (only)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# also, need to build withthout ENABLE_TESTS=OFF if we want to run tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ... but don't want to force everyone to install check and python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#test.cmd ctest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#test.target --rerun-failed --output-on-failure
</span>
livecheck.type regex
livecheck.url http://www.clamav.net/downloads
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/clamav/files/patch-configure.diff b/sysutils/clamav/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 448b8bd1c64..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/clamav/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2021-06-19 23:16:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-07-19 14:33:06.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22225,9 +22225,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- found_xml="yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XMLCONF_VERSION="`$xmlconfig --version`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XML_CPPFLAGS="`$xmlconfig --cflags`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XML_LIBS="`$xmlconfig --libs`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ XMLCONF_VERSION="`$XML_HOME/bin/pkg-config libxml-2.0 --version`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ XML_CPPFLAGS="`$XML_HOME/bin/pkg-config libxml-2.0 --cflags`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ XML_LIBS="`$XML_HOME/bin/pkg-config libxml-2.0 --libs`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24986,6 +24986,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <netdb.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/clamav/files/patch-libclamav-Makefile.diff b/sysutils/clamav/files/patch-libclamav-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3789856cb48..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/clamav/files/patch-libclamav-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libclamav/Makefile.in.orig 2018-12-04 21:28:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libclamav/Makefile.in 2018-12-04 21:30:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -718,7 +718,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__v_at_0 = @
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__v_at_1 =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libclammspack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libclammspack -I../libclammspack/mspack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__depfiles_maybe = depfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__mv = mv -f
</span></pre><pre style='margin:0'>
</pre>