<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/857c47b3beba97eb7e9934c5bff6e8982bf44307">https://github.com/macports/macports-ports/commit/857c47b3beba97eb7e9934c5bff6e8982bf44307</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 857c47b rspamd: Upgrade to v.1.9.2 with major Portfile enhancements
</span>857c47b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 857c47b3beba97eb7e9934c5bff6e8982bf44307
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Apr 30 17:12:03 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> rspamd: Upgrade to v.1.9.2 with major Portfile enhancements
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Upgrades to latest version 1.9.2
</span><span style='display:block; white-space:pre;color:#404040;'> * Adds proper liveurl checking
</span><span style='display:block; white-space:pre;color:#404040;'> * Proper configuration of /opt/local dirs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58411
</span>---
mail/rspamd/Portfile | 114 +++++++++++++++++++++++++++++++--------------------
1 file changed, 69 insertions(+), 45 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/rspamd/Portfile b/mail/rspamd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e05b2c6..2696b78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/rspamd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/rspamd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,85 +1,109 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup vstakhov rspamd 0.8.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup rspamd rspamd 1.9.2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.8.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories mail
license BSD
maintainers nomaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Apache-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://rspamd.com
</span> description Rspamd filtering system is created as a replacement of popular spamassassin \
spamd and is designed to be fast, modular and easily extendable system.
long_description ${description} Rspamd core is written in C language using event driven \
paradigma. Plugins for rspamd can be written in lua. Rspamd is designed to \
process connections completely asynchronous and do not block anywhere in code.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://rspamd.com
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${github.version} eq ${version}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites http://rspamd.com/downloads
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 dc43a24c9eef555bd390ab31c4aa1deb8c5e7704 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 20f788b08406fdaa8148d726e7ba18940108afff2d48b4f47726e3f2a6a88daf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fetch.type git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "git submodule update --init"
</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;'>+# Necessary to address this issue: https://trac.macports.org/ticket/47197
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.out_of_source no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a8dd52a6ede4c52289b23a69d3ea80602e46696e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dd1d8e9cdbb1c870be3c1bfee57a6894b6f8174595bc0684212a7c1afa4439f0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4460935
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libevent \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:luajit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ragel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libevent \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmagic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openssl \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libopenblas.dylib:OpenBLAS \
</span> port:gmime \
port:lua \
port:pcre \
port:perl5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hiredis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:redis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hiredis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
set rspamd_user _rspamd
set rspamd_group ${rspamd_user}
add_users ${rspamd_user} group=${rspamd_group} realname=Rspamd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libpath ${prefix}/var/lib/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DRSPAMD_USER=${rspamd_user} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_PORT:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_LUAJIT:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DNO_SHARED=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRSPAMD_USER=${rspamd_user} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRSPAMD_GROUP=${rspamd_group} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCONFDIR=${prefix}/etc/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMANDIR=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRUNDIR=${prefix}/var/run/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDBDIR=${prefix}/var/lib/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLOGDIR=${prefix}/var/log/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBDIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PORT:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LUAJIT=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DNO_SHARED=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DINSTALL_EXAMPLES=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This will need its own macport, see https://github.com/intel/hyperscan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -DENABLE_HYPERSCAN=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_FANN=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PCRE2=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GD=ON
</span>
test.run yes
test.target run-test
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # create default directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -o ${rspamd_user} -g ${rspamd_group} -m 0755 -d ${destroot}${prefix}/var/lib/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -o ${rspamd_user} -g ${rspamd_group} -m 0755 -d ${destroot}${prefix}/etc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -o ${rspamd_user} -g ${rspamd_group} -m 0755 -d ${destroot}${prefix}/var/run/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -o ${rspamd_user} -g ${rspamd_group} -m 0755 -d ${destroot}${prefix}/var/log/${name}
</span>
set docdir ${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0444 -W ${worksrcpath} ChangeLog LICENSE README.md ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0444 -W ${worksrcpath} ChangeLog LICENSE.md README.md ${destroot}${docdir}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set confdir ${prefix}/etc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach s [glob ${confdir}/*.sample] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists [string map {.sample {}} "${s}"]]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${s} [string map {.sample {}} "${s}"]
</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;'>+ # install the man pages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath}/doc rspamadm.1 rspamc.1 ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath}/doc rspamd.8 ${destroot}${prefix}/share/man/man8
</span> }
startupitem.create yes
startupitem.executable \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/bin/rspamd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -u ${rspamd_user} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -g ${rspamd_group} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -c ${prefix}/etc/rspamd/rspamd.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/bin/rspamd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -u ${rspamd_user} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -g ${rspamd_group} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -c ${prefix}/etc/rspamd/rspamd.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.keepdirs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/run/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/lib/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/log/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/doc/${name}
</span></pre><pre style='margin:0'>
</pre>