<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/e56e5823b70c8aa8ca03ce36aaf12c44b67135af">https://github.com/macports/macports-ports/commit/e56e5823b70c8aa8ca03ce36aaf12c44b67135af</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 e56e582 cyrus-sasl2: update to 2.1.27
</span>e56e582 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e56e5823b70c8aa8ca03ce36aaf12c44b67135af
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Thu Dec 20 09:40:23 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> cyrus-sasl2: update to 2.1.27
</span>---
security/cyrus-sasl2/Portfile | 50 ++++------------------
.../cyrus-sasl2/files/patch-libsasl2.pc.in.diff | 18 --------
.../files/patch-ltconfig_rpath_fallback.diff | 11 -----
.../cyrus-sasl2/files/patch-sasl.h-size_t.diff | 12 ------
.../cyrus-sasl2/files/patch-utils_Makefile.in.diff | 11 -----
5 files changed, 9 insertions(+), 93 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/cyrus-sasl2/Portfile b/security/cyrus-sasl2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f51b7a3..d338e56 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/cyrus-sasl2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/cyrus-sasl2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
name cyrus-sasl2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.1.26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.1.27
</span> categories security net
platforms darwin
# license is BSD plus a fourth (almost redundant) acknowledgement clause
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,26 +29,24 @@ master_sites ${homepage}/releases/ \
</span> ftp://ftp.cyrusimap.org/cyrus-sasl/
distname cyrus-sasl-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 861a06d663cf3da37a198d0f971d99b249b5f4b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5220231
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7f5e4bd2ba1974f0b96ba5a659165f4484d550ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4111249
</span>
depends_lib path:lib/libssl.dylib:openssl \
port:zlib
default_variants +kerberos
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-libsasl2.pc.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ltconfig_rpath_fallback.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-utils_Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sasl.h-size_t.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --mandir=${prefix}/share/man \
--with-openssl=${prefix} \
--with-dbpath=${prefix}/etc/sasldb2 \
--with-plugindir=${prefix}/lib/sasl2 \
--with-saslauthd=${prefix}/var/state/saslauthd \
--with-pwcheck=${prefix}/var/pwcheck \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-obsolete_cram_attr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-obsolete_digest_attr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-static \
</span> --disable-gssapi \
--disable-macos-framework \
--enable-srp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,30 +56,6 @@ configure.args --mandir=${prefix}/share/man \
</span> --with-rc4=openssl \
ac_cv_prog_AWK=/usr/bin/awk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This is a start towards universal... lib/Makefile.am and sasldb/Makefile.am need to be updated to not do blind ar-fu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# system "rm ${worksrcpath}/config/libtool.m4"
</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;'>-#use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#autoreconf.env ACLOCAL="aclocal -I${worksrcpath}/cmulocal -I${worksrcpath}/config"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This is a horrible hackaround as replacing the ar-fu as mentioned above is non-trivial
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|^CC=\\\"(\[^\\\"\]+)\\\"|CC=\"\\1 [muniversal_get_arch_flag ${arch}]\"|g" ${worksrcpath}-${arch}/libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|^CC=\\\"(\[^\\\"\]+)\\\"|CC=\"\\1 ${configure.cc_archflags}\"|g" ${worksrcpath}/libtool
</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> destroot.keepdirs ${destroot}${prefix}/var/state/saslauthd \
${destroot}${prefix}/var/pwcheck
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,14 +64,14 @@ post-destroot {
</span> ${destroot}${prefix}/share/doc \
${destroot}${prefix}/var/state/saslauthd \
${destroot}${prefix}/var/pwcheck
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}
delete {*}[glob ${destroot}${prefix}/share/doc/${name}/*Makefile*]
}
variant kerberos description "Enable Kerberos support" {
configure.args-append --enable-keep-db-open
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin"} {
depends_lib-append port:kerberos5
configure.args-replace --disable-gssapi --enable-gssapi=${prefix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,11 +89,6 @@ variant sql description "Enable SQL support" {
</span> configure.args-append --enable-sql
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# doesn't work, ticket #22093
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#variant static description "Build static library" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append --enable-static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url ${homepage}/releases/
livecheck.regex "cyrus-sasl-(\\d+(?:\\.\\d+)*)${extract.suffix}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/cyrus-sasl2/files/patch-libsasl2.pc.in.diff b/security/cyrus-sasl2/files/patch-libsasl2.pc.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 82a6db7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/cyrus-sasl2/files/patch-libsasl2.pc.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix "Variable 'exec_prefix' not defined in '.../lib/pkgconfig/libsasl2.pc'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugzilla.cyrusimap.org/show_bug.cgi?id=3831
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libsasl2.pc.in.orig 2012-10-12 09:05:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libsasl2.pc.in 2013-12-19 04:27:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libdir = @libdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+prefix=@prefix@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+exec_prefix=@exec_prefix@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libdir=@libdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+includedir=@includedir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Name: Cyrus SASL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Description: Cyrus SASL implementation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,3 +9,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version: @VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Libs: -L${libdir} -lsasl2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Libs.private: @LIB_DOOR@ @SASL_DL_LIB@ @LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/cyrus-sasl2/files/patch-ltconfig_rpath_fallback.diff b/security/cyrus-sasl2/files/patch-ltconfig_rpath_fallback.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 511b42a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/cyrus-sasl2/files/patch-ltconfig_rpath_fallback.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;'>---- config/ltconfig.orig 2013-10-27 06:37:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/ltconfig 2013-10-27 06:40:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1385,7 +1385,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Mac OS X v10.2 uses bash for /bin/sh instead of zsh, and the quoting syntax is incompatible
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allow_undefined_flag='-undefined error'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test x$module != xyes && echo -install_name $LD_RUN_PATH/$soname $tmp_verstring)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test x$module != xyes && echo -install_name ${LD_RUN_PATH:-$rpath}/$soname $tmp_verstring)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We need to add '_' to the symbols in $export_symbols first
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hardcode_direct=yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/cyrus-sasl2/files/patch-sasl.h-size_t.diff b/security/cyrus-sasl2/files/patch-sasl.h-size_t.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4ab3d91..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/cyrus-sasl2/files/patch-sasl.h-size_t.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: http://git.cyrusimap.org/cyrus-sasl/commit/?id=67a188693796a14e3a76ac603104807fbbfddfc4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/sasl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/sasl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -121,6 +121,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef SASL_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SASL_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stddef.h> /* For size_t */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Keep in sync with win32/common.mak */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SASL_VERSION_MAJOR 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SASL_VERSION_MINOR 1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/cyrus-sasl2/files/patch-utils_Makefile.in.diff b/security/cyrus-sasl2/files/patch-utils_Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 61e4320..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/cyrus-sasl2/files/patch-utils_Makefile.in.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;'>---- utils/Makefile.in.orig 2011-09-07 08:29:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ utils/Makefile.in 2012-06-06 13:28:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -238,7 +238,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVAH = @JAVAH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVAROOT = @JAVAROOT@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVA_INCLUDES = @JAVA_INCLUDES@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = -L../lib/.libs @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBOBJS = @LIBOBJS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS = @LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBTOOL = @LIBTOOL@
</span></pre><pre style='margin:0'>
</pre>