<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/90d058e0edfafe618b532141f0a4517980d8ae13">https://github.com/macports/macports-ports/commit/90d058e0edfafe618b532141f0a4517980d8ae13</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 90d058e0edf dansguardian: post-activate fixes
</span>90d058e0edf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 90d058e0edfafe618b532141f0a4517980d8ae13
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Feb 13 02:26:39 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> dansguardian: post-activate fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't try to change ownership if not running as root. Fix fs-traverse
</span><span style='display:block; white-space:pre;color:#404040;'> usage. Also adjust master_sites to avoid redirects.
</span>---
net/dansguardian/Portfile | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dansguardian/Portfile b/net/dansguardian/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c554694a60..3452e9831d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dansguardian/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dansguardian/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ long_description DansGuardian is content-control software: software \
</span> It also includes virus filtering and usage monitoring features.
homepage http://dansguardian.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:dansguardian
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/dansguardian
</span>
checksums md5 2a88d0392cd28eaec02b7ee727b2e253 \
sha1 c5d8175910310f9a03efc2e6cb440ea418adb896 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,20 +38,23 @@ startupitem.name dansguardian
</span> startupitem.executable ${prefix}/sbin/dansguardian -N
post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set runas_user nobody
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set runas_group nobody
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set log_path ${prefix}/var/log/dansguardian/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${prefix}/var/log/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -o ${runas_user} -g ${runas_group} -m 755 ${log_path}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse file ${log_path} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file isdirectory ${file}] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${file} -group ${runas_group} -owner ${runas_user} -permissions 00755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${file} -group ${runas_group} -owner ${runas_user} -permissions 00644
</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;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set log_path ${prefix}/var/log/dansguardian
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[getuid] == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set runas_user nobody
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set runas_group nobody
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${prefix}/var/log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -o ${runas_user} -g ${runas_group} -m 755 ${log_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse file [list ${log_path}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isdirectory ${file}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attributes ${file} -group ${runas_group} -owner ${runas_user} -permissions 00755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attributes ${file} -group ${runas_group} -owner ${runas_user} -permissions 00644
</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;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${log_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
livecheck.regex ${name}-(\[\\d\\.\]+\\d)
</pre><pre style='margin:0'>
</pre>