fix configure on -current

update Sendmail.README for sendmail 8.10-8.12

PR:		38646
Submitted by:	maintainer

4 files changed, 52 insertions, 26 deletions

diff --git a/security/cyrus-sasl/files/Sendmail.README b/security/cyrus-sasl/files/Sendmail.README
index 0b9b63fe1aee..a4da7278f400 100644
--- a/security/cyrus-sasl/files/Sendmail.README
+++ b/security/cyrus-sasl/files/Sendmail.README
@@ -1,12 +1,15 @@
-How to enable SMTP AUTH with FreeBSD default Sendmail 8.11
+How to enable SMTP AUTH with FreeBSD default Sendmail
 
 1) Add the following to  /etc/make.conf:
 
     # Add SMTP AUTH support to Sendmail
-    SENDMAIL_CFLAGS+=	-I/usr/local/include/sasl -DSASL -D_FFR_UNSAFE_SASL
+    SENDMAIL_CFLAGS+=	-I/usr/local/include/sasl -DSASL
     SENDMAIL_LDFLAGS+=	-L/usr/local/lib
     SENDMAIL_LDADD+=	-lsasl
 
+    NOTE: Sendmail 8.10 - 8.11 needS -D_FFR_UNSAFE_SASL added
+          to SENDMAIL_CFLAGS, if you need the GroupReadableSASLFile option
+
 2) Rebuild FreeBSD (make buildworld, ...)
 
 3) Create /usr/local/lib/sasl/Sendmail.conf with the following.
@@ -15,10 +18,17 @@ How to enable SMTP AUTH with FreeBSD default Sendmail 8.11
 
 4) Add the following to your sendmail.mc file:
 
+   dnl The group needs to be mail in order to read the sasldb file
+   define(`confRUN_AS_USER',`root:mail')dnl
+
    TRUST_AUTH_MECH(`DIGEST-MD5 CRAM-MD5')dnl
    define(`confAUTH_MECHANISMS',`DIGEST-MD5 CRAM-MD5')dnl
+
+   dnl Use the following for Sendmail 8.12
    define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLDBFile')dnl
-   define(`confRUN_AS_USER',`root:mail')dnl
+
+   dnl Use the following for Sendmail 8.10 - 8.11
+   define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLFile')dnl
 
  ----
 
@@ -36,6 +46,6 @@ How to enable SMTP AUTH with FreeBSD default Sendmail 8.11
    Communicator will use SASL Authentication when sendmail is compiled with
    SASL.
 
-   The DONT_BLAME_SENDMAIL option GroupReadableSASLFile is needed when you
+   The DONT_BLAME_SENDMAIL option GroupReadableSASL[DB]File is needed when you
    are using cyrus-imapd and sendmail on the same server that requires access
    to the sasldb database.
diff --git a/security/cyrus-sasl/files/patch-ab b/security/cyrus-sasl/files/patch-ab
index 323190966e63..4b1a2c357e00 100644
--- a/security/cyrus-sasl/files/patch-ab
+++ b/security/cyrus-sasl/files/patch-ab
@@ -1,18 +1,21 @@
---- configure.in.orig	Mon May 20 19:02:49 2002
-+++ configure.in	Mon May 20 19:21:53 2002
-@@ -66,8 +66,9 @@
+--- 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} -I${OPENSSLINC}/openssl ${CPPFLAGS}"
++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 +123,6 @@
+@@ -122,8 +126,6 @@
  
    AC_SUBST(JAVA_INCLUDES)
    AC_MSG_RESULT(JAVA_INCLUDES)
@@ -21,7 +24,7 @@
  fi
  
  AM_CONDITIONAL(SAMPLE, test "$enable_sample" = yes)
-@@ -149,11 +148,13 @@
+@@ -149,11 +151,13 @@
  	AC_CHECK_HEADER(db.h,
  			AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3";
  			   dblib="berkeley",
@@ -36,7 +39,7 @@
  			dblib="no")
  	;;
    gdbm)
-@@ -175,11 +176,13 @@
+@@ -175,11 +179,13 @@
  	AC_CHECK_HEADER(db.h,
  			AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3";
  			   dblib="berkeley",
@@ -51,7 +54,7 @@
  			dblib="no")
  	if test "$dblib" = no; then
  	  dnl How about ndbm?
-@@ -229,6 +232,13 @@
+@@ -229,6 +235,13 @@
    berkeley)
      SASL_DB_BACKEND="db_${dblib}.lo"
      AC_DEFINE(SASL_BERKELEYDB)
@@ -65,7 +68,7 @@
      ;;
    *)
      AC_MSG_WARN([Disabling SASL authentication database support])
-@@ -534,12 +544,16 @@
+@@ -534,12 +547,16 @@
    fi
  
    if test "$with_des" != no; then
diff --git a/security/cyrus-sasl2/files/Sendmail.README b/security/cyrus-sasl2/files/Sendmail.README
index 0b9b63fe1aee..a4da7278f400 100644
--- a/security/cyrus-sasl2/files/Sendmail.README
+++ b/security/cyrus-sasl2/files/Sendmail.README
@@ -1,12 +1,15 @@
-How to enable SMTP AUTH with FreeBSD default Sendmail 8.11
+How to enable SMTP AUTH with FreeBSD default Sendmail
 
 1) Add the following to  /etc/make.conf:
 
     # Add SMTP AUTH support to Sendmail
-    SENDMAIL_CFLAGS+=	-I/usr/local/include/sasl -DSASL -D_FFR_UNSAFE_SASL
+    SENDMAIL_CFLAGS+=	-I/usr/local/include/sasl -DSASL
     SENDMAIL_LDFLAGS+=	-L/usr/local/lib
     SENDMAIL_LDADD+=	-lsasl
 
+    NOTE: Sendmail 8.10 - 8.11 needS -D_FFR_UNSAFE_SASL added
+          to SENDMAIL_CFLAGS, if you need the GroupReadableSASLFile option
+
 2) Rebuild FreeBSD (make buildworld, ...)
 
 3) Create /usr/local/lib/sasl/Sendmail.conf with the following.
@@ -15,10 +18,17 @@ How to enable SMTP AUTH with FreeBSD default Sendmail 8.11
 
 4) Add the following to your sendmail.mc file:
 
+   dnl The group needs to be mail in order to read the sasldb file
+   define(`confRUN_AS_USER',`root:mail')dnl
+
    TRUST_AUTH_MECH(`DIGEST-MD5 CRAM-MD5')dnl
    define(`confAUTH_MECHANISMS',`DIGEST-MD5 CRAM-MD5')dnl
+
+   dnl Use the following for Sendmail 8.12
    define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLDBFile')dnl
-   define(`confRUN_AS_USER',`root:mail')dnl
+
+   dnl Use the following for Sendmail 8.10 - 8.11
+   define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLFile')dnl
 
  ----
 
@@ -36,6 +46,6 @@ How to enable SMTP AUTH with FreeBSD default Sendmail 8.11
    Communicator will use SASL Authentication when sendmail is compiled with
    SASL.
 
-   The DONT_BLAME_SENDMAIL option GroupReadableSASLFile is needed when you
+   The DONT_BLAME_SENDMAIL option GroupReadableSASL[DB]File is needed when you
    are using cyrus-imapd and sendmail on the same server that requires access
    to the sasldb database.
diff --git a/security/cyrus-sasl2/files/patch-ab b/security/cyrus-sasl2/files/patch-ab
index 323190966e63..4b1a2c357e00 100644
--- a/security/cyrus-sasl2/files/patch-ab
+++ b/security/cyrus-sasl2/files/patch-ab
@@ -1,18 +1,21 @@
---- configure.in.orig	Mon May 20 19:02:49 2002
-+++ configure.in	Mon May 20 19:21:53 2002
-@@ -66,8 +66,9 @@
+--- 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} -I${OPENSSLINC}/openssl ${CPPFLAGS}"
++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 +123,6 @@
+@@ -122,8 +126,6 @@
  
    AC_SUBST(JAVA_INCLUDES)
    AC_MSG_RESULT(JAVA_INCLUDES)
@@ -21,7 +24,7 @@
  fi
  
  AM_CONDITIONAL(SAMPLE, test "$enable_sample" = yes)
-@@ -149,11 +148,13 @@
+@@ -149,11 +151,13 @@
  	AC_CHECK_HEADER(db.h,
  			AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3";
  			   dblib="berkeley",
@@ -36,7 +39,7 @@
  			dblib="no")
  	;;
    gdbm)
-@@ -175,11 +176,13 @@
+@@ -175,11 +179,13 @@
  	AC_CHECK_HEADER(db.h,
  			AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3";
  			   dblib="berkeley",
@@ -51,7 +54,7 @@
  			dblib="no")
  	if test "$dblib" = no; then
  	  dnl How about ndbm?
-@@ -229,6 +232,13 @@
+@@ -229,6 +235,13 @@
    berkeley)
      SASL_DB_BACKEND="db_${dblib}.lo"
      AC_DEFINE(SASL_BERKELEYDB)
@@ -65,7 +68,7 @@
      ;;
    *)
      AC_MSG_WARN([Disabling SASL authentication database support])
-@@ -534,12 +544,16 @@
+@@ -534,12 +547,16 @@
    fi
  
    if test "$with_des" != no; then