From owner-freebsd-ports Tue Sep 19 21:40: 9 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 475DB37B42C for ; Tue, 19 Sep 2000 21:40:05 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id VAA48558; Tue, 19 Sep 2000 21:40:05 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from mail.westbend.net (ns1.westbend.net [209.224.254.131]) by hub.freebsd.org (Postfix) with ESMTP id 9711F37B423 for ; Tue, 19 Sep 2000 21:35:35 -0700 (PDT) Received: (from root@localhost) by spare.westbend.net (8.9.3/8.9.3) id WAA95772; Tue, 19 Sep 2000 22:36:49 -0500 (CDT) (envelope-from admin) Message-Id: <200009200336.WAA95772@spare.westbend.net> Date: Tue, 19 Sep 2000 22:36:49 -0500 (CDT) From: "Scot W. Hetzel" Reply-To: "Scot W. Hetzel" To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/21411: Cyrus-SASL DB3 Fix (Maintainer) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 21411 >Category: ports >Synopsis: Cyrus-SASL autodetected DB3, but fails to find includes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Sep 19 21:40:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Scot W. Hetzel >Release: FreeBSD 4.1-STABLE i386 >Organization: West Bend Internet >Environment: >Description: By default cyrus-sasl autodetects the databases (berkeley, gdbm, ndbm, none) that it is going to use. When DB3 is installed on a system, it fails to build db_berkley.c, due to it doesn't know where the DB3 include files are located. >How-To-Repeat: >Fix: Fixed the problem by defaulting Cyrus-SASL to use ndbm, and made DB3 an option. Changed Files: Makefile patches/patch-ab scripts/configure.sasl diff -ruN cyrus-sasl.orig/Makefile cyrus-sasl/Makefile --- cyrus-sasl.orig/Makefile Mon Sep 18 21:59:24 2000 +++ cyrus-sasl/Makefile Tue Sep 19 22:18:48 2000 @@ -43,12 +43,18 @@ --enable-static \ --enable-login \ --with-pwcheck=/var/pwcheck \ + --with-dblib=ndbm \ --with-rc4=openssl SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ PREFIX="${PREFIX}" \ TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" + MKDIR="${MKDIR}" \ + ENABLE_DB3="${ENABLE_DB3}" \ + ENABLE_MYSQL="${ENABLE_MYSQL}" \ + ENABLE_LDAP="${ENABLE_LDAP}" + +# ENABLE_* variables can be used by depending ports to enable options. # JavaSASL needs someone to look at to get it to build #JAVADIR= jdk1.1.8 diff -ruN cyrus-sasl.orig/patches/patch-ab cyrus-sasl/patches/patch-ab --- cyrus-sasl.orig/patches/patch-ab Sat Sep 16 14:01:30 2000 +++ cyrus-sasl/patches/patch-ab Tue Sep 19 22:01:21 2000 @@ -1,5 +1,5 @@ --- configure.in.orig Thu Jul 20 21:35:01 2000 -+++ configure.in Sat Sep 16 13:58:02 2000 ++++ configure.in Tue Sep 19 21:51:11 2000 @@ -66,8 +66,9 @@ dnl check for -R, etc. switch CMU_GUESS_RUNPATH_SWITCH @@ -12,7 +12,21 @@ AM_DISABLE_STATIC -@@ -310,6 +311,88 @@ +@@ -232,6 +233,13 @@ + SASL_DB_BACKEND="db_${dblib}.lo" + AC_DEFINE(SASL_BERKELEYDB) + SASL_DB_LIB="-ldb" ++ 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]) +@@ -310,6 +318,88 @@ fi AM_CONDITIONAL(PWCHECK, test "$with_pwcheck" != no) @@ -101,7 +115,7 @@ dnl CRAM-MD5 AC_ARG_ENABLE(cram, [ --enable-cram enable CRAM-MD5 authentication [yes] ], cram=$enableval, -@@ -434,11 +517,15 @@ +@@ -434,11 +524,15 @@ fi if test "$with_des" != no; then diff -ruN cyrus-sasl.orig/scripts/configure.sasl cyrus-sasl/scripts/configure.sasl --- cyrus-sasl.orig/scripts/configure.sasl Mon Sep 18 21:59:29 2000 +++ cyrus-sasl/scripts/configure.sasl Tue Sep 19 22:17:43 2000 @@ -6,13 +6,43 @@ fi if [ "${BATCH}" ]; then - exit + if [ "x${ENABLE_DB3}" = "xYES" ]; then + OPTIONS=\"DB3\" + fi + if [ "x${ENABLE_MYSQL}" = "xYES" ]; then + OPTIONS="${OPTIONS} \"MySQL\"" + fi + if [ "x${ENABLE_LDAP}" = "xYES" ]; then + OPTIONS="${OPTIONS} \"OpenLDAP\"" + fi + if [ "x${OPTIONS}" != "x" ]; then + set ${OPTIONS} + fi else - /usr/bin/dialog --title "Additional pwcheck methods" --clear \ + + if [ "x${ENABLE_DB3}" = "xYES" -o -f ${PREFIX}/lib/libdb3.so ] ; then + SET_DB3="ON" + else + SET_DB3="OFF" + fi + if [ "x${ENABLE_MYSQL}" = "xYES" -o -f ${PREFIX}/lib/libmysqlclient.so ] ; then + SET_MYSQL="ON" + else + SET_MYSQL="OFF" + fi + if [ "x${ENABLE_LDAP}" = "xYES" -o \ + -f ${PREFIX}/lib/libldap.so -a -f ${PREFIX}/lib/liblber.so ] ; then + SET_LDAP="ON" + else + SET_LDAP="OFF" + fi + + /usr/bin/dialog --title "Additional SASL options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 16 \ -MySQL "MySQL password Authentication" OFF \ -OpenLDAP "OpenLDAP password Authentication" OFF \ +DB3 "Berkeley DB package, revision 3" ${SET_DB3} \ +MySQL "MySQL password Authentication" ${SET_MYSQL} \ +OpenLDAP "OpenLDAP password Authentication" ${SET_LDAP} \ 2> /tmp/checklist.tmp.$$ retval=$? @@ -40,6 +70,13 @@ while [ "$1" ]; do case $1 in + \"DB3\") + #Can't use LIB_DEPENDS - no libdb3.so.1 in db3 port + #echo "LIB_DEPENDS+= db3.1:\${PORTSDIR}/databases/db3" + echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libdb3.1.so:\${PORTSDIR}/databases/db3" + echo "RUN_DEPENDS+= \${LOCALBASE}/lib/libdb3.1.so:\${PORTSDIR}/databases/db3" + echo "CONFIGURE_ARGS+=--with-dblib=berkeley" + ;; \"MySQL\") echo "LIB_DEPENDS+= mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}" >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message