From b7c02cfa3914b5dd10f01caf2f511b15bb27b8b2 Mon Sep 17 00:00:00 2001 From: Hajimu UMEMOTO Date: Fri, 11 Oct 2002 23:16:26 +0000 Subject: Update to 2.1.8. --- security/cyrus-sasl2/Makefile | 9 +- security/cyrus-sasl2/distinfo | 2 +- security/cyrus-sasl2/files/patch-config::ltmain.sh | 15 ++ security/cyrus-sasl2/files/patch-lib::dlopen.c | 16 -- security/cyrus-sasl2/files/staticopen.h | 174 +++++++++++++++++++++ 5 files changed, 195 insertions(+), 21 deletions(-) create mode 100644 security/cyrus-sasl2/files/patch-config::ltmain.sh delete mode 100644 security/cyrus-sasl2/files/patch-lib::dlopen.c create mode 100644 security/cyrus-sasl2/files/staticopen.h (limited to 'security/cyrus-sasl2') diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 4f81458ce379..16227c9aec42 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: cyrus-sasl +# New ports collection makefile for: cyrus-sasl2 # Date created: Nov 1 1999 # Whom: hetzels@westbend.net # @@ -6,8 +6,8 @@ # PORTNAME= cyrus-sasl -PORTVERSION= 2.1.7 -PORTREVISION= 3 +PORTVERSION= 2.1.8 +#PORTREVISION= 0 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.westbend.net/pub/cyrus-mail/ \ @@ -39,7 +39,7 @@ MAN3= sasl.3 sasl_authorize_t.3 sasl_auxprop.3 \ sasl_user_exists.3 sasl_verifyfile_t.3 MAN8= saslauthd.8 sasldblistusers2.8 saslpasswd2.8 -USE_LIBTOOL= YES +GNU_CONFIGURE= YES CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-plugindir=${PREFIX}/lib/sasl2 \ @@ -123,6 +123,7 @@ post-patch: @${SED} -e "s;%%PWCHECK_METHOD%%;${PWCHECK_METHOD};g" \ -e "s;%%PREFIX%%;${PREFIX};g" \ ${.CURDIR}/pkg-message > ${PKGMESSAGE} + @${CP} ${FILESDIR}/staticopen.h ${WRKSRC}/lib # Create Cyrus user and group pre-install: diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo index 23da1b0713f4..67b2eadc4b4c 100644 --- a/security/cyrus-sasl2/distinfo +++ b/security/cyrus-sasl2/distinfo @@ -1 +1 @@ -MD5 (cyrus-sasl-2.1.7.tar.gz) = a73e12bea77e96300103aaf511c6bfc4 +MD5 (cyrus-sasl-2.1.8.tar.gz) = 25612a7a0c97a45ecec865edadd667cb diff --git a/security/cyrus-sasl2/files/patch-config::ltmain.sh b/security/cyrus-sasl2/files/patch-config::ltmain.sh new file mode 100644 index 000000000000..4f45833e4554 --- /dev/null +++ b/security/cyrus-sasl2/files/patch-config::ltmain.sh @@ -0,0 +1,15 @@ +Index: config/ltmain.sh +diff -u config/ltmain.sh.orig config/ltmain.sh +--- config/ltmain.sh.orig Tue Sep 3 23:59:40 2002 ++++ config/ltmain.sh Sat Oct 12 08:03:59 2002 +@@ -3391,8 +3391,8 @@ + # Install the pseudo-library for information purposes. + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i +- $show "$install_prog $instname $destdir/$name" +- $run eval "$install_prog $instname $destdir/$name" || exit $? ++ #$show "$install_prog $instname $destdir/$name" ++ #$run eval "$install_prog $instname $destdir/$name" || exit $? + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/security/cyrus-sasl2/files/patch-lib::dlopen.c b/security/cyrus-sasl2/files/patch-lib::dlopen.c deleted file mode 100644 index 6c915ffeeaac..000000000000 --- a/security/cyrus-sasl2/files/patch-lib::dlopen.c +++ /dev/null @@ -1,16 +0,0 @@ -Index: lib/dlopen.c -diff -u lib/dlopen.c.orig lib/dlopen.c ---- lib/dlopen.c.orig Fri Apr 19 01:58:42 2002 -+++ lib/dlopen.c Wed Aug 14 18:45:43 2002 -@@ -254,7 +254,11 @@ - return SASL_FAIL; - } - } -+#if defined(__FreeBSD__) -+ if(out != in) snprintf(out, PATH_MAX, "%s/%s", prefix, in); -+#else - if(out != in) strncpy(out, in, PATH_MAX); -+#endif - return SASL_OK; - } - diff --git a/security/cyrus-sasl2/files/staticopen.h b/security/cyrus-sasl2/files/staticopen.h new file mode 100644 index 000000000000..f3c6f54e0cac --- /dev/null +++ b/security/cyrus-sasl2/files/staticopen.h @@ -0,0 +1,174 @@ +/* staticopen.h + * Rob Siemborski + * Howard Chu + * $Id: staticopen.h,v 1.5 2002/09/10 17:14:45 ken3 Exp $ + */ +/* + * Copyright (c) 2001 Carnegie Mellon University. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The name "Carnegie Mellon University" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For permission or any other legal + * details, please contact + * Office of Technology Transfer + * Carnegie Mellon University + * 5000 Forbes Avenue + * Pittsburgh, PA 15213-3890 + * (412) 268-4387, fax: (412) 268-7395 + * tech-transfer@andrew.cmu.edu + * + * 4. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Computing Services + * at Carnegie Mellon University (http://www.cmu.edu/computing/)." + * + * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE + * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +typedef enum { + UNKNOWN = 0, SERVER = 1, CLIENT = 2, AUXPROP = 3, CANONUSER = 4 +} _sasl_plug_type; + +typedef struct { + _sasl_plug_type type; + char *name; + sasl_client_plug_init_t *plug; +} _sasl_plug_rec; + +/* For static linking */ +#define SPECIFIC_CLIENT_PLUG_INIT_PROTO( x ) \ +sasl_client_plug_init_t x##_client_plug_init + +#define SPECIFIC_SERVER_PLUG_INIT_PROTO( x ) \ +sasl_server_plug_init_t x##_server_plug_init + +#define SPECIFIC_AUXPROP_PLUG_INIT_PROTO( x ) \ +sasl_auxprop_init_t x##_auxprop_plug_init + +#define SPECIFIC_CANONUSER_PLUG_INIT_PROTO( x ) \ +sasl_canonuser_init_t x##_canonuser_plug_init + +/* Static Compillation Foo */ +#define SPECIFIC_CLIENT_PLUG_INIT( x, n )\ + { CLIENT, n, x##_client_plug_init } +#define SPECIFIC_SERVER_PLUG_INIT( x, n )\ + { SERVER, n, (sasl_client_plug_init_t *)x##_server_plug_init } +#define SPECIFIC_AUXPROP_PLUG_INIT( x, n )\ + { AUXPROP, n, (sasl_client_plug_init_t *)x##_auxprop_plug_init } +#define SPECIFIC_CANONUSER_PLUG_INIT( x, n )\ + { CANONUSER, n, (sasl_client_plug_init_t *)x##_canonuser_plug_init } + +#ifdef STATIC_ANONYMOUS +extern SPECIFIC_SERVER_PLUG_INIT_PROTO( anonymous ); +extern SPECIFIC_CLIENT_PLUG_INIT_PROTO( anonymous ); +#endif +#ifdef STATIC_CRAMMD5 +extern SPECIFIC_SERVER_PLUG_INIT_PROTO( crammd5 ); +extern SPECIFIC_CLIENT_PLUG_INIT_PROTO( crammd5 ); +#endif +#ifdef STATIC_DIGESTMD5 +extern SPECIFIC_SERVER_PLUG_INIT_PROTO( digestmd5 ); +extern SPECIFIC_CLIENT_PLUG_INIT_PROTO( digestmd5 ); +#endif +#ifdef STATIC_GSSAPIV2 +extern SPECIFIC_SERVER_PLUG_INIT_PROTO( gssapiv2 ); +extern SPECIFIC_CLIENT_PLUG_INIT_PROTO( gssapiv2 ); +#endif +#ifdef STATIC_KERBEROS4 +extern SPECIFIC_SERVER_PLUG_INIT_PROTO( kerberos4 ); +extern SPECIFIC_CLIENT_PLUG_INIT_PROTO( kerberos4 ); +#endif +#ifdef STATIC_LOGIN +extern SPECIFIC_SERVER_PLUG_INIT_PROTO( login ); +extern SPECIFIC_CLIENT_PLUG_INIT_PROTO( login ); +#endif +#ifdef STATIC_NTLM +extern SPECIFIC_SERVER_PLUG_INIT_PROTO( ntlm ); +extern SPECIFIC_CLIENT_PLUG_INIT_PROTO( ntlm ); +#endif +#ifdef STATIC_OTP +extern SPECIFIC_SERVER_PLUG_INIT_PROTO( otp ); +extern SPECIFIC_CLIENT_PLUG_INIT_PROTO( otp ); +#endif +#ifdef STATIC_PLAIN +extern SPECIFIC_SERVER_PLUG_INIT_PROTO( plain ); +extern SPECIFIC_CLIENT_PLUG_INIT_PROTO( plain ); +#endif +#ifdef STATIC_SRP +extern SPECIFIC_SERVER_PLUG_INIT_PROTO( srp ); +extern SPECIFIC_CLIENT_PLUG_INIT_PROTO( srp ); +#endif +#ifdef STATIC_SASLDB +extern SPECIFIC_AUXPROP_PLUG_INIT_PROTO( sasldb ); +#endif +#ifdef STATIC_MYSQL +extern SPECIFIC_AUXPROP_PLUG_INIT_PROTO( mysql ); +#endif + +_sasl_plug_rec _sasl_static_plugins[] = { +#ifdef STATIC_ANONYMOUS + SPECIFIC_SERVER_PLUG_INIT( anonymous, "ANONYMOUS" ), + SPECIFIC_CLIENT_PLUG_INIT( anonymous, "ANONYMOUS" ), +#endif +#ifdef STATIC_CRAMMD5 + SPECIFIC_SERVER_PLUG_INIT( crammd5, "CRAM-MD5" ), + SPECIFIC_CLIENT_PLUG_INIT( crammd5, "CRAM-MD5" ), +#endif +#ifdef STATIC_DIGESTMD5 + SPECIFIC_SERVER_PLUG_INIT( digestmd5, "DIGEST-MD5" ), + SPECIFIC_CLIENT_PLUG_INIT( digestmd5, "DIGEST-MD5" ), +#endif +#ifdef STATIC_GSSAPIV2 + SPECIFIC_SERVER_PLUG_INIT( gssapiv2, "GSSAPI" ), + SPECIFIC_CLIENT_PLUG_INIT( gssapiv2, "GSSAPI" ), +#endif +#ifdef STATIC_KERBEROS4 + SPECIFIC_SERVER_PLUG_INIT( kerberos4, "KERBEROS_V4" ), + SPECIFIC_CLIENT_PLUG_INIT( kerberos4, "KERBEROS_V4" ), +#endif +#ifdef STATIC_LOGIN + SPECIFIC_SERVER_PLUG_INIT( login, "LOGIN" ), + SPECIFIC_CLIENT_PLUG_INIT( login, "LOGIN" ), +#endif +#ifdef STATIC_NTLM + SPECIFIC_SERVER_PLUG_INIT( ntlm, "NTLM" ), + SPECIFIC_CLIENT_PLUG_INIT( ntlm, "NTLM" ), +#endif +#ifdef STATIC_OTP + SPECIFIC_SERVER_PLUG_INIT( otp, "OTP" ), + SPECIFIC_CLIENT_PLUG_INIT( otp, "OTP" ), +#endif +#ifdef STATIC_PLAIN + SPECIFIC_SERVER_PLUG_INIT( plain, "PLAIN" ), + SPECIFIC_CLIENT_PLUG_INIT( plain, "PLAIN" ), +#endif +#ifdef STATIC_SRP + SPECIFIC_SERVER_PLUG_INIT( srp, "SRP" ), + SPECIFIC_CLIENT_PLUG_INIT( srp, "SRP" ), +#endif +#ifdef STATIC_SASLDB + SPECIFIC_AUXPROP_PLUG_INIT( sasldb, "SASLDB" ), +#endif +#ifdef STATIC_MYSQL + SPECIFIC_AUXPROP_PLUG_INIT( mysql, "MYSQL" ), +#endif + { UNKNOWN, NULL, NULL } +}; -- cgit v1.2.3