<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/ef4f7a8ffc9863b1ac4c3434aff7f30b5b7d1413">https://github.com/macports/macports-ports/commit/ef4f7a8ffc9863b1ac4c3434aff7f30b5b7d1413</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ef4f7a8ffc9863b1ac4c3434aff7f30b5b7d1413
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Sep 28 14:38:46 2022 +1000

<span style='display:block; white-space:pre;color:#404040;'>    sguil-client: update to 1.0.0
</span>---
 security/sguil-client/Portfile               | 55 +++++++++++++++-------------
 security/sguil-client/files/configpath.patch | 19 ++++++++++
 2 files changed, 49 insertions(+), 25 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/sguil-client/Portfile b/security/sguil-client/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7727bada50d..d372211659b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/sguil-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/sguil-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,20 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span> 
 name                sguil-client
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             0.6.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        bammv sguil 1.0.0 v
</span> categories          security net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license             QPL-1 Permissive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license             GPL-3
</span> maintainers         nomaintainer
 description         GUI Console for Sguil Network Security Monitor
 long_description    ${description}
 supported_archs     noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            http://sguil.sf.net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        sourceforge:sguil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           md5 68d209f882d4c8fa9c200ba0924b00b3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir          sguil-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            https://bammv.github.io/sguil/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160 105b99c18ca4fce24e71cf49240a6e085acb4961 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256 4f6bd74966750238a727087f639bafd723cf95807cc421cde1ade5a50e19ee16
</span> depends_lib         port:tclx \
                     port:itk \
                     port:iwidgets \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,35 +22,40 @@ depends_lib         port:tclx \
</span>                     port:tcl-tls \
                     path:lib/libssl.dylib:openssl
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure       no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          configpath.patch
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|set SGUILLIB ./lib|set SGUILLIB ${prefix}/lib/sguil|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|set SGUILLIB ./lib|set SGUILLIB ${prefix}/lib/sguil|" \
</span>         ${worksrcpath}/client/sguil.conf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|set ETHEREAL_PATH /usr/sbin/ethereal|set ETHEREAL_PATH ${prefix}/bin/ethereal|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|set WIRESHARK_PATH /usr/sbin/wireshark|set WIRESHARK_PATH ${prefix}/bin/wireshark|" \
</span>         ${worksrcpath}/client/sguil.conf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|set SERVERHOST demo.sguil.net|set SERVERHOST localhost|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|set SERVERHOST demo.sguil.net|set SERVERHOST localhost|" \
</span>         ${worksrcpath}/client/sguil.conf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|set MAILSERVER mail.example.com|set MAILSERVER localhost|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|set MAILSERVER mail.example.com|set MAILSERVER localhost|" \
</span>         ${worksrcpath}/client/sguil.conf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/client/sguil.tk
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure       no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {}
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set sguiletc  ${prefix}/etc/sguil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span>     set sguilbin  ${prefix}/bin
     set sguillib  ${prefix}/lib/sguil
     set sguildoc  ${prefix}/share/doc/sguil
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set sguiletc  ${prefix}/etc/sguil
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 755 -d ${destroot}${sguilbin}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 755 ${worksrcpath}/client/sguil.tk ${destroot}${sguilbin}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 755 -d ${destroot}${sguillib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "cp -R ${worksrcpath}/client/lib/* ${destroot}${sguillib}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 755 -d ${destroot}${sguildoc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "cp ${worksrcpath}/doc/* ${destroot}${sguildoc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 755 -d ${destroot}${sguiletc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 755 ${worksrcpath}/client/sguil.conf ${destroot}${sguiletc}/sguil.conf.sample
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -d ${destroot}${sguilbin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall ${worksrcpath}/client/sguil.tk ${destroot}${sguilbin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -d ${destroot}${sguillib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    copy {*}[glob ${worksrcpath}/client/lib/*] ${destroot}${sguillib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -d ${destroot}${sguildoc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    copy {*}[glob ${worksrcpath}/doc/*] ${destroot}${sguildoc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -d ${destroot}${sguiletc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -m 444 ${worksrcpath}/client/sguil.conf ${destroot}${sguiletc}/sguil.conf.sample
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex     ${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![file exists ${sguiletc}/sguil.conf]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        copy ${sguiletc}/sguil.conf.sample ${sguiletc}/sguil.conf
</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;color:#808080;'>diff --git a/security/sguil-client/files/configpath.patch b/security/sguil-client/files/configpath.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3469b966202
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/sguil-client/files/configpath.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- client/sguil.tk.orig   2018-04-01 07:41:21.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ client/sguil.tk        2022-09-28 14:32:40.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2099,11 +2099,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set CONF_FILE $env(HOME)/sguil.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   } elseif { [file exists ./sguil.conf] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set CONF_FILE ./sguil.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  } elseif { [file exists /etc/sguil] &&\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-             [file isdirectory /etc/sguil] &&\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-             [file exists /etc/sguil/sguil.conf] &&\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-             [file readable /etc/sguil/sguil.conf] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set CONF_FILE /etc/sguil/sguil.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  } elseif { [file exists "@PREFIX@/etc/sguil"] &&\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++             [file isdirectory "@PREFIX@/etc/sguil"] &&\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++             [file exists "@PREFIX@/etc/sguil/sguil.conf"] &&\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++             [file readable "@PREFIX@/etc/sguil/sguil.conf"] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set CONF_FILE "@PREFIX@/etc/sguil/sguil.conf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     puts "Couldn't determine where the sguil config file is"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     puts "Looked for $env(HOME)/sguil.conf and ./sguil.conf."
</span></pre><pre style='margin:0'>

</pre>