diff options
-rw-r--r-- | security/cyrus-sasl2/Makefile | 5 | ||||
-rw-r--r-- | security/cyrus-sasl2/distinfo | 4 | ||||
-rw-r--r-- | security/cyrus-sasl2/patches/patch-ai | 39 |
3 files changed, 38 insertions, 10 deletions
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index cf7f7886604..f6ab5c6f186 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2003/11/12 03:39:42 jschauma Exp $ +# $NetBSD: Makefile,v 1.16 2004/01/05 12:10:29 markd Exp $ .include "Makefile.common" @@ -35,9 +35,10 @@ CONFIGURE_ARGS+= --with-pam=${BUILDLINK_PREFIX.pam} .if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]) CONFIGURE_ARGS+= --enable-gssapi=/usr # GSSAPI PLIST_SRC+= ${PKGDIR}/PLIST.krb5 -. if exists(/usr/include/krb5/krb5-types.h) +. if exists(/usr/include/krb5/krb5.h) CPPFLAGS+= -I/usr/include/krb5 . endif +LIBS+=-lcrypto .endif PLIST_SRC+= ${PKGDIR}/PLIST.plugins diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo index 4279a4e24f1..3efb7f7c75a 100644 --- a/security/cyrus-sasl2/distinfo +++ b/security/cyrus-sasl2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2003/11/21 13:41:58 jlam Exp $ +$NetBSD: distinfo,v 1.11 2004/01/05 12:10:29 markd Exp $ SHA1 (cyrus-sasl-2.1.15.tar.gz) = 747101ffec482ca566f00a9d34124ec8e79f6589 Size (cyrus-sasl-2.1.15.tar.gz) = 1390131 bytes @@ -9,7 +9,7 @@ SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad SHA1 (patch-af) = eed25b6db859720bb35f4ef5623b85a3a95e359e SHA1 (patch-ag) = 24455c9641078b36a270b50f844cfb4a89ea7925 SHA1 (patch-ah) = 50ff4e8ec0f4232bd8c2121b105d4818b978b950 -SHA1 (patch-ai) = 687bc372ef32af473668b63d465dc59a73700181 +SHA1 (patch-ai) = 743dddbd54ac19266fd66ef0c5a3e87ba7437ee9 SHA1 (patch-aj) = e841641a92dacd0f38fc0f86391b54b394e5a54c SHA1 (patch-ak) = 20c163758267d90d93f6d1ec0fce78fa4a12f670 SHA1 (patch-as) = c8d35da93afe8be5e535b88681b23b169e813c02 diff --git a/security/cyrus-sasl2/patches/patch-ai b/security/cyrus-sasl2/patches/patch-ai index b4f38f4e5f7..8cec969e000 100644 --- a/security/cyrus-sasl2/patches/patch-ai +++ b/security/cyrus-sasl2/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.4 2003/08/16 09:06:42 recht Exp $ +$NetBSD: patch-ai,v 1.5 2004/01/05 12:10:29 markd Exp $ ---- configure.orig 2003-07-15 17:42:27.000000000 +0200 -+++ configure 2003-07-26 12:21:14.000000000 +0200 -@@ -675,6 +675,7 @@ +--- configure.orig 2003-07-16 03:42:27.000000000 +1200 ++++ configure +@@ -675,6 +675,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- echo "$ac_t""$host" 1>&6 @@ -10,7 +10,7 @@ $NetBSD: patch-ai,v 1.4 2003/08/16 09:06:42 recht Exp $ # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: -@@ -842,29 +843,29 @@ +@@ -842,29 +843,29 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` @@ -50,7 +50,7 @@ $NetBSD: patch-ai,v 1.4 2003/08/16 09:06:42 recht Exp $ echo "$ac_t""missing" 1>&6 fi -@@ -1951,6 +1952,13 @@ +@@ -1951,6 +1952,13 @@ fi target=$save_target @@ -64,3 +64,30 @@ $NetBSD: patch-ai,v 1.4 2003/08/16 09:06:42 recht Exp $ if test "$ac_cv_can_build_shared" = no; then enable_shared=no enable_static=yes +@@ -5696,7 +5704,7 @@ else + fi + + SASL_MECHS="$SASL_MECHS libgssapiv2.la" +- SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o" ++# SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o" + + cmu_save_LIBS="$LIBS" + LIBS="$LIBS $GSSAPIBASE_LIBS" +@@ -5799,12 +5807,12 @@ EOF + fi + + +-if test "$gssapi" != "no"; then +- cat >> confdefs.h <<\EOF +-#define STATIC_GSSAPIV2 1 +-EOF ++#if test "$gssapi" != "no"; then ++# cat >> confdefs.h <<\EOF ++##define STATIC_GSSAPIV2 1 ++#EOF + +-fi ++#fi + + # Check whether --enable-anon or --disable-anon was given. + if test "${enable_anon+set}" = set; then |