diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/cyrus-sasl2/Makefile | 7 | ||||
-rw-r--r-- | security/cyrus-sasl2/Makefile.common | 13 | ||||
-rw-r--r-- | security/cyrus-sasl2/distinfo | 9 | ||||
-rw-r--r-- | security/cyrus-sasl2/patches/patch-aa | 13 | ||||
-rw-r--r-- | security/cyrus-sasl2/patches/patch-ab | 16 | ||||
-rw-r--r-- | security/cyrus-sasl2/patches/patch-ac | 16 | ||||
-rw-r--r-- | security/cyrus-sasl2/patches/patch-ai | 33 |
7 files changed, 92 insertions, 15 deletions
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index b9b0e58431d..4fd0e5ed1a0 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2004/02/14 03:16:58 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 07:45:36 jlam Exp $ .include "Makefile.common" -PKGREVISION= # empty +PKGREVISION= 1 SVR4_PKGNAME= csasl COMMENT= Simple Authentication and Security Layer @@ -12,9 +12,10 @@ GNU_MISSING_OVERRIDE= config/missing # Authentication mechanisms CONFIGURE_ARGS+= --enable-anon # ANONYMOUS -CONFIGURE_ARGS+= --enable-plain # PLAIN +CONFIGURE_ARGS+= --enable-checkapop # CHECKAPOP CONFIGURE_ARGS+= --enable-cram # CRAM-MD5 CONFIGURE_ARGS+= --enable-otp # OTP +CONFIGURE_ARGS+= --enable-plain # PLAIN CONFIGURE_ARGS+= --enable-digest # DIGEST-MD5 CONFIGURE_ARGS+= --with-rc4 diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common index f0447cad883..e5e4dae001f 100644 --- a/security/cyrus-sasl2/Makefile.common +++ b/security/cyrus-sasl2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2004/02/14 03:16:58 jlam Exp $ +# $NetBSD: Makefile.common,v 1.15 2004/02/14 07:45:36 jlam Exp $ # # This Makefile fragment should be included _below_ any SASL_PLUGIN # definition and _above_ any CONFIGURE_ARGS definitions. @@ -60,17 +60,18 @@ CONFIGURE_ARGS+= --with-plugindir=${_PLUGINDIR} # 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-scram # SCRAM-MD5 -CONFIGURE_ARGS+= --disable-sia # SIA +CONFIGURE_ARGS+= --disable-sql # SQL CONFIGURE_ARGS+= --disable-srp # SRP -CONFIGURE_ARGS+= --disable-krb4 # KERBEROS_V4 -CONFIGURE_ARGS+= --disable-gssapi # GSSAPI -CONFIGURE_ARGS+= --disable-otp # OTP +CONFIGURE_ARGS+= --disable-srp-setpass CONFIGURE_ARGS+= --without-pam # clean up a bit to help package maintainer produce patch files diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo index 0255c81ec53..fb96a194f43 100644 --- a/security/cyrus-sasl2/distinfo +++ b/security/cyrus-sasl2/distinfo @@ -1,14 +1,15 @@ -$NetBSD: distinfo,v 1.14 2004/02/14 03:16:58 jlam Exp $ +$NetBSD: distinfo,v 1.15 2004/02/14 07:45:36 jlam Exp $ SHA1 (cyrus-sasl-2.1.17.tar.gz) = c91e073274279ea59d8ca9514559140e23e3be57 Size (cyrus-sasl-2.1.17.tar.gz) = 1499725 bytes -SHA1 (patch-aa) = 8844b837470fa171a0d0c8030107f9f9e93dac1a +SHA1 (patch-aa) = 8ab6ded44e92c548a989f5e2d43102411e899504 +SHA1 (patch-ab) = 526138ba60cb33e1f03d6afe9499c1dd50208503 +SHA1 (patch-ac) = 8536fec6241a87e2a199b4aa8da788a2439f5507 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad SHA1 (patch-af) = a25efa52dd7c77cebb5432af1617877935a46918 -SHA1 (patch-ai) = ba5778bb8a373138d5bf7a895c4ff0f41d497c26 +SHA1 (patch-ai) = d1c88ee3724edc958565c7911daf24f8bf85f547 SHA1 (patch-ak) = aa71ba83a0d805f8595a64faf9afd76f8667bb6c SHA1 (patch-al) = 68576f62af7517dc09014d61427b58e76d361f8a SHA1 (patch-am) = f0bd15b4f55e5204936a25c558d4bd2b1d4816d5 SHA1 (patch-an) = 65a0ec173ea1f0114318ffb922cad4470e1cd7e9 SHA1 (patch-ao) = 2d26106ea33ac0625195214e18fc9e00deb9dc15 -SHA1 (patch-as) = 0371be5fdd00df1e741753d6cc9b9f71b582874c diff --git a/security/cyrus-sasl2/patches/patch-aa b/security/cyrus-sasl2/patches/patch-aa index 87366a5294d..78223eea821 100644 --- a/security/cyrus-sasl2/patches/patch-aa +++ b/security/cyrus-sasl2/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2004/02/14 03:16:59 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2004/02/14 07:45:36 jlam Exp $ --- configure.in.orig Fri Nov 28 10:37:10 2003 +++ configure.in @@ -16,3 +16,14 @@ $NetBSD: patch-aa,v 1.5 2004/02/14 03:16:59 jlam Exp $ if test "$ac_cv_can_build_shared" = no; then enable_shared=no enable_static=yes +@@ -477,10 +484,6 @@ fi + SASL_KERBEROS_V4_CHK + SASL_GSSAPI_CHK + SASL_PLAIN_CHK +- +-if test "$gssapi" != "no"; then +- AC_DEFINE(STATIC_GSSAPIV2,[],[Link GSSAPI Staticly]) +-fi + + dnl ANONYMOUS + AC_ARG_ENABLE(anon, [ --enable-anon enable ANONYMOUS authentication [yes] ], diff --git a/security/cyrus-sasl2/patches/patch-ab b/security/cyrus-sasl2/patches/patch-ab new file mode 100644 index 00000000000..6de3baff91a --- /dev/null +++ b/security/cyrus-sasl2/patches/patch-ab @@ -0,0 +1,16 @@ +$NetBSD: patch-ab,v 1.5 2004/02/14 07:45:36 jlam Exp $ + +--- aclocal.m4.orig Mon Dec 1 08:35:02 2003 ++++ aclocal.m4 +@@ -2905,7 +2905,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-sasl2/patches/patch-ac b/security/cyrus-sasl2/patches/patch-ac new file mode 100644 index 00000000000..6276a35db3b --- /dev/null +++ b/security/cyrus-sasl2/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.4 2004/02/14 07:45:36 jlam Exp $ + +--- cmulocal/sasl2.m4.orig Thu Nov 27 15:07:18 2003 ++++ cmulocal/sasl2.m4 +@@ -221,7 +221,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-sasl2/patches/patch-ai b/security/cyrus-sasl2/patches/patch-ai index 0fee5c82d9a..f7e5ffc3147 100644 --- a/security/cyrus-sasl2/patches/patch-ai +++ b/security/cyrus-sasl2/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.6 2004/02/14 03:16:59 jlam Exp $ +$NetBSD: patch-ai,v 1.7 2004/02/14 07:45:36 jlam Exp $ --- configure.orig Mon Dec 1 08:35:06 2003 +++ configure @@ -15,3 +15,34 @@ $NetBSD: patch-ai,v 1.6 2004/02/14 03:16:59 jlam Exp $ if test "$ac_cv_can_build_shared" = no; then enable_shared=no enable_static=yes +@@ -10731,7 +10737,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" +@@ -10865,14 +10878,6 @@ _ACEOF + echo "${ECHO_T}disabled" >&6 + fi + +- +-if test "$gssapi" != "no"; then +- +-cat >>confdefs.h <<\_ACEOF +-#define STATIC_GSSAPIV2 +-_ACEOF +- +-fi + + # Check whether --enable-anon or --disable-anon was given. + if test "${enable_anon+set}" = set; then |