From admin@mail.westbend.net  Thu Nov 16 07:24:15 2000
Return-Path: <admin@mail.westbend.net>
Received: from mail.westbend.net (ns1.westbend.net [209.224.254.131])
	by hub.freebsd.org (Postfix) with ESMTP id 9DD8A37B4C5
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 16 Nov 2000 07:24:14 -0800 (PST)
Received: (from admin@localhost)
	by mail.westbend.net (8.9.3/8.9.3) id JAA62715;
	Thu, 16 Nov 2000 09:24:14 -0600 (CST)
	(envelope-from admin)
Message-Id: <200011161524.JAA62715@mail.westbend.net>
Date: Thu, 16 Nov 2000 09:24:14 -0600 (CST)
From: "Scot W. Hetzel" <hetzels@westbend.net>
Sender: admin@mail.westbend.net
Reply-To: "Scot W. Hetzel" <hetzels@westbend.net>
To: FreeBSD-gnats-submit@freebsd.org
Subject: security/cyrus-sasl - incorrect install of sasldb [MAINTAINER]
X-Send-Pr-Version: 3.2

>Number:         22894
>Category:       ports
>Synopsis:       cyrus-sasl installs sasldb incorrectly [MAINTAINER]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 16 07:30:01 PST 2000
>Closed-Date:    Fri Nov 17 07:06:29 PST 2000
>Last-Modified:  Fri Nov 17 07:06:43 PST 2000
>Originator:     Scot W. Hetzel
>Release:        FreeBSD 4.2-STABLE i386
>Organization:
West Bend Internet
>Environment:


>Description:

	Cyrus-SASL creates the sasldb.db file in /etc instead of /usr/local/etc.

>How-To-Repeat:


>Fix:

	pkg-install - Correct misspelling (PGK_PREFIX -> PKG_PREFIX)	
	Makefile, patch-ab - add support for Heimdal Kerberos V port.

diff -ruN cyrus-sasl.orig/Makefile cyrus-sasl/Makefile
--- cyrus-sasl.orig/Makefile	Wed Nov  1 18:16:45 2000
+++ cyrus-sasl/Makefile	Thu Nov 16 09:04:23 2000
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-sasl
 PORTVERSION=	1.5.24
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		${MASTER_SITE_LOCAL} \
@@ -72,6 +72,8 @@
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 CONFIGURE_ARGS+=	--enable-gssapi=${KRB5_HOME}
+.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME})
+CONFIGURE_ARGS+=	--enable-gssapi=${HEIMDAL_HOME}
 .else
 CONFIGURE_ARGS+=	--disable-gssapi
 GSSAPI=	"@comment "
diff -ruN cyrus-sasl.orig/files/patch-ab cyrus-sasl/files/patch-ab
--- cyrus-sasl.orig/files/patch-ab	Mon Oct 23 21:03:08 2000
+++ cyrus-sasl/files/patch-ab	Thu Nov 16 09:07:30 2000
@@ -1,5 +1,5 @@
 --- configure.in.orig	Thu Jul 20 21:35:01 2000
-+++ configure.in	Tue Sep 19 21:51:11 2000
++++ configure.in	Thu Nov 16 09:07:00 2000
 @@ -66,8 +66,9 @@
  dnl check for -R, etc. switch
  CMU_GUESS_RUNPATH_SWITCH
@@ -7,8 +7,8 @@
 -CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
 -CMU_ADD_LIBPATH("/usr/local/lib")
 +CPPFLAGS="-I${OPENSSLINC} -I${OPENSSLINC}/openssl ${CPPFLAGS}"
-+CMU_ADD_LIBPATH("${LOCALBASE}/lib")
 +CMU_ADD_LIBPATH("${OPENSSLLIB}")
++CMU_ADD_LIBPATH("${LOCALBASE}/lib")
  
  AM_DISABLE_STATIC
  
diff -ruN cyrus-sasl.orig/pkg-install cyrus-sasl/pkg-install
--- cyrus-sasl.orig/pkg-install	Wed Nov  1 05:59:16 2000
+++ cyrus-sasl/pkg-install	Wed Nov 15 11:29:45 2000
@@ -71,9 +71,9 @@
 
 create_sasldb() {
 	if [ ! -f ${PGK_PREFIX}/etc/sasldb.db ]; then
-		touch ${PGK_PREFIX}/etc/sasldb.db
-		chown cyrus:mail ${PGK_PREFIX}/etc/sasldb.db
-		chmod 640 ${PGK_PREFIX}/etc/sasldb.db
+		touch ${PKG_PREFIX}/etc/sasldb.db
+		chown cyrus:mail ${PKG_PREFIX}/etc/sasldb.db
+		chmod 640 ${PKG_PREFIX}/etc/sasldb.db
 	fi
 }
 

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: kevlo 
State-Changed-When: Fri Nov 17 07:06:29 PST 2000 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=22894 
>Unformatted:
