From 07246f293e75f58e980e683479722749ce5cfd8e Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 13 Apr 2006 21:32:40 +0000 Subject: Add current contents of security/cyrus-sasl2, starting its move to security/cyrus-sasl (to make PKGNAME match directory name). --- security/cyrus-sasl/DEINSTALL | 19 +++++++ security/cyrus-sasl/DESCR | 14 +++++ security/cyrus-sasl/MESSAGE | 21 ++++++++ security/cyrus-sasl/Makefile | 71 +++++++++++++++++++++++++ security/cyrus-sasl/Makefile.common | 88 ++++++++++++++++++++++++++++++ security/cyrus-sasl/PLIST | 100 +++++++++++++++++++++++++++++++++++ security/cyrus-sasl/buildlink3.mk | 22 ++++++++ security/cyrus-sasl/distinfo | 21 ++++++++ security/cyrus-sasl/patches/patch-aa | 25 +++++++++ security/cyrus-sasl/patches/patch-ab | 25 +++++++++ security/cyrus-sasl/patches/patch-ac | 16 ++++++ security/cyrus-sasl/patches/patch-ad | 13 +++++ security/cyrus-sasl/patches/patch-ae | 16 ++++++ security/cyrus-sasl/patches/patch-af | 13 +++++ security/cyrus-sasl/patches/patch-ag | 13 +++++ security/cyrus-sasl/patches/patch-ah | 13 +++++ security/cyrus-sasl/patches/patch-ai | 68 ++++++++++++++++++++++++ security/cyrus-sasl/patches/patch-ak | 13 +++++ security/cyrus-sasl/patches/patch-al | 13 +++++ security/cyrus-sasl/patches/patch-ap | 25 +++++++++ security/cyrus-sasl/patches/patch-aq | 55 +++++++++++++++++++ security/cyrus-sasl/patches/patch-ar | 19 +++++++ security/cyrus-sasl/patches/patch-as | 39 ++++++++++++++ security/cyrus-sasl/patches/patch-at | 12 +++++ 24 files changed, 734 insertions(+) create mode 100644 security/cyrus-sasl/DEINSTALL create mode 100644 security/cyrus-sasl/DESCR create mode 100644 security/cyrus-sasl/MESSAGE create mode 100644 security/cyrus-sasl/Makefile create mode 100644 security/cyrus-sasl/Makefile.common create mode 100644 security/cyrus-sasl/PLIST create mode 100644 security/cyrus-sasl/buildlink3.mk create mode 100644 security/cyrus-sasl/distinfo create mode 100644 security/cyrus-sasl/patches/patch-aa create mode 100644 security/cyrus-sasl/patches/patch-ab create mode 100644 security/cyrus-sasl/patches/patch-ac create mode 100644 security/cyrus-sasl/patches/patch-ad create mode 100644 security/cyrus-sasl/patches/patch-ae create mode 100644 security/cyrus-sasl/patches/patch-af create mode 100644 security/cyrus-sasl/patches/patch-ag create mode 100644 security/cyrus-sasl/patches/patch-ah create mode 100644 security/cyrus-sasl/patches/patch-ai create mode 100644 security/cyrus-sasl/patches/patch-ak create mode 100644 security/cyrus-sasl/patches/patch-al create mode 100644 security/cyrus-sasl/patches/patch-ap create mode 100644 security/cyrus-sasl/patches/patch-aq create mode 100644 security/cyrus-sasl/patches/patch-ar create mode 100644 security/cyrus-sasl/patches/patch-as create mode 100644 security/cyrus-sasl/patches/patch-at (limited to 'security') diff --git a/security/cyrus-sasl/DEINSTALL b/security/cyrus-sasl/DEINSTALL new file mode 100644 index 00000000000..858ba8a8d2b --- /dev/null +++ b/security/cyrus-sasl/DEINSTALL @@ -0,0 +1,19 @@ +#!/bin/sh +# +# $NetBSD: DEINSTALL,v 1.8 2006/04/13 21:32:40 wiz Exp $ + +SASLDB=@PKG_SYSCONFDIR@/sasldb.db + +case ${STAGE} in +POST-DEINSTALL) + if [ -f ${SASLDB} ]; then + ${CAT} << EOF +=========================================================================== +You may want to remove the SASL password data file: + + ${SASLDB} +=========================================================================== +EOF + fi + ;; +esac diff --git a/security/cyrus-sasl/DESCR b/security/cyrus-sasl/DESCR new file mode 100644 index 00000000000..5a3474499b8 --- /dev/null +++ b/security/cyrus-sasl/DESCR @@ -0,0 +1,14 @@ +SASL is a method for adding authentication support to connection-based +protocols. To use SASL, a protocol includes a command for identifying and +authenticating a user to a server and for optionally negotiating protection +of subsequent protocol interactions. If its use is negotiated, a security +layer is inserted between the protocol and the connection. + +This is the Cyrus SASL API implentation. It can be used on the client or +server side to provide authentication. See RFC 2222 for more information. + +There's a mailing list for Cyrus SASL. Subscribe by sending a message +to majordomo@lists.andrew.cmu.edu with the body "subscribe cyrus-sasl". +The mailing list is available via anonymous IMAP at +imap://cyrus.andrew.cmu.edu/archive.cyrus-sasl or via the web at +http://asg.web.cmu.edu/archive/mailbox.php3?mailbox=archive.cyrus-sasl. diff --git a/security/cyrus-sasl/MESSAGE b/security/cyrus-sasl/MESSAGE new file mode 100644 index 00000000000..0df78cbb432 --- /dev/null +++ b/security/cyrus-sasl/MESSAGE @@ -0,0 +1,21 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2006/04/13 21:32:40 wiz Exp $ + +${PKGNAME} by default does *not* install any authentication plugin +modules. Until the necessary authentication plugin modules are +installed, e.g. security/cy2-crammd5 or security/cy2-gssapi, you +will probably get errors about "no appropriate mechs available". + +${PKGNAME} will use the following directory as the default +path to its plugin modules: + + ${_PLUGINDIR} + +The search path for plugin modules can be customized by setting the +SASL_PATH variable to a colon-delimted list of directories in the shell +environment. + +To allow plaintext authentication without using the sasldb mechanism, the +package security/cyrus-saslauthd should be installed. + +=========================================================================== diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile new file mode 100644 index 00000000000..dd926aa4c63 --- /dev/null +++ b/security/cyrus-sasl/Makefile @@ -0,0 +1,71 @@ +# $NetBSD: Makefile,v 1.50 2006/04/13 21:32:40 wiz Exp $ + +.include "Makefile.common" + +PKGREVISION= 3 +SVR4_PKGNAME= csasl +COMMENT= Simple Authentication and Security Layer + +.if exists(/usr/include/ndbm.h) +SASL_DBTYPE?= ndbm +.else +SASL_DBTYPE?= berkeley +.endif +BUILD_DEFS+= SASL_DBTYPE + +.if ${SASL_DBTYPE} == "berkeley" +USE_DB185= no +. include "../../mk/bdb.buildlink3.mk" +.endif + +CONFIGURE_ARGS+= --with-dblib=${SASL_DBTYPE:Q} +CONFIGURE_ARGS+= --with-dbpath=${PKG_SYSCONFDIR}/sasldb + +# Support using Cyrus saslauthd (security/cyrus-saslauthd) for plaintext +# password authentication. +# +SASLSOCKETDIR?= ${VARBASE}/run/saslauthd +CONFIGURE_ARGS+= --with-saslauthd=${SASLSOCKETDIR:Q} +BUILD_DEFS+= SASLSOCKETDIR + +# Support using the Courier authdaemond (security/courier-authlib) for +# plaintext password authentication. +# +AUTHDAEMONVAR?= ${VARBASE}/authdaemon +CONFIGURE_ARGS+= --with-authdaemond=${AUTHDAEMONVAR}/socket +BUILD_DEFS+= AUTHDAEMONVAR + +# Support using APOP against a POP server for plaintext password +# authentication. +# +CONFIGURE_ARGS+= --enable-checkapop + +.if exists(/dev/urandom) +SASL_ENTROPY_SOURCE?= /dev/urandom +.endif +.if defined(SASL_ENTROPY_SOURCE) +CONFIGURE_ARGS+= --with-devrandom=${SASL_ENTROPY_SOURCE:Q} +.endif +BUILD_DEFS+= SASL_ENTROPY_SOURCE + +# CYRUS_USER username of the Cyrus administrator +# CYRUS_GROUP group of the Cyrus administrator +# +CYRUS_USER?= cyrus +CYRUS_GROUP?= mail +FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q} +FILES_SUBST+= ROOT_USER=${ROOT_USER:Q} +BUILD_DEFS+= CYRUS_USER CYRUS_GROUP + +PKG_GROUPS= ${CYRUS_GROUP} +PKG_USERS= ${CYRUS_USER}:${CYRUS_GROUP}::::${SH} + +MESSAGE_SUBST+= _PLUGINDIR=${_PLUGINDIR:Q} + +post-install: + ${INSTALL_DATA_DIR} ${DOCDIR} + cd ${WRKSRC}/doc; for file in *.fig *.html *.txt; do \ + ${INSTALL_DATA} $$file ${DOCDIR}; \ + done + +.include "../../mk/bsd.pkg.mk" diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common new file mode 100644 index 00000000000..3a722a52366 --- /dev/null +++ b/security/cyrus-sasl/Makefile.common @@ -0,0 +1,88 @@ +# $NetBSD: Makefile.common,v 1.8 2006/04/13 21:32:40 wiz Exp $ +# +# This file is currently included by: +# +# security/cyrus-sasl/Makefile +# security/cy2-anonymous/Makefile +# security/cy2-crammd5/Makefile +# security/cy2-digestmd5/Makefile +# security/cy2-gssapi/Makefile +# security/cy2-login/Makefile +# security/cy2-ntlm/Makefile +# security/cy2-otp/Makefile +# security/cy2-plain/Makefile +# security/cy2-sql/Makefile +# +# This Makefile fragment should be included _below_ any SASL_PLUGIN +# definition and _above_ any CONFIGURE_ARGS definitions. + +DISTNAME= cyrus-sasl-2.1.20 +CATEGORIES= security +MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ + ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/ + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://asg.web.cmu.edu/sasl/ + +DISTINFO_FILE= ${.CURDIR}/../cyrus-sasl/distinfo +PATCHDIR= ${.CURDIR}/../cyrus-sasl/patches + +PKG_INSTALLATION_TYPES= overwrite pkgviews + +.include "../../mk/bsd.prefs.mk" + +.if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS]) +. include "../../security/cyrus-sasl/buildlink3.mk" +CPPFLAGS+= -I${BUILDLINK_PREFIX.cyrus-sasl}/include/sasl +. if defined(DEFAULT_VIEW.cyrus-sasl) +DEFAULT_VIEW.${PKGBASE}= ${DEFAULT_VIEW.cyrus-sasl} +. endif +.endif + +GNU_CONFIGURE= yes +USE_TOOLS+= gmake + +USE_LIBTOOL= yes +LTCONFIG_OVERRIDE+= ${WRKSRC}/config/ltconfig +MAKE_ENV+= SHLIBTOOL=${SHLIBTOOL:Q} + +DOCDIR= ${PREFIX}/share/doc/cyrus-sasl +PLUGINDIR= ${PREFIX}/lib/sasl2 +_PLUGINDIR= ${VIEWBASE}/lib/sasl2 + +CONFIGURE_ARGS+= --with-plugindir=${_PLUGINDIR:Q} + +# Authentication mechanisms +CONFIGURE_ARGS+= --disable-anon # ANONYMOUS +CONFIGURE_ARGS+= --disable-checkapop # CHECKAPOP +CONFIGURE_ARGS+= --disable-cram # CRAM-MD5 +CONFIGURE_ARGS+= --disable-digest # DIGEST-MD5 +CONFIGURE_ARGS+= --disable-gssapi # GSSAPI +CONFIGURE_ARGS+= --disable-krb4 # KERBEROS_V4 +CONFIGURE_ARGS+= --disable-login # LOGIN +CONFIGURE_ARGS+= --disable-ntlm # NTLM +CONFIGURE_ARGS+= --disable-otp # OTP +CONFIGURE_ARGS+= --disable-plain # PLAIN +CONFIGURE_ARGS+= --disable-sql # SQL +CONFIGURE_ARGS+= --disable-srp # SRP +CONFIGURE_ARGS+= --disable-srp-setpass +CONFIGURE_ARGS+= --with-dblib=none +CONFIGURE_ARGS+= --without-openssl +CONFIGURE_ARGS+= --without-pam +CONFIGURE_ARGS+= --without-saslauthd + +# Left here as reference for patch makers... +# clean up a bit to help package maintainer produce patch files +# +#USE_TOOLS+= automake +# +#post-extract: +# ${_PKG_SILENT}${_PKG_DEBUG} \ +# ${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f +# +#pre-configure: +# cd ${WRKSRC}; \ +# aclocal -I cmulocal -I config; \ +# autoheader; \ +# automake -a --gnu -i ; \ +# autoconf diff --git a/security/cyrus-sasl/PLIST b/security/cyrus-sasl/PLIST new file mode 100644 index 00000000000..b414326da94 --- /dev/null +++ b/security/cyrus-sasl/PLIST @@ -0,0 +1,100 @@ +@comment $NetBSD: PLIST,v 1.4 2006/04/13 21:32:40 wiz Exp $ +include/sasl/hmac-md5.h +include/sasl/md5.h +include/sasl/md5global.h +include/sasl/prop.h +include/sasl/sasl.h +include/sasl/saslplug.h +include/sasl/saslutil.h +lib/libsasl2.la +lib/sasl2/libsasldb.la +man/man3/sasl.3 +man/man3/sasl_authorize_t.3 +man/man3/sasl_auxprop.3 +man/man3/sasl_auxprop_getctx.3 +man/man3/sasl_auxprop_request.3 +man/man3/sasl_callbacks.3 +man/man3/sasl_canon_user_t.3 +man/man3/sasl_chalprompt_t.3 +man/man3/sasl_checkapop.3 +man/man3/sasl_checkpass.3 +man/man3/sasl_client_init.3 +man/man3/sasl_client_new.3 +man/man3/sasl_client_start.3 +man/man3/sasl_client_step.3 +man/man3/sasl_decode.3 +man/man3/sasl_dispose.3 +man/man3/sasl_done.3 +man/man3/sasl_encode.3 +man/man3/sasl_encodev.3 +man/man3/sasl_errdetail.3 +man/man3/sasl_errors.3 +man/man3/sasl_errstring.3 +man/man3/sasl_getopt_t.3 +man/man3/sasl_getpath_t.3 +man/man3/sasl_getprop.3 +man/man3/sasl_getrealm_t.3 +man/man3/sasl_getsecret_t.3 +man/man3/sasl_getsimple_t.3 +man/man3/sasl_global_listmech.3 +man/man3/sasl_idle.3 +man/man3/sasl_listmech.3 +man/man3/sasl_log_t.3 +man/man3/sasl_server_init.3 +man/man3/sasl_server_new.3 +man/man3/sasl_server_start.3 +man/man3/sasl_server_step.3 +man/man3/sasl_server_userdb_checkpass_t.3 +man/man3/sasl_server_userdb_setpass_t.3 +man/man3/sasl_setpass.3 +man/man3/sasl_setprop.3 +man/man3/sasl_user_exists.3 +man/man3/sasl_verifyfile_t.3 +man/man8/sasldblistusers2.8 +man/man8/saslpasswd2.8 +sbin/sasldblistusers2 +sbin/saslpasswd2 +share/doc/cyrus-sasl/advanced.html +share/doc/cyrus-sasl/appconvert.html +share/doc/cyrus-sasl/components.html +share/doc/cyrus-sasl/draft-burdis-cat-srp-sasl-08.txt +share/doc/cyrus-sasl/draft-ietf-sasl-anon-02.txt +share/doc/cyrus-sasl/draft-ietf-sasl-crammd5-01.txt +share/doc/cyrus-sasl/draft-ietf-sasl-gssapi-00.txt +share/doc/cyrus-sasl/draft-ietf-sasl-plain-03.txt +share/doc/cyrus-sasl/draft-ietf-sasl-rfc2222bis-03.txt +share/doc/cyrus-sasl/draft-ietf-sasl-rfc2831bis-02.txt +share/doc/cyrus-sasl/draft-ietf-sasl-saslprep-04.txt +share/doc/cyrus-sasl/draft-murchison-sasl-login-00.txt +share/doc/cyrus-sasl/draft-newman-sasl-c-api-01.txt +share/doc/cyrus-sasl/gssapi.html +share/doc/cyrus-sasl/index.html +share/doc/cyrus-sasl/install.html +share/doc/cyrus-sasl/macosx.html +share/doc/cyrus-sasl/mechanisms.html +share/doc/cyrus-sasl/options.html +share/doc/cyrus-sasl/os390.html +share/doc/cyrus-sasl/plugprog.html +share/doc/cyrus-sasl/programming.html +share/doc/cyrus-sasl/readme.html +share/doc/cyrus-sasl/rfc1321.txt +share/doc/cyrus-sasl/rfc1939.txt +share/doc/cyrus-sasl/rfc2104.txt +share/doc/cyrus-sasl/rfc2195.txt +share/doc/cyrus-sasl/rfc2222.txt +share/doc/cyrus-sasl/rfc2243.txt +share/doc/cyrus-sasl/rfc2245.txt +share/doc/cyrus-sasl/rfc2289.txt +share/doc/cyrus-sasl/rfc2444.txt +share/doc/cyrus-sasl/rfc2595.txt +share/doc/cyrus-sasl/rfc2831.txt +share/doc/cyrus-sasl/rfc2945.txt +share/doc/cyrus-sasl/rfc3174.txt +share/doc/cyrus-sasl/server-plugin-flow.fig +share/doc/cyrus-sasl/sysadmin.html +share/doc/cyrus-sasl/testing.txt +share/doc/cyrus-sasl/upgrading.html +share/doc/cyrus-sasl/windows.html +@dirrm share/doc/cyrus-sasl +@dirrm lib/sasl2 +@dirrm include/sasl diff --git a/security/cyrus-sasl/buildlink3.mk b/security/cyrus-sasl/buildlink3.mk new file mode 100644 index 00000000000..8ae0f991b2a --- /dev/null +++ b/security/cyrus-sasl/buildlink3.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink3.mk,v 1.8 2006/04/13 21:32:40 wiz Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +CYRUS_SASL_BUILDLINK3_MK:= ${CYRUS_SASL_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= cyrus-sasl +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncyrus-sasl} +BUILDLINK_PACKAGES+= cyrus-sasl + +.if !empty(CYRUS_SASL_BUILDLINK3_MK:M+) +BUILDLINK_API_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.12 +BUILDLINK_ABI_DEPENDS.cyrus-sasl?= cyrus-sasl>=2.1.20nb3 +BUILDLINK_PKGSRCDIR.cyrus-sasl?= ../../security/cyrus-sasl +.endif # CYRUS_SASL_BUILDLINK3_MK + +# Cyrus SASL mechanisms are shared modules loaded via dlopen(). +.include "../../mk/dlopen.buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo new file mode 100644 index 00000000000..1261f8bb3c4 --- /dev/null +++ b/security/cyrus-sasl/distinfo @@ -0,0 +1,21 @@ +$NetBSD: distinfo,v 1.14 2006/04/13 21:32:40 wiz Exp $ + +SHA1 (cyrus-sasl-2.1.20.tar.gz) = d1eec5644c4e87edb95fa5ab8bf124cfdf277eb6 +RMD160 (cyrus-sasl-2.1.20.tar.gz) = 45f8d9e91e5ba4840f57d2f0526b8f41f90bbb8c +Size (cyrus-sasl-2.1.20.tar.gz) = 1775163 bytes +SHA1 (patch-aa) = c3542cc0e7887fa92b8b3cfa3c970b0dc2f27a8d +SHA1 (patch-ab) = f3e86c1125e302466e876e5bf31764b9b5cff3ac +SHA1 (patch-ac) = e03731395cefef42c5070021c09928c939fc6a58 +SHA1 (patch-ad) = 8a6663e358a67c27380e37be72d71841fd553fdf +SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad +SHA1 (patch-af) = 40ec1378971536daddc543a66a1923451a4c381c +SHA1 (patch-ag) = f62062ecee2bf133572d09049a77c5624ddb7f70 +SHA1 (patch-ah) = 1b0cd2d822dac2b01523fbc712f6544cd9fc298d +SHA1 (patch-ai) = 4181f13bf69fec11aa42d98bcb85d5d8bd83dfe2 +SHA1 (patch-ak) = 1f727d2bc0536ac5d9ba28f5e4cf01c6c1998987 +SHA1 (patch-al) = a4d7aa722b334df6b7b9f532b02eb5bc7a797486 +SHA1 (patch-ap) = 3c1f4e554fd49772d2f8f279af3b571eca3a7076 +SHA1 (patch-aq) = 7e4375f0bc8c5b346d050a269fd2eea87f0aaf7c +SHA1 (patch-ar) = f03a9bddfeb7aeb8af19c2bde315a630ce03f331 +SHA1 (patch-as) = c8cebac879afda69b282f5c334ffb2c8b5eee6cd +SHA1 (patch-at) = cf35ac66873a5bc18216e13a1240019da99563ca diff --git a/security/cyrus-sasl/patches/patch-aa b/security/cyrus-sasl/patches/patch-aa new file mode 100644 index 00000000000..4022e64a101 --- /dev/null +++ b/security/cyrus-sasl/patches/patch-aa @@ -0,0 +1,25 @@ +$NetBSD: patch-aa,v 1.7 2006/04/13 21:32:40 wiz Exp $ + +--- configure.in.orig 2005-02-15 07:16:40.000000000 -0500 ++++ configure.in +@@ -44,12 +44,7 @@ dnl + AC_INIT(lib/saslint.h) + AC_PREREQ([2.54]) + +-dnl use ./config.cache as the default cache file. +-dnl we require a cache file to successfully configure our build. +-if test $cache_file = "/dev/null"; then +-cache_file="./config.cache" + AC_CACHE_LOAD +-fi + + AC_CONFIG_AUX_DIR(config) + AC_CANONICAL_HOST +@@ -486,7 +481,6 @@ SASL_KERBEROS_V4_CHK + SASL_GSSAPI_CHK + + if test "$gssapi" != "no"; then +- AC_DEFINE(STATIC_GSSAPIV2,[],[Link GSSAPI Staticly]) + mutex_default="no" + if test "$gss_impl" = "mit"; then + mutex_default="yes" diff --git a/security/cyrus-sasl/patches/patch-ab b/security/cyrus-sasl/patches/patch-ab new file mode 100644 index 00000000000..361d4d3780d --- /dev/null +++ b/security/cyrus-sasl/patches/patch-ab @@ -0,0 +1,25 @@ +$NetBSD: patch-ab,v 1.4 2006/04/13 21:32:40 wiz Exp $ + +--- aclocal.m4.orig 2004-10-24 16:21:05.000000000 -0400 ++++ aclocal.m4 +@@ -1678,7 +1678,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB], + LIBS="$saved_LIBS -l$dbname" + AC_TRY_LINK([#include ], + [db_create(NULL, NULL, 0);], +- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db, ++ BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break, + dblib="no") + done + if test "$dblib" = "no"; then +@@ -2923,7 +2923,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[ + AC_MSG_RESULT(with implementation ${gss_impl}) + AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv") + SASL_MECHS="$SASL_MECHS libgssapiv2.la" +- SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o" ++ if test "$enable_static" = yes; then ++ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o" ++ AC_DEFINE(STATIC_GSSAPIV2, [], [Link GSSAPI Staticly]) ++ fi + + cmu_save_LIBS="$LIBS" + LIBS="$LIBS $GSSAPIBASE_LIBS" diff --git a/security/cyrus-sasl/patches/patch-ac b/security/cyrus-sasl/patches/patch-ac new file mode 100644 index 00000000000..f3dcf63cf21 --- /dev/null +++ b/security/cyrus-sasl/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.3 2006/04/13 21:32:40 wiz Exp $ + +--- cmulocal/sasl2.m4.orig 2004-09-13 17:06:34.000000000 -0400 ++++ cmulocal/sasl2.m4 +@@ -227,7 +227,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[ + AC_MSG_RESULT(with implementation ${gss_impl}) + AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv") + SASL_MECHS="$SASL_MECHS libgssapiv2.la" +- SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o" ++ if test "$enable_static" = yes; then ++ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o" ++ AC_DEFINE(STATIC_GSSAPIV2, [], [Link GSSAPI Staticly]) ++ fi + + cmu_save_LIBS="$LIBS" + LIBS="$LIBS $GSSAPIBASE_LIBS" diff --git a/security/cyrus-sasl/patches/patch-ad b/security/cyrus-sasl/patches/patch-ad new file mode 100644 index 00000000000..5b39a7f67cc --- /dev/null +++ b/security/cyrus-sasl/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.3 2006/04/13 21:32:40 wiz Exp $ + +--- cmulocal/berkdb.m4.orig 2004-09-13 17:57:17.000000000 -0400 ++++ cmulocal/berkdb.m4 +@@ -217,7 +217,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB], + LIBS="$saved_LIBS -l$dbname" + AC_TRY_LINK([#include ], + [db_create(NULL, NULL, 0);], +- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db, ++ BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break, + dblib="no") + done + if test "$dblib" = "no"; then diff --git a/security/cyrus-sasl/patches/patch-ae b/security/cyrus-sasl/patches/patch-ae new file mode 100644 index 00000000000..92814ccb36c --- /dev/null +++ b/security/cyrus-sasl/patches/patch-ae @@ -0,0 +1,16 @@ +$NetBSD: patch-ae,v 1.3 2006/04/13 21:32:40 wiz Exp $ + +--- sample/server.c.orig Sun Oct 27 14:15:37 2002 ++++ sample/server.c Sun Oct 27 14:15:40 2002 +@@ -117,9 +117,9 @@ + } + #if defined(IPV6_V6ONLY) && !(defined(__FreeBSD__) && __FreeBSD__ < 3) + if (r->ai_family == AF_INET6) { +- if (setsockopt(*sock, IPPROTO_IPV6, IPV6_BINDV6ONLY, ++ if (setsockopt(*sock, IPPROTO_IPV6, IPV6_V6ONLY, + (void *) &on, sizeof(on)) < 0) { +- perror("setsockopt (IPV6_BINDV6ONLY)"); ++ perror("setsockopt (IPV6_V6ONLY)"); + close(*sock); + continue; + } diff --git a/security/cyrus-sasl/patches/patch-af b/security/cyrus-sasl/patches/patch-af new file mode 100644 index 00000000000..797c9a3254b --- /dev/null +++ b/security/cyrus-sasl/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.4 2006/04/13 21:32:40 wiz Exp $ + +--- lib/client.c.orig 2003-11-12 02:26:06.000000000 +1000 ++++ lib/client.c +@@ -61,8 +61,6 @@ + + static cmech_list_t *cmechlist; /* global var which holds the list */ + +-static sasl_global_callbacks_t global_callbacks; +- + static int _sasl_client_active = 0; + + static int init_mechlist() diff --git a/security/cyrus-sasl/patches/patch-ag b/security/cyrus-sasl/patches/patch-ag new file mode 100644 index 00000000000..5aaa09d70e8 --- /dev/null +++ b/security/cyrus-sasl/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.4 2006/04/13 21:32:40 wiz Exp $ + +--- plugins/Makefile.in.orig Fri Jul 2 15:40:16 2004 ++++ plugins/Makefile.in +@@ -125,7 +125,7 @@ JAVA_TRUE = @JAVA_TRUE@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +-LIBTOOL = @LIBTOOL@ ++LIBTOOL = $(SHLIBTOOL) + LIB_CRYPT = @LIB_CRYPT@ + LIB_DES = @LIB_DES@ + LIB_DOOR = @LIB_DOOR@ diff --git a/security/cyrus-sasl/patches/patch-ah b/security/cyrus-sasl/patches/patch-ah new file mode 100644 index 00000000000..3cc132f0539 --- /dev/null +++ b/security/cyrus-sasl/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.5 2006/04/13 21:32:40 wiz Exp $ + +--- lib/Makefile.in.orig Fri Aug 13 13:53:00 2004 ++++ lib/Makefile.in +@@ -121,7 +121,7 @@ JAVA_TRUE = @JAVA_TRUE@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +-LIBTOOL = @LIBTOOL@ ++LIBTOOL = $(SHLIBTOOL) + LIB_CRYPT = @LIB_CRYPT@ + LIB_DES = @LIB_DES@ + LIB_DOOR = @LIB_DOOR@ diff --git a/security/cyrus-sasl/patches/patch-ai b/security/cyrus-sasl/patches/patch-ai new file mode 100644 index 00000000000..7e499ef3205 --- /dev/null +++ b/security/cyrus-sasl/patches/patch-ai @@ -0,0 +1,68 @@ +$NetBSD: patch-ai,v 1.4 2006/04/13 21:32:40 wiz Exp $ + +--- configure.orig 2004-10-24 16:21:08.000000000 -0400 ++++ configure +@@ -1326,8 +1326,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-if test $cache_file = "/dev/null"; then +-cache_file="./config.cache" + if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. +@@ -1345,8 +1343,6 @@ echo "$as_me: creating cache $cache_file + >$cache_file + fi + +-fi +- + ac_aux_dir= + for ac_dir in config $srcdir/config; do + if test -f $ac_dir/install-sh; then +@@ -5160,7 +5156,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db ++ BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -5916,7 +5912,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db ++ BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -10680,7 +10676,14 @@ if test $ac_cv_lib_resolv_res_search = y + fi + + SASL_MECHS="$SASL_MECHS libgssapiv2.la" +- SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o" ++ if test "$enable_static" = yes; then ++ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o" ++ ++cat >>confdefs.h <<\_ACEOF ++#define STATIC_GSSAPIV2 ++_ACEOF ++ ++ fi + + cmu_save_LIBS="$LIBS" + LIBS="$LIBS $GSSAPIBASE_LIBS" +@@ -10778,11 +10781,6 @@ fi + + + if test "$gssapi" != "no"; then +- +-cat >>confdefs.h <<\_ACEOF +-#define STATIC_GSSAPIV2 +-_ACEOF +- + mutex_default="no" + if test "$gss_impl" = "mit"; then + mutex_default="yes" diff --git a/security/cyrus-sasl/patches/patch-ak b/security/cyrus-sasl/patches/patch-ak new file mode 100644 index 00000000000..3bef823484e --- /dev/null +++ b/security/cyrus-sasl/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.4 2006/04/13 21:32:41 wiz Exp $ + +--- Makefile.am.orig 2004-10-19 19:48:11.000000000 -0400 ++++ Makefile.am +@@ -69,7 +69,7 @@ else + INSTALLOSX = + endif + +-SUBDIRS=include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD) ++SUBDIRS=include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) + EXTRA_DIST=config cmulocal win32 mac dlcompat-20010505 NTMakefile + + dist-hook: diff --git a/security/cyrus-sasl/patches/patch-al b/security/cyrus-sasl/patches/patch-al new file mode 100644 index 00000000000..da19f913e36 --- /dev/null +++ b/security/cyrus-sasl/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.3 2006/04/13 21:32:41 wiz Exp $ + +--- Makefile.in.orig 2004-10-24 16:21:09.000000000 -0400 ++++ Makefile.in +@@ -237,7 +237,7 @@ AUTOMAKE_OPTIONS = 1.7 + @MACOSX_FALSE@INSTALLOSX = + @MACOSX_TRUE@INSTALLOSX = install-exec-local-osx + +-SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD) ++SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) + EXTRA_DIST = config cmulocal win32 mac dlcompat-20010505 NTMakefile + + framedir = /Library/Frameworks/SASL2.framework diff --git a/security/cyrus-sasl/patches/patch-ap b/security/cyrus-sasl/patches/patch-ap new file mode 100644 index 00000000000..1dcf972feca --- /dev/null +++ b/security/cyrus-sasl/patches/patch-ap @@ -0,0 +1,25 @@ +$NetBSD: patch-ap,v 1.3 2006/04/13 21:32:41 wiz Exp $ + +--- sasldb/Makefile.am.orig Fri Jul 2 15:39:41 2004 ++++ sasldb/Makefile.am +@@ -51,20 +51,8 @@ extra_common_sources = db_none.c db_ndbm + EXTRA_DIST = NTMakefile + + noinst_LTLIBRARIES = libsasldb.la +-noinst_LIBRARIES = libsasldb.a + + libsasldb_la_SOURCES = allockey.c sasldb.h + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) + libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) + libsasldb_la_LIBADD = $(SASL_DB_BACKEND) +- +-LOCAL_SASL_DB_BACKEND_STATIC := $(shell echo $(SASL_DB_BACKEND_STATIC) | sed -e "s%\.\./sasldb/%%g") +- +-# Prevent make dist stupidity +-libsasldb_a_SOURCES = +-EXTRA_libsasldb_a_SOURCES = +- +-libsasldb.a: libsasldb.la $(LOCAL_SASL_DB_BACKEND_STATIC) +- $(AR) cru .libs/$@ $(LOCAL_SASL_DB_BACKEND_STATIC) +- +- diff --git a/security/cyrus-sasl/patches/patch-aq b/security/cyrus-sasl/patches/patch-aq new file mode 100644 index 00000000000..8a43834474b --- /dev/null +++ b/security/cyrus-sasl/patches/patch-aq @@ -0,0 +1,55 @@ +$NetBSD: patch-aq,v 1.3 2006/04/13 21:32:41 wiz Exp $ + +--- sasldb/Makefile.in.orig Fri Jul 2 15:40:18 2004 ++++ sasldb/Makefile.in +@@ -235,28 +235,18 @@ extra_common_sources = db_none.c db_ndbm + EXTRA_DIST = NTMakefile + + noinst_LTLIBRARIES = libsasldb.la +-noinst_LIBRARIES = libsasldb.a + + libsasldb_la_SOURCES = allockey.c sasldb.h + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) + libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) + libsasldb_la_LIBADD = $(SASL_DB_BACKEND) + +-LOCAL_SASL_DB_BACKEND_STATIC := $(shell echo $(SASL_DB_BACKEND_STATIC) | sed -e "s%\.\./sasldb/%%g") +- +-# Prevent make dist stupidity +-libsasldb_a_SOURCES = +-EXTRA_libsasldb_a_SOURCES = + subdir = sasldb + mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LIBRARIES = $(noinst_LIBRARIES) + +-libsasldb_a_AR = $(AR) cru +-libsasldb_a_LIBADD = +-am_libsasldb_a_OBJECTS = +-libsasldb_a_OBJECTS = $(am_libsasldb_a_OBJECTS) + LTLIBRARIES = $(noinst_LTLIBRARIES) + + libsasldb_la_LDFLAGS = +@@ -276,10 +266,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( + CCLD = $(CC) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libsasldb_a_SOURCES) $(EXTRA_libsasldb_a_SOURCES) \ +- $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES) ++DIST_SOURCES = $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES) + DIST_COMMON = Makefile.am Makefile.in +-SOURCES = $(libsasldb_a_SOURCES) $(EXTRA_libsasldb_a_SOURCES) $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES) ++SOURCES = $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES) + + all: all-am + +@@ -540,8 +529,6 @@ uninstall-am: uninstall-info-am + tags uninstall uninstall-am uninstall-info-am + + +-libsasldb.a: libsasldb.la $(LOCAL_SASL_DB_BACKEND_STATIC) +- $(AR) cru .libs/$@ $(LOCAL_SASL_DB_BACKEND_STATIC) + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/security/cyrus-sasl/patches/patch-ar b/security/cyrus-sasl/patches/patch-ar new file mode 100644 index 00000000000..bd234336b7f --- /dev/null +++ b/security/cyrus-sasl/patches/patch-ar @@ -0,0 +1,19 @@ +$NetBSD: patch-ar,v 1.3 2006/04/13 21:32:41 wiz Exp $ + +--- utils/Makefile.am.orig Thu May 27 15:11:25 2004 ++++ utils/Makefile.am +@@ -56,11 +56,11 @@ else + man_MANS = saslpasswd2.8 sasldblistusers2.8 + endif + +-saslpasswd2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) ++saslpasswd2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs) + saslpasswd2_SOURCES = saslpasswd.c +-sasldblistusers2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) ++sasldblistusers2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs) + sasldblistusers2_SOURCES = sasldblistusers.c +-dbconverter_2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) ++dbconverter_2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs) + + testsuite_LDADD = $(all_sasl_libs) @DMALLOC_LIBS@ + diff --git a/security/cyrus-sasl/patches/patch-as b/security/cyrus-sasl/patches/patch-as new file mode 100644 index 00000000000..fb95f2fc46e --- /dev/null +++ b/security/cyrus-sasl/patches/patch-as @@ -0,0 +1,39 @@ +$NetBSD: patch-as,v 1.1 2006/04/13 21:32:41 wiz Exp $ + +--- utils/Makefile.in.orig Fri Jul 2 15:40:14 2004 ++++ utils/Makefile.in +@@ -237,11 +237,11 @@ noinst_PROGRAMS = dbconverter-2 + + @NO_SASL_DB_MANS_TRUE@man_MANS = + +-saslpasswd2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) ++saslpasswd2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs) + saslpasswd2_SOURCES = saslpasswd.c +-sasldblistusers2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) ++sasldblistusers2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs) + sasldblistusers2_SOURCES = sasldblistusers.c +-dbconverter_2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) ++dbconverter_2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs) + + testsuite_LDADD = $(all_sasl_libs) @DMALLOC_LIBS@ + +@@ -287,16 +287,16 @@ PROGRAMS = $(noinst_PROGRAMS) $(sbin_PRO + + dbconverter_2_SOURCES = dbconverter-2.c + dbconverter_2_OBJECTS = dbconverter-2.$(OBJEXT) +-dbconverter_2_DEPENDENCIES = ../sasldb/libsasldb.la ../lib/libsasl2.la ++dbconverter_2_DEPENDENCIES = $(SASL_DB_BACKEND_STATIC) ../lib/libsasl2.la + dbconverter_2_LDFLAGS = + am_sasldblistusers2_OBJECTS = sasldblistusers.$(OBJEXT) + sasldblistusers2_OBJECTS = $(am_sasldblistusers2_OBJECTS) +-sasldblistusers2_DEPENDENCIES = ../sasldb/libsasldb.la \ ++sasldblistusers2_DEPENDENCIES = $(SASL_DB_BACKEND_STATIC) \ + ../lib/libsasl2.la + sasldblistusers2_LDFLAGS = + am_saslpasswd2_OBJECTS = saslpasswd.$(OBJEXT) + saslpasswd2_OBJECTS = $(am_saslpasswd2_OBJECTS) +-saslpasswd2_DEPENDENCIES = ../sasldb/libsasldb.la ../lib/libsasl2.la ++saslpasswd2_DEPENDENCIES = $(SASL_DB_BACKEND_STATIC) ../lib/libsasl2.la + saslpasswd2_LDFLAGS = + am_smtptest_OBJECTS = + smtptest_OBJECTS = $(am_smtptest_OBJECTS) diff --git a/security/cyrus-sasl/patches/patch-at b/security/cyrus-sasl/patches/patch-at new file mode 100644 index 00000000000..c10bf85e66b --- /dev/null +++ b/security/cyrus-sasl/patches/patch-at @@ -0,0 +1,12 @@ +$NetBSD: patch-at,v 1.1 2006/04/13 21:32:41 wiz Exp $ + +--- plugins/ntlm.c.orig 2006-01-27 17:45:34.000000000 +0000 ++++ plugins/ntlm.c +@@ -74,6 +74,7 @@ + #endif /* WIN32 */ + + #include ++#include + #include + #include + #include -- cgit v1.2.3