[112740] trunk/dports/security/cyrus-sasl2
raimue at macports.org
raimue at macports.org
Wed Oct 30 13:15:50 PDT 2013
Revision: 112740
https://trac.macports.org/changeset/112740
Author: raimue at macports.org
Date: 2013-10-30 13:15:50 -0700 (Wed, 30 Oct 2013)
Log Message:
-----------
security/cyrus-sasl2:
Update to version 2.1.26, closes #40885
Not waiting for maintainer approval as port was broken.
Modified Paths:
--------------
trunk/dports/security/cyrus-sasl2/Portfile
Added Paths:
-----------
trunk/dports/security/cyrus-sasl2/files/patch-ltconfig_rpath_fallback.diff
Removed Paths:
-------------
trunk/dports/security/cyrus-sasl2/files/patch-config_ltconfig
trunk/dports/security/cyrus-sasl2/files/patch-gssapi.c.diff
trunk/dports/security/cyrus-sasl2/files/patch-lib_saslutil.c.diff
trunk/dports/security/cyrus-sasl2/files/patch-saslauthd_config_ltconfig
trunk/dports/security/cyrus-sasl2/files/patch-utils_Makefile.in.diff
Modified: trunk/dports/security/cyrus-sasl2/Portfile
===================================================================
--- trunk/dports/security/cyrus-sasl2/Portfile 2013-10-30 20:11:50 UTC (rev 112739)
+++ trunk/dports/security/cyrus-sasl2/Portfile 2013-10-30 20:15:50 UTC (rev 112740)
@@ -5,8 +5,7 @@
PortGroup muniversal 1.0
name cyrus-sasl2
-version 2.1.25
-revision 4
+version 2.1.26
categories security net
platforms darwin
# license is BSD plus a fourth (almost redundant) acknowledgement clause
@@ -24,28 +23,21 @@
its use is negotiated, a security layer is inserted \
between the protocol and the connection.
-homepage http://asg.web.cmu.edu/sasl/
-master_sites http://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+homepage http://cyrusimap.org/
+master_sites http://cyrusimap.org/releases/ \
+ ftp://ftp.cyrusimap.org/cyrus-sasl/
distname cyrus-sasl-${version}
-checksums rmd160 c9ed9093828f7f7bb1b35c8a690cadbcd44f3862 \
- sha256 418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe
+checksums rmd160 861a06d663cf3da37a198d0f971d99b249b5f4b8 \
+ sha256 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3
depends_lib port:openssl \
port:zlib
default_variants +kerberos
-patchfiles patch-config_ltconfig \
- patch-saslauthd_config_ltconfig \
- patch-utils_Makefile.in.diff \
- patch-gssapi.c.diff
+patchfiles patch-ltconfig_rpath_fallback.diff
-# fix bug when no FQDN available (#35098); should be fixed in next
-# upstream release
-patchfiles-append patch-lib_saslutil.c.diff
-
configure.args --mandir=${prefix}/share/man \
--with-openssl=${prefix} \
--with-dbpath=${prefix}/etc/sasldb2 \
@@ -121,5 +113,4 @@
#}
livecheck.type regex
-livecheck.url http://ftp.andrew.cmu.edu/pub/cyrus-mail/
livecheck.regex {cyrus-sasl-(\d+(?:\.\d+)*)\.tar\.gz}
Deleted: trunk/dports/security/cyrus-sasl2/files/patch-config_ltconfig
===================================================================
--- trunk/dports/security/cyrus-sasl2/files/patch-config_ltconfig 2013-10-30 20:11:50 UTC (rev 112739)
+++ trunk/dports/security/cyrus-sasl2/files/patch-config_ltconfig 2013-10-30 20:15:50 UTC (rev 112740)
@@ -1,11 +0,0 @@
---- config/ltconfig.orig 2011-09-02 22:58:00.000000000 +1000
-+++ config/ltconfig 2012-06-30 17:07:31.000000000 +1000
-@@ -1372,7 +1372,7 @@
- hardcode_shlibpath_var=no
- ;;
-
-- darwin[15]* | rhapsody*)
-+ darwin[15].* | rhapsody*)
- allow_undefined_flag='-undefined error'
- archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
- # We need to add '_' to the symbols in $export_symbols first
Deleted: trunk/dports/security/cyrus-sasl2/files/patch-gssapi.c.diff
===================================================================
--- trunk/dports/security/cyrus-sasl2/files/patch-gssapi.c.diff 2013-10-30 20:11:50 UTC (rev 112739)
+++ trunk/dports/security/cyrus-sasl2/files/patch-gssapi.c.diff 2013-10-30 20:15:50 UTC (rev 112740)
@@ -1,20 +0,0 @@
---- plugins/gssapi.c.old 2011-10-07 03:11:43.000000000 +0000
-+++ plugins/gssapi.c 2011-10-07 03:12:12.000000000 +0000
-@@ -370,7 +370,7 @@ sasl_gss_encode(void *context, const str
- }
-
- if (output_token->value && output) {
-- unsigned char * p = (unsigned char *) text->encode_buf;
-+ unsigned char * p;
-
- ret = _plug_buf_alloc(text->utils,
- &(text->encode_buf),
-@@ -383,6 +383,8 @@ sasl_gss_encode(void *context, const str
- GSS_UNLOCK_MUTEX(text->utils);
- return ret;
- }
-+
-+ p = (unsigned char *) text->encode_buf;
-
- p[0] = (output_token->length>>24) & 0xFF;
- p[1] = (output_token->length>>16) & 0xFF;
Deleted: trunk/dports/security/cyrus-sasl2/files/patch-lib_saslutil.c.diff
===================================================================
--- trunk/dports/security/cyrus-sasl2/files/patch-lib_saslutil.c.diff 2013-10-30 20:11:50 UTC (rev 112739)
+++ trunk/dports/security/cyrus-sasl2/files/patch-lib_saslutil.c.diff 2013-10-30 20:15:50 UTC (rev 112740)
@@ -1,15 +0,0 @@
---- lib/saslutil.c.orig 2011-10-22 17:06:12.000000000 -0700
-+++ lib/saslutil.c 2011-10-22 17:15:00.000000000 -0700
-@@ -556,7 +556,11 @@
- &hints,
- &result) != 0) {
- /* errno on Unix, WSASetLastError on Windows are already done by the function */
-- return (-1);
-+ if (abort_if_no_fqdn) {
-+ return (-1);
-+ } else {
-+ goto LOWERCASE;
-+ }
- }
-
- if (abort_if_no_fqdn && (result == NULL || result->ai_canonname == NULL)) {
Added: trunk/dports/security/cyrus-sasl2/files/patch-ltconfig_rpath_fallback.diff
===================================================================
--- trunk/dports/security/cyrus-sasl2/files/patch-ltconfig_rpath_fallback.diff (rev 0)
+++ trunk/dports/security/cyrus-sasl2/files/patch-ltconfig_rpath_fallback.diff 2013-10-30 20:15:50 UTC (rev 112740)
@@ -0,0 +1,11 @@
+--- config/ltconfig.orig 2013-10-27 06:37:18.000000000 -0700
++++ config/ltconfig 2013-10-27 06:40:45.000000000 -0700
+@@ -1385,7 +1385,7 @@
+ # Mac OS X v10.2 uses bash for /bin/sh instead of zsh, and the quoting syntax is incompatible
+ darwin*)
+ allow_undefined_flag='-undefined error'
+- 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)'
++ 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)'
+ # We need to add '_' to the symbols in $export_symbols first
+ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
+ hardcode_direct=yes
Deleted: trunk/dports/security/cyrus-sasl2/files/patch-saslauthd_config_ltconfig
===================================================================
--- trunk/dports/security/cyrus-sasl2/files/patch-saslauthd_config_ltconfig 2013-10-30 20:11:50 UTC (rev 112739)
+++ trunk/dports/security/cyrus-sasl2/files/patch-saslauthd_config_ltconfig 2013-10-30 20:15:50 UTC (rev 112740)
@@ -1,11 +0,0 @@
---- saslauthd/config/ltconfig.orig 2011-09-02 22:58:02.000000000 +1000
-+++ saslauthd/config/ltconfig 2012-06-30 17:09:03.000000000 +1000
-@@ -1372,7 +1372,7 @@
- hardcode_shlibpath_var=no
- ;;
-
-- darwin[15]* | rhapsody*)
-+ darwin[15].* | rhapsody*)
- allow_undefined_flag='-undefined error'
- archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
- # We need to add '_' to the symbols in $export_symbols first
Deleted: trunk/dports/security/cyrus-sasl2/files/patch-utils_Makefile.in.diff
===================================================================
--- trunk/dports/security/cyrus-sasl2/files/patch-utils_Makefile.in.diff 2013-10-30 20:11:50 UTC (rev 112739)
+++ trunk/dports/security/cyrus-sasl2/files/patch-utils_Makefile.in.diff 2013-10-30 20:15:50 UTC (rev 112740)
@@ -1,11 +0,0 @@
---- utils/Makefile.in.orig 2011-09-07 08:29:24.000000000 -0500
-+++ utils/Makefile.in 2012-06-06 13:28:24.000000000 -0500
-@@ -238,7 +238,7 @@
- JAVAH = @JAVAH@
- JAVAROOT = @JAVAROOT@
- JAVA_INCLUDES = @JAVA_INCLUDES@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = -L../lib/.libs @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131030/a968015a/attachment.html>
More information about the macports-changes
mailing list