From owner-freebsd-ports Sat Feb 2 13:40:13 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 469A437B405 for ; Sat, 2 Feb 2002 13:40:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g12Le1b47039; Sat, 2 Feb 2002 13:40:01 -0800 (PST) (envelope-from gnats) Received: from mail.westbend.net (ns1.westbend.net [216.47.253.3]) by hub.freebsd.org (Postfix) with ESMTP id 22A4037B400 for ; Sat, 2 Feb 2002 13:33:12 -0800 (PST) Received: (from root@localhost) by mail.westbend.net (8.11.6/8.11.6) id g12LXAJ71403; Sat, 2 Feb 2002 15:33:10 -0600 (CST) (envelope-from admin) Message-Id: <200202022133.g12LXAJ71403@mail.westbend.net> Date: Sat, 2 Feb 2002 15:33:10 -0600 (CST) From: "Scot W. Hetzel" Reply-To: "Scot W. Hetzel" To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/34561: security/cyrus-sasl: Another GSSAPI Fix 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: 34561 >Category: ports >Synopsis: security/cyrus-sasl: Another GSSAPI Fix >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: Sat Feb 02 13:40:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Scot W. Hetzel >Release: FreeBSD 4.5-RC i386 >Organization: West Bend Internet >Environment: System: FreeBSD wbiW009.westbend.net 4.5-RC FreeBSD 4.5-RC #0: Tue Jan 15 12:14:35 CST 2002 root@wbiW009.westbend.net:/usr/obj/usr/src/sys/GENERIC-SMP i386 >Description: The port fails to build in the utils & samples directory, if either KRB5_HOME / HEIMDAL_HOME are defined. Problem reported and patches supplied by Mark Hesselink. Also, put the placement of .include below USE_OPENSSL (i.e. put it back where pat orginal placed it, my screwup in PR 34541). >How-To-Repeat: >Fix: Changed files: Makefile New files: files/patch-sample::Makefile.am files/patch-util::Makefile.am Index: Makefile =================================================================== RCS file: /home/ncvs/ports/security/cyrus-sasl/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- Makefile 2 Feb 2002 08:46:32 -0000 1.38 +++ Makefile 2 Feb 2002 21:20:01 -0000 @@ -7,7 +7,7 @@ PORTNAME= cyrus-sasl PORTVERSION= 1.5.27 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \ http://prdownloads.sourceforge.net/cyrus-utils/ \ @@ -27,13 +27,6 @@ MAINTAINER= hetzels@westbend.net -.include -.if ${OSVERSION} < 450000 -FMT= /usr/bin/fmt -.else -FMT= /usr/bin/fmt -w 67 -.endif - USE_OPENSSL= YES INSTALLS_SHLIB= yes @@ -110,6 +103,13 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install PKGMESSAGE= ${WRKDIR}/pkg-message + +.include +.if ${OSVERSION} < 450000 +FMT= /usr/bin/fmt +.else +FMT= /usr/bin/fmt -w 67 +.endif pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.sasl Index: files/patch-sample::Makefile.am =================================================================== RCS file: files/patch-sample::Makefile.am diff -N files/patch-sample::Makefile.am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-sample::Makefile.am 2 Feb 2002 18:41:20 -0000 @@ -0,0 +1,12 @@ +--- sample/Makefile.am.orig Tue Jan 22 21:00:24 2002 ++++ sample/Makefile.am Tue Jan 22 21:01:02 2002 +@@ -54,7 +54,9 @@ + client_SOURCES = client.c common.c common.h + + server_LDADD = ../lib/libsasl.la $(LIB_SOCKET) ++server_LDFLAGS = $(GSSAPIBASE_LIBS) + client_LDADD = ../lib/libsasl.la $(LIB_SOCKET) ++client_LDFLAGS = $(GSSAPIBASE_LIBS) + + sample_client_LDADD = ../lib/libsasl.la $(LIB_SOCKET) + sample_server_LDADD = ../lib/libsasl.la $(LIB_SOCKET) Index: files/patch-utils::Makefile.am =================================================================== RCS file: files/patch-utils::Makefile.am diff -N files/patch-utils::Makefile.am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-utils::Makefile.am 2 Feb 2002 17:51:36 -0000 @@ -0,0 +1,16 @@ +--- utils//Makefile.am.orig Tue Jan 22 21:03:43 2002 ++++ utils//Makefile.am Tue Jan 22 21:02:49 2002 +@@ -45,10 +45,13 @@ + sbin_PROGRAMS = saslpasswd sasldblistusers + man_MANS = saslpasswd.8 sasldblistusers.8 + saslpasswd_LDADD = ../lib/libsasl.la ++saslpasswd_LDFLAGS = $(GSSAPIBASE_LIBS) + sasldblistusers_LDADD = $(SASL_DB_LIB) ++sasldblistusers_LDFLAGS = $(GSSAPIBASE_LIBS) + + noinst_PROGRAMS = dbconverter-1.5.9 + dbconverter_1_5_9_LDADD = ../lib/libsasl.la $(SASL_DB_LIB) ++dbconverter_1_5_9_LDFLAGS = $(GSSAPIBASE_LIBS) + + EXTRA_PROGRAMS = testsuite + testsuite_LDADD = ../lib/libsasl.la $(SASL_DB_LIB) $(LIB_SOCKET) >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message