From 418f424ad36255e65142fa49ceb0edfe455ad666 Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 13 Nov 2002 10:39:12 +0000 Subject: Fix support for kerberos 5, it now compiles and installs properly when SASL_USE_GSSAPI is defined to yes. Note untested as I don't have kerberos setup, it probably won't work until some patches are put in to fix plugins not working. --- security/cyrus-sasl2/Makefile | 5 +++-- security/cyrus-sasl2/PLIST.krb5 | 6 +++--- security/cyrus-sasl2/distinfo | 4 ++-- security/cyrus-sasl2/patches/patch-ag | 23 ++++++++++------------- 4 files changed, 18 insertions(+), 20 deletions(-) (limited to 'security/cyrus-sasl2') diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index c486915ad28..f55b887975e 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/10/27 23:32:36 seb Exp $ +# $NetBSD: Makefile,v 1.3 2002/11/13 10:39:12 chris Exp $ DISTNAME= cyrus-sasl-2.1.9 SVR4_PKGNAME= csasl @@ -53,7 +53,7 @@ CONFIGURE_ARGS+= --disable-srp # --- no SRP CONFIGURE_ARGS+= --disable-krb4 # --- no KERBEROS_V4 CONFIGURE_ARGS+= --enable-otp # OTP -.if defined(SASL_USE_GSSAPI) && ${SASL_USE_GSSAPI} == "YES" +.if !empty(SASL_USE_GSSAPI:M[yY][eE][sS]) CONFIGURE_ARGS+= --enable-gssapi=/usr # GSSAPI PLIST_SRC+= ${.CURDIR}/PLIST.krb5 .else @@ -81,6 +81,7 @@ post-extract: pre-configure: cd ${WRKSRC} && ${AUTOHEADER} cd ${WRKSRC} && ${AUTOMAKE} --gnu -i + cd ${WRKSRC}/saslauthd && ${AUTOMAKE} --gnu -i cd ${WRKSRC} && ${AUTOCONF} post-install: diff --git a/security/cyrus-sasl2/PLIST.krb5 b/security/cyrus-sasl2/PLIST.krb5 index 48d612b6813..f907fb37044 100644 --- a/security/cyrus-sasl2/PLIST.krb5 +++ b/security/cyrus-sasl2/PLIST.krb5 @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST.krb5,v 1.1.1.1 2002/10/27 15:08:59 chris Exp $ +@comment $NetBSD: PLIST.krb5,v 1.2 2002/11/13 10:39:12 chris Exp $ lib/sasl2/libgssapiv2.a lib/sasl2/libgssapiv2.la lib/sasl2/libgssapiv2.so -lib/sasl2/libgssapiv2.so.1 -lib/sasl2/libgssapiv2.so.1.18 +lib/sasl2/libgssapiv2.so.2 +lib/sasl2/libgssapiv2.so.2.9 diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo index a6613b9a3a2..e9ce916f68e 100644 --- a/security/cyrus-sasl2/distinfo +++ b/security/cyrus-sasl2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/10/27 15:08:59 chris Exp $ +$NetBSD: distinfo,v 1.2 2002/11/13 10:39:12 chris Exp $ SHA1 (cyrus-sasl-2.1.9.tar.gz) = 6e920454702796c8e6c8482b74ee19f8280bc80b Size (cyrus-sasl-2.1.9.tar.gz) = 1274451 bytes @@ -8,5 +8,5 @@ SHA1 (patch-ac) = 828b3129769ee3224af31dd44fe8c9d6205c4bfa SHA1 (patch-ad) = 1811fd87ccee6de8a151e8e684344e6f3a7a8830 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad SHA1 (patch-af) = 3af5330d1b3e242345ce9a7483ce6c73ed55d629 -SHA1 (patch-ag) = 43f1e4417d872d189716f7831f50b3c55d5cd7e3 +SHA1 (patch-ag) = a7b12c7151176529fa977041d301664b5696230d SHA1 (patch-ah) = 9f9121b63e28f9b07dfd9da4f7a786ff15097b58 diff --git a/security/cyrus-sasl2/patches/patch-ag b/security/cyrus-sasl2/patches/patch-ag index 8d39028e755..dee341c4c84 100644 --- a/security/cyrus-sasl2/patches/patch-ag +++ b/security/cyrus-sasl2/patches/patch-ag @@ -1,16 +1,13 @@ -$NetBSD: patch-ag,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $ +$NetBSD: patch-ag,v 1.2 2002/11/13 10:39:13 chris Exp $ ---- plugins/gssapi.c.orig Sun Oct 27 14:18:03 2002 -+++ plugins/gssapi.c Sun Oct 27 14:18:25 2002 -@@ -51,6 +51,11 @@ - #include - #endif +--- saslauthd/Makefile.am.orig Tue Sep 10 15:08:59 2002 ++++ saslauthd/Makefile.am Wed Nov 13 10:08:59 2002 +@@ -22,7 +22,7 @@ + EXTRA_DIST = saslauthd.8 saslauthd.mdoc config include \ + getnameinfo.c getaddrinfo.c saslauthd-unix.c \ + saslauthd-doors.c LDAP_SASLAUTHD +-INCLUDES = -I$(top_srcdir)/include ++INCLUDES = -I$(top_srcdir)/include -I/usr/include/krb5 + DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I.. -+/* Heimdal has this, but MIT Kerberos doesn't */ -+#ifndef GSS_C_NO_NAME -+#define GSS_C_NO_NAME ((gss_name_t) 0) -+#endif -+ - #ifdef WIN32 - # include -- cgit v1.2.3