<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/eedf91a939dd2bb2a0bce7b226e90b6e071e2e9f">https://github.com/macports/macports-ports/commit/eedf91a939dd2bb2a0bce7b226e90b6e071e2e9f</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 eedf91a clamav-server: Bugfix patch files
</span>eedf91a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit eedf91a939dd2bb2a0bce7b226e90b6e071e2e9f
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sat Nov 23 14:49:14 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> clamav-server: Bugfix patch files
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes: https://trac.macports.org/ticket/59743
</span>---
sysutils/clamav-server/Portfile | 6 +++--
.../files/patch-etc-clamd-conf-macports.diff | 23 ++++++------------
.../files/patch-etc-freshclam-conf-macports.diff | 28 ++++------------------
3 files changed, 15 insertions(+), 42 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/clamav-server/Portfile b/sysutils/clamav-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ecba403..fdf9950 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/clamav-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/clamav-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,14 +147,16 @@ destroot {
</span> # clamd.conf.macports
xinstall -m 0644 -o ${clamavuser} -g ${clamavuser} ${prefix}/etc/clamd.conf.sample \
${destroot}${prefix}/etc/clamd.conf.macports
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${prefix} "patch -p1 ./etc/clamd.conf.macports ${filespath}/patch-etc-clamd-conf-macports.diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # diff -NaurdwB -I '^ *#.*' --label clamd.conf.macports clamd.conf.sample clamd_clamav-server.conf | sed -E -e 's#clamd.*\.conf(\.[[:alnum:]]+)?#etc/clamd.conf.macports#g' > patch-etc-clamd-conf-macports.diff || true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot}${prefix} "${patch.cmd} ${patch.pre_args} ./etc/clamd.conf.macports ${filespath}/patch-etc-clamd-conf-macports.diff"
</span> reinplace "s|@PREFIX@|${prefix}|g" \
${destroot}${prefix}/etc/clamd.conf.macports
# freshclam.conf.macports
xinstall -m 0644 -o ${clamavuser} -g ${clamavuser} ${prefix}/etc/freshclam.conf.sample \
${destroot}${prefix}/etc/freshclam.conf.macports
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${prefix} "patch -p1 ./etc/freshclam.conf.macports ${filespath}/patch-etc-freshclam-conf-macports.diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # diff -NaurdwB -I '^ *#.*' --label freshclam.conf.macports freshclam.conf.sample freshclam_clamav-server.conf | sed -E -e 's#freshclam.*\.conf(\.[[:alnum:]]+)?#etc/freshclam.conf.macports#g' > patch-etc-freshclam-conf-macports.diff || true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot}${prefix} "${patch.cmd} ${patch.pre_args} ./etc/freshclam.conf.macports ${filespath}/patch-etc-freshclam-conf-macports.diff"
</span> if {[variant_isset "sanesecurity"]} {
# DatabaseCustomURL (append after last appearance)
reinplace -E "/#DatabaseCustomURL\[^#\]*/,$!b
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/clamav-server/files/patch-etc-clamd-conf-macports.diff b/sysutils/clamav-server/files/patch-etc-clamd-conf-macports.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c37038..42470fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/clamav-server/files/patch-etc-clamd-conf-macports.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/clamav-server/files/patch-etc-clamd-conf-macports.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./etc/clamd.conf.macports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./etc/clamd.conf.macports 2019-06-12 15:04:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- etc/clamd.conf.macports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ etc/clamd.conf.macports 2019-11-23 14:00:02.000000000 -0500
</span> @@ -5,13 +5,13 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,16 +59,7 @@
</span>
# Waiting for data from a client socket will timeout after this time (seconds).
# Default: 120
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -156,7 +156,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #SendBufTimeout 200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Maximum number of queued items (including those being processed by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# MaxThreads threads)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MaxThreads 6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # It is recommended to have this value at least twice MaxThreads if possible.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # WARNING: you shouldn't increase this too much to avoid running out of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # descriptors,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -177,9 +177,101 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,9 +177,101 @@
</span> #ExcludePath ^/proc/
#ExcludePath ^/sys/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,7 +162,7 @@
</span>
# Follow directory symlinks.
# Default: no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -211,7 +303,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,7 +303,7 @@
</span>
# Don't fork into background.
# Default: no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,7 +171,7 @@
</span>
# Enable debug messages in libclamav.
# Default: no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -228,7 +320,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -227,7 +320,7 @@
</span>
# Detect Possibly Unwanted Applications.
# Default: no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -188,8 +179,8 @@
</span> +DetectPUA yes
# Exclude a specific PUA category. This directive can be used multiple times.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://github.com/vrtadmin/clamav-faq/blob/master/faq/faq-pua.md for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -244,6 +336,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://github.com/vrtadmin/clamav-faq/blob/master/faq/faq-pua.md for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -243,6 +336,11 @@
</span> #IncludePUA Scanner
#IncludePUA RAT
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/clamav-server/files/patch-etc-freshclam-conf-macports.diff b/sysutils/clamav-server/files/patch-etc-freshclam-conf-macports.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b4a5de..1e16a73 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/clamav-server/files/patch-etc-freshclam-conf-macports.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/clamav-server/files/patch-etc-freshclam-conf-macports.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./etc/freshclam.conf.macports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./etc/freshclam.conf.macports 2019-06-12 15:57:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- etc/freshclam.conf.macports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ etc/freshclam.conf.macports 2019-11-23 14:44:28.000000000 -0500
</span> @@ -5,7 +5,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,27 +27,7 @@
</span>
# By default when started freshclam drops privileges and switches to the
# "clamav" user. This directive allows you to change the database owner.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -109,8 +109,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Proxy settings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Default: disabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#HTTPProxyServer myproxy.com
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#HTTPProxyPort 1234
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#HTTPProxyServer localhost
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#HTTPProxyPort 3128
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #HTTPProxyUsername myusername
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #HTTPProxyPassword mypass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -118,7 +118,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # filtering you can use this option to force the use of a different
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # User-Agent header.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Default: clamav/version_number
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#HTTPUserAgent SomeUserAgentIdString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#HTTPUserAgent Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use aaa.bbb.ccc.ddd as client address for downloading databases. Useful for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # multi-homed systems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,7 +127,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,7 +132,7 @@
</span>
# Send the RELOAD command to clamd.
# Default: no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +36,7 @@
</span>
# Run command after successful database update.
# Default: disabled
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,7 +144,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -159,7 +149,7 @@
</span>
# Don't fork into background.
# Default: no
</pre><pre style='margin:0'>
</pre>