From owner-freebsd-ports Mon May 20 21:20:22 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AF82137B411 for ; Mon, 20 May 2002 21:20:04 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4L4K4d59635; Mon, 20 May 2002 21:20:04 -0700 (PDT) (envelope-from gnats) Received: from mail.westbend.net (ns1.westbend.net [216.47.253.3]) by hub.freebsd.org (Postfix) with ESMTP id D220A37B401 for ; Mon, 20 May 2002 21:19:01 -0700 (PDT) Received: from wbiW009.westbend.net (localhost [127.0.0.1]) by wbiW009.westbend.net (8.12.3/8.12.2) with ESMTP id g4L3XBIc071322 for ; Mon, 20 May 2002 22:33:11 -0500 (CDT) (envelope-from admin@wbiW009.westbend.net) Received: (from root@localhost) by wbiW009.westbend.net (8.12.3/8.12.3/Submit) id g4L3XB3g071321; Mon, 20 May 2002 22:33:11 -0500 (CDT) Message-Id: <200205210333.g4L3XB3g071321@wbiW009.westbend.net> Date: Mon, 20 May 2002 22:33:11 -0500 (CDT) From: "Scot W. Hetzel" Reply-To: "Scot W. Hetzel" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/38363: security/cyrus-sasl: Fix sourceforge download problem Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 38363 >Category: ports >Synopsis: security/cyrus-sasl: Fix sourceforge download problem >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon May 20 21:20:04 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Scot W. Hetzel >Release: FreeBSD 4.5-STABLE i386 >Organization: West Bend Internet >Environment: System: FreeBSD wbiW009.westbend.net 4.5-STABLE FreeBSD 4.5-STABLE #7: Wed Apr 24 10:46:07 CDT 2002 root@wbiW009.westbend.net:/usr/obj/usr/src/sys/GENERIC-SMP i386 >Description: The cyrus-sasl configure script fails to detect db3, due to it is looking for libs db-3 and db. It also fails to build the Kerberos V4 authentication module due to -lcom_err is not added to the libs when checking for krb_mk_priv function. >How-To-Repeat: Try to build the port with db3 support. >Fix: Changed Files: pkg-deinstall pkg-install files/patch-ab Index: pkg-deinstall =================================================================== RCS file: /home/ncvs/ports/security/cyrus-sasl/pkg-deinstall,v retrieving revision 1.3 diff -u -r1.3 pkg-deinstall --- pkg-deinstall 17 Jan 2002 15:04:35 -0000 1.3 +++ pkg-deinstall 21 May 2002 03:26:57 -0000 @@ -24,6 +24,13 @@ fi } +delete_user() { + if pw usershow cyrus 2>/dev/null 1>&2; then + echo "To delete Cyrus user permanently, use 'pw userdel cyrus'" + fi + +} + # This should really be uninstalled by Sendmail sendmail_conf() { @@ -42,6 +49,7 @@ sendmail_conf ;; POST-DEINSTALL) + delete_user ;; esac Index: pkg-install =================================================================== RCS file: /home/ncvs/ports/security/cyrus-sasl/pkg-install,v retrieving revision 1.6 diff -u -r1.6 pkg-install --- pkg-install 17 Jan 2002 15:04:35 -0000 1.6 +++ pkg-install 21 May 2002 03:18:27 -0000 @@ -38,18 +38,13 @@ gid=`pw show group cyrus 2>/dev/null | cut -d: -f3` fi - if [ -x /sbin/nologin ]; then - shell=/sbin/nologin - else - shell=/nonexistent - fi if ! pw show user cyrus -q >/dev/null; then uid=60 while pw show user -u ${uid} -q >/dev/null; do uid=`expr ${uid} + 1` done - if ! pw add user cyrus -u ${uid} -g ${gid} -d "/nonexistent" \ - -c "the cyrus mail server" -s "${shell}" -p "*" \ + if ! pw add user cyrus -u ${uid} -g ${gid} -d "${PKG_PREFIX}/cyrus" \ + -c "the cyrus mail server" -s "/bin/csh" -p "*" \ ; then e=$? echo "*** Failed to add user \`cyrus'. Please add it manually." @@ -57,8 +52,8 @@ fi echo "*** Added user \`cyrus' (id ${uid})" else - if ! pw mod user cyrus -g ${gid} -d "/nonexistent" \ - -c "the cyrus mail server" -s "${shell}" -p "*" \ + if ! pw mod user cyrus -g ${gid} -d "${PKG_PREFIX}/cyrus" \ + -c "the cyrus mail server" -s "/bin/csh" -p "*" \ ; then e=$? echo "*** Failed to update user \`cyrus'." @@ -74,9 +69,13 @@ create_sasldb() { if [ ! -f ${SASLDB_NAME} ]; then echo "test" | ${PKG_PREFIX}/sbin/saslpasswd -p -c cyrus - ${PKG_PREFIX}/sbin/saslpasswd -d cyrus - chown cyrus:mail ${SASLDB_NAME} - chmod 640 ${SASLDB_NAME} + if [ `${PKG_PREFIX}/sbin/sasldblistusers | wc -l` -eq 0 ] ; then + echo "WARNING: Failed to create ${PKG_PREFIX}/etc/$SASLDB_NAME}" + else + ${PKG_PREFIX}/sbin/saslpasswd -d cyrus + chown cyrus:mail ${SASLDB_NAME} + chmod 640 ${SASLDB_NAME} + fi fi } Index: files/patch-ab =================================================================== RCS file: /home/ncvs/ports/security/cyrus-sasl/files/patch-ab,v retrieving revision 1.12 diff -u -r1.12 patch-ab --- files/patch-ab 20 Jan 2002 19:23:17 -0000 1.12 +++ files/patch-ab 21 May 2002 00:23:36 -0000 @@ -1,5 +1,5 @@ ---- configure.in.orig Thu Jan 17 19:21:51 2002 -+++ configure.in Thu Jan 17 19:47:46 2002 +--- configure.in.orig Mon May 20 19:02:49 2002 ++++ configure.in Mon May 20 19:21:53 2002 @@ -66,8 +66,9 @@ dnl check for -R, etc. switch CMU_GUESS_RUNPATH_SWITCH @@ -21,7 +21,37 @@ fi AM_CONDITIONAL(SAMPLE, test "$enable_sample" = yes) -@@ -235,6 +234,13 @@ +@@ -149,11 +148,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 +176,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 +232,13 @@ berkeley) SASL_DB_BACKEND="db_${dblib}.lo" AC_DEFINE(SASL_BERKELEYDB) @@ -35,3 +65,25 @@ ;; *) AC_MSG_WARN([Disabling SASL authentication database support]) +@@ -534,12 +544,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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message