head	1.15;
access;
symbols
	old_RELEASE_4_6_1:1.13
	old_RELEASE_4_6_0:1.13
	old_RELEASE_5_0_DP1:1.12
	old_RELEASE_4_5_0:1.12
	old_RELEASE_4_4_0:1.10
	old_RELEASE_4_3_0:1.10
	old_RELEASE_4_2_0:1.9
	old_RELEASE_4_1_1:1.8
	old_RELEASE_4_1_0:1.6
	old_RELEASE_3_5_0:1.6
	old_RELEASE_4_0_0:1.5;
locks; strict;
comment	@# @;


1.15
date	2002.08.08.14.04.43;	author ume;	state dead;
branches;
next	1.14;

1.14
date	2002.06.18.06.16.47;	author ijliao;	state Exp;
branches;
next	1.13;

1.13
date	2002.05.21.15.08.58;	author dwcjr;	state Exp;
branches;
next	1.12;

1.12
date	2002.01.20.19.23.17;	author dwcjr;	state Exp;
branches;
next	1.11;

1.11
date	2002.01.17.15.04.38;	author kevlo;	state Exp;
branches;
next	1.10;

1.10
date	2000.11.17.15.06.24;	author kevlo;	state Exp;
branches;
next	1.9;

1.9
date	2000.10.24.02.03.08;	author jeh;	state Exp;
branches;
next	1.8;

1.8
date	2000.09.19.02.59.28;	author ade;	state Exp;
branches;
next	1.7;

1.7
date	2000.08.12.19.14.50;	author nbm;	state Exp;
branches;
next	1.6;

1.6
date	2000.06.11.08.05.34;	author knu;	state Exp;
branches;
next	1.5;

1.5
date	2000.02.28.21.36.02;	author dirk;	state Exp;
branches;
next	1.4;

1.4
date	2000.02.14.04.12.22;	author kris;	state Exp;
branches;
next	1.3;

1.3
date	2000.01.24.05.22.17;	author steve;	state Exp;
branches;
next	1.2;

1.2
date	99.12.29.07.06.24;	author steve;	state Exp;
branches;
next	1.1;

1.1
date	99.12.27.01.52.22;	author steve;	state Exp;
branches;
next	;


desc
@@


1.15
log
@Add cyrus-sasl-2.1.6 after repo. copy.
@
text
@--- configure.in.orig	Wed May 22 20:49:46 2002
+++ configure.in	Thu May 23 16:52:07 2002
@@@@ -66,8 +66,12 @@@@
 dnl check for -R, etc. switch
 CMU_GUESS_RUNPATH_SWITCH
 dnl let's just link against local.  otherwise we never find anything useful.
-CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
-CMU_ADD_LIBPATH("/usr/local/lib")
+CPPFLAGS="-I${OPENSSLINC}/openssl ${CPPFLAGS}"
+if test "${OPENSSLINC}" != "/usr/include" ; then
+  CPPFLAGS="-I${OPENSSLINC} ${CPPFLAGS}"
+fi
+CMU_ADD_LIBPATH("${OPENSSLLIB}")
+CMU_ADD_LIBPATH("${LOCALBASE}/lib")
 
 AM_DISABLE_STATIC
 
@@@@ -122,8 +126,6 @@@@
 
   AC_SUBST(JAVA_INCLUDES)
   AC_MSG_RESULT(JAVA_INCLUDES)
-  JAVAC=`echo "$JAVAC" | sed 's,.*/,,'`
-  JAVAH=`echo "$JAVAH" | sed 's,.*/,,'`
 fi
 
 AM_CONDITIONAL(SAMPLE, test "$enable_sample" = yes)
@@@@ -149,11 +151,13 @@@@
 	AC_CHECK_HEADER(db.h,
 			AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3";
 			   dblib="berkeley",
+			AC_CHECK_LIB(db3, db_create, SASL_DB_LIB="-ldb3";
+			   dblib="berkeley",
 			AC_CHECK_LIB(db, db_create, SASL_DB_LIB="-ldb";
 			   dblib="berkeley",
 			AC_CHECK_LIB(db, db_open, SASL_DB_LIB="-ldb"; 
 			   dblib="berkeley",
-                        dblib="no"))),
+                        dblib="no")))),
 			dblib="no")
 	;;
   gdbm)
@@@@ -175,11 +179,13 @@@@
 	AC_CHECK_HEADER(db.h,
 			AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3";
 			   dblib="berkeley",
+			AC_CHECK_LIB(db3, db_create, SASL_DB_LIB="-ldb3";
+			   dblib="berkeley",
 			AC_CHECK_LIB(db, db_create, SASL_DB_LIB="-ldb";
 			   dblib="berkeley",
 			AC_CHECK_LIB(db, db_open, SASL_DB_LIB="-ldb"; 
 			   dblib="berkeley",
-                        dblib="no"))),
+                        dblib="no")))),
 			dblib="no")
 	if test "$dblib" = no; then
 	  dnl How about ndbm?
@@@@ -229,6 +235,13 @@@@
   berkeley)
     SASL_DB_BACKEND="db_${dblib}.lo"
     AC_DEFINE(SASL_BERKELEYDB)
+    for db3loc in ${prefix} /usr/local /usr
+    do
+      if test -d ${db3loc}/include/db3; then
+       CPPFLAGS="-I${db3loc}/include/db3 $CPPFLAGS"
+       break
+      fi
+    done
     ;;
   *)
     AC_MSG_WARN([Disabling SASL authentication database support])
@@@@ -534,12 +547,16 @@@@
   fi
 
   if test "$with_des" != no; then
+    case "$host_os" in
+	freebsd*)
+	    COM_ERR="-lcom_err"
+	    ;;
+    esac
     AC_CHECK_HEADER(krb.h,
-      AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="",
-	AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="-lcom_err",
-                     AC_WARN(No Kerberos V4 found); krb4=no, -ldes -lcom_err),
-        -ldes),
-      AC_WARN(No Kerberos V4 found); krb4=no)
+      AC_CHECK_LIB(krb, krb_mk_priv,:,
+                AC_WARN(No Kerberos V4 found); krb4=no,
+		-ldes ${COM_ERR}),
+      AC_WARN(No Kerberos V4 headers found); krb4=no)
   else
     AC_WARN(No DES library found for Kerberos V4 support)
     krb4=no
@


1.14
log
@fix configure on -current
update Sendmail.README for sendmail 8.10-8.12

PR:		38646
Submitted by:	maintainer
@
text
@@


1.13
log
@Fix for DB3 & KRB4

PR:		38363
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- configure.in.orig	Mon May 20 19:02:49 2002
+++ configure.in	Mon May 20 19:21:53 2002
@@@@ -66,8 +66,9 @@@@
d9 4
a12 1
+CPPFLAGS="-I${OPENSSLINC} -I${OPENSSLINC}/openssl ${CPPFLAGS}"
d18 1
a18 1
@@@@ -122,8 +123,6 @@@@
d27 1
a27 1
@@@@ -149,11 +148,13 @@@@
d42 1
a42 1
@@@@ -175,11 +176,13 @@@@
d57 1
a57 1
@@@@ -229,6 +232,13 @@@@
d71 1
a71 1
@@@@ -534,12 +544,16 @@@@
@


1.12
log
@Fix OpenLDAP v1 errors
Allow PAM aware pwcheck daemon
Add JavaSASL

PR:		34068
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- configure.in.orig	Thu Jan 17 19:21:51 2002
+++ configure.in	Thu Jan 17 19:47:46 2002
d24 31
a54 1
@@@@ -235,6 +234,13 @@@@
d68 22
@


1.11
log
@Update to version 1.5.27

PR: 33603
Submitted by: MAINTAINER
@
text
@d1 2
a2 2
--- configure.in.orig	Tue Nov 27 11:45:28 2001
+++ configure.in	Tue Nov 27 12:49:28 2001
d15 10
a24 1
@@@@ -235,6 +236,13 @@@@
@


1.10
log
@- Correct misspelling (PGK_PREFIX -> PKG_PREFIX) in pkg-install
- Add support for Heimdal Kerberos V port

PR: 22894
Submitted by: MAINTAINER
@
text
@d1 2
a2 2
--- configure.in.orig	Thu Jul 20 21:35:01 2000
+++ configure.in	Thu Nov 16 09:07:00 2000
d15 2
a16 1
@@@@ -232,6 +233,13 @@@@
a18 1
     SASL_DB_LIB="-ldb"
d22 2
a23 2
+	CPPFLAGS="-I${db3loc}/include/db3 $CPPFLAGS"
+	break
a28 109
@@@@ -310,6 +318,88 @@@@
 fi
 AM_CONDITIONAL(PWCHECK, test "$with_pwcheck" != no)
 
+dnl MySQL
+AC_ARG_WITH(mysql,  [ --with-mysql=PATH        enable authentication from MySQL database [no] ],
+  with_mysql=$withval,
+  with_mysql=no)
+
+if test -z "$with_mysql"; then
+  for mysqlloc in lib/mysql lib
+  do
+    if test -f ${prefix}/${mysqlloc}/libmysqlclient.a; then
+      with_mysql="${prefix}"
+      break
+    elif test -f /usr/local/${mysqlloc}/libmysqlclient.a; then
+      with_mysql="/usr/local"
+      break
+    elif test -f /usr/${mysqlloc}/libmysqlclient.a; then
+      with_mysql="/usr"
+      break
+    fi
+  done
+fi
+
+LIB_MYSQL=""
+case "$with_mysql" in
+    no) true;;
+    ""|yes) AC_CHECK_LIB(mysqlclient, mysql_select_db,
+		AC_DEFINE(HAVE_MYSQL)
+		LIB_MYSQL="-lmysqlclient",
+		with_mysql=no);;
+    *)	if test -d ${with_mysql}/include/mysql; then
+	  CPPFLAGS="$CPPFLAGS -I${with_mysql}/include/mysql"
+	else
+	  CPPFLAGS="$CPPFLAGS -I${with_mysql}/include"
+	fi
+	if test -d ${with_mysql}/lib/mysql; then
+	  LDFLAGS="$LDFLAGS -L${with_mysql}/lib/mysql"
+	fi
+	AC_DEFINE(HAVE_MYSQL)
+	LIB_MYSQL="-lmysqlclient";;
+esac
+AC_SUBST(LIB_MYSQL)
+
+dnl LDAP
+AC_ARG_WITH(ldap, [  --with-ldap=PATH         enable authentication from LDAP [no] ],
+  with_ldap=$withval,
+  with_ldap=no)
+
+if test -z "$with_ldap"; then
+  for ldaploc in lib/ldap lib
+  do
+    if test -f ${prefix}/${ldaploc}/libldap.a; then
+      with_ldap="${prefix}"
+      break
+    elif test -f /usr/local/${ldaploc}/libldap.a; then
+      with_ldap="/usr/local"
+      break
+    elif test -f /usr/${ldaploc}/libldap.a; then
+      with_ldap="/usr"
+      break
+    fi
+  done
+fi
+
+LIB_LDAP=""
+case "$with_ldap" in
+    no) true;;
+    ""|yes) AC_CHECK_LIB(ldap, ldap_open,
+                AC_DEFINE(HAVE_LDAP)
+		LIB_LDAP="-lldap -llber",
+                with_ldap=no);;
+    *)  if test -d ${with_ldap}/include/ldap; then
+          CPPFLAGS="${CPPFLAGS} -I${with_ldap}/include/ldap"
+        else
+          CPPFLAGS="${CPPFLAGS} -I${with_ldap}/include"
+        fi
+	if test -d ${with_ldap}/lib/ldap; then
+	  LDFLAGS="$LDFLAGS -L${with_ldap}/lib/ldap"
+	fi
+        AC_DEFINE(HAVE_LDAP)
+        LIB_LDAP="-lldap -llber";;
+esac
+AC_SUBST(LIB_LDAP)
+
 dnl CRAM-MD5
 AC_ARG_ENABLE(cram, [  --enable-cram           enable CRAM-MD5 authentication [yes] ],
   cram=$enableval,
@@@@ -434,11 +524,15 @@@@
   fi
 
   if test "$with_des" != no; then
+    case "$host_os" in
+	freebsd*)
+	    COM_ERR="-lcom_err"
+	    ;;
+    esac
     AC_CHECK_HEADER(krb.h,
-      AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="",
-	AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="-lcom_err",
-                     AC_WARN(No Kerberos V4 found); krb4=no, -ldes -lcom_err),
-        -ldes),
+      AC_CHECK_LIB(krb, krb_mk_priv,:,
+		   AC_WARN(No Kerberos V4 found); krb4=no,
+		   -ldes $COM_ERR),
       AC_WARN(No Kerberos V4 found); krb4=no)
   else
     AC_WARN(No DES library found for Kerberos V4 support)
@


1.9
log
@autodetected DB3, but fails to find includes

PR:		21411
Submitted by:	Scot W. Hetzel <hetzels@@westbend.net> MAINTAINER
@
text
@d2 1
a2 1
+++ configure.in	Tue Sep 19 21:51:11 2000
d10 1
a11 1
+CMU_ADD_LIBPATH("${OPENSSLLIB}")
@


1.8
log
@Cyrus-SASL 1.5.24 sources changed on Aug 15th
-- changed a hard coded value to a variable.

Kerberos IV detection fails due to double check on krb_mk_priv
(with/without com_err), used cached value from first check for krb_mk_priv.

Added addtional pwcheck methods (MySQL & LDAP Authentication).

PR:		21383
Submitted by:	maintainer
@
text
@d2 1
a2 1
+++ configure.in	Sat Sep 16 13:58:02 2000
d15 15
a29 1
@@@@ -310,6 +311,88 @@@@
d118 1
a118 1
@@@@ -434,11 +517,15 @@@@
@


1.7
log
@Update to 1.5.24

PR:		ports/20376
Submitted by:	Dmitry S. Sivachenko <dima@@Chg.RU>
Approved by:	Scot W. Hetzel <hetzels@@westbend.net> (maintainer)
@
text
@d1 2
a2 2
--- configure.in.orig	Thu Aug  3 14:34:08 2000
+++ configure.in	Thu Aug  3 14:39:24 2000
d15 109
@


1.6
log
@Update to 1.5.21.

Fix detection of kerberos4. (Now support for kerberos4 is always build
if /usr/lib/libkrb.a exists)

Make use of PLIST_SUB.

PR:		ports/19187
Submitted by:	Maintainer
@
text
@d1 2
a2 2
--- configure.in.orig	Mon May  8 12:51:13 2000
+++ configure.in	Sat Jun 10 20:23:18 2000
a14 21
@@@@ -413,8 +414,9 @@@@
 
   if test "$with_des" != no; then
     AC_CHECK_HEADER(krb.h,
-      AC_CHECK_LIB(krb, krb_mk_priv,:,
-                   AC_WARN(No Kerberos V4 found); krb4=no,
+      AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="",
+                   AC_CHECK_LIB(krb, krb_mk_err, COM_ERR="-lcom_err",
+			AC_WARN(No Kerberos V4 found); krb4=no,-ldes -lcom_err),
 		   -ldes),
       AC_WARN(No Kerberos V4 found); krb4=no)
   else
@@@@ -428,7 +430,7 @@@@
   AC_MSG_RESULT(enabled)
   SASL_MECHS="$SASL_MECHS libkerberos4.la"
   AC_DEFINE(HAVE_KRB)
-  SASL_KRB_LIB="-lkrb -ldes"
+  SASL_KRB_LIB="-lkrb -ldes $COM_ERR"
   AC_SUBST(SASL_KRB_LIB)
 else
   AC_MSG_RESULT(disabled)
@


1.5
log
@Fix build error by adding ${OPENSSLINC}/openssl to the include path.

Submitted by:	Jim Bloom <bloom@@acm.org>
@
text
@d1 3
a3 3
--- configure.in.orig	Fri Jan 14 00:00:16 2000
+++ configure.in	Mon Feb  7 15:14:50 2000
@@@@ -49,8 +49,9 @@@@
d13 1
a13 7
 if test "$enable_java" = yes; then
   AC_PATH_PROG(JAVAC, javac, no)
@@@@ -222,6 +223,7 @@@@
   AC_CHECK_LIB(crypt, crypt,
 	       LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes,
 	       cmu_have_crypt=no))
+AC_SUBST(LIB_CRYPT)
d15 1
a15 1
 CMU_SOCKETS
d17 19
@


1.4
log
@USE_OPENSSL

Submitted by:	Jim Bloom <bloom@@acm.org>
@
text
@d9 1
a9 1
+CPPFLAGS="-I${OPENSSLINC} ${CPPFLAGS}"
@


1.3
log
@Update to version 1.5.15.

PR:		16130
Submitted by:	maintainer
@
text
@d1 15
a15 3
--- configure.in.orig	Thu Jan 13 23:00:16 2000
+++ configure.in	Fri Jan 14 17:56:41 2000
@@@@ -222,6 +222,7 @@@@
@


1.2
log
@Use OpenSSL instaed of librc4 so this port's package can be exported.
Also incorporate Garrett Wollman's kerberos fixes.

PR:		15732
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- configure.in.orig	Thu Dec  2 14:10:30 1999
+++ configure.in	Sat Dec  4 17:59:13 1999
@@@@ -213,6 +213,7 @@@@
a9 25
 
@@@@ -503,15 +504,22 @@@@
 	    with_rc4=no)
 
   if test "$with_rc4" = no; then
+
+	  dnl if openssl has been compiled with the rsaref2 libraries,
+	  dnl we need to include the rsaref libraries in the crypto check
+	  LIB_RSAREF=""
+	  AC_CHECK_LIB(rsaref, RSAPublicEncrypt,
+		  LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes,
+		  cmu_have_rsaref=no)
+
 	  AC_CHECK_LIB(crypto, RC4_set_key,
 		  AC_CHECK_HEADER(openssl/rc4.h, [AC_DEFINE(WITH_SSL_RC4)
                                                   LIB_RC4="-lcrypto";
 						  with_rc4="openssl"],
 			          AC_WARN([SSL: Disabling rc4 support]); 
                                   with_rc4=no),
-		       AC_WARN([SSL2: Disabling rc4 support]); with_rc4=no)
+		       AC_WARN([SSL2: Disabling rc4 support]); with_rc4=no, $LIB_RSAREF)
   fi
-
   LIBS="$cmu_save_LIBS"
 fi
@


1.1
log
@Adding cyrus-sasl version 1.5.13.
An RFC 2222 SASL (Simple Authentication and Security Layer).

PR:		14619
Submitted by:	Scot W. Hetzel <hetzels@@westbend.net>
@
text
@d1 7
a7 9
--- lib/Makefile.in.orig	Thu Dec  2 14:11:14 1999
+++ lib/Makefile.in	Sun Dec 26 16:54:42 1999
@@@@ -75,6 +75,7 @@@@
 INSTALL = @@INSTALL@@
 INSTALL_PROGRAM = @@INSTALL_PROGRAM@@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @@INSTALL_DATA@@
+INSTALL_LIB = @@INSTALL_LIB@@
 INSTALL_SCRIPT = @@INSTALL_SCRIPT@@
 transform = @@program_transform_name@@
d9 26
a34 10
@@@@ -190,8 +191,8 @@@@
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
 	@@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
+	    echo "$(LIBTOOL)  --mode=install $(INSTALL_LIB) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_LIB) $$p $(DESTDIR)$(libdir)/$$p; \
 	  else :; fi; \
 	done
@

