From owner-freebsd-ports Mon Dec 20 22: 0:12 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id D9B82153DE for ; Mon, 20 Dec 1999 22:00:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id WAA10824; Mon, 20 Dec 1999 22:00:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from angmar.mel.vet.com.au (angmar.mel.cybec.com.au [203.103.154.62]) by hub.freebsd.org (Postfix) with ESMTP id D66FE15157 for ; Mon, 20 Dec 1999 21:52:19 -0800 (PST) (envelope-from lodea@angmar.mel.vet.com.au) Received: (from lodea@localhost) by angmar.mel.vet.com.au (8.9.3/8.9.3) id SAA16601; Mon, 20 Dec 1999 18:38:47 +1100 (EST) Message-Id: <199912200738.SAA16601@angmar.mel.vet.com.au> Date: Mon, 20 Dec 1999 18:38:47 +1100 (EST) From: lodea@angmar.mel.vet.com.au Reply-To: lodea@angmar.mel.vet.com.au To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/15599: OpenLDAP 1.2.8 released Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 15599 >Category: ports >Synopsis: OpenLDAP 1.2.8 released >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: Mon Dec 20 22:00:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: Lachlan O'Dea >Release: FreeBSD 3.3-STABLE i386 >Organization: Computer Associates >Environment: >Description: Update the OpenLDAP port from 1.2.7 to 1.2.8. I've removed both the patch files. patch-ab was the right thing, but it's better to use CONFIGURE_ARGS. I asked OpenLDAP about patch-aa (a hack for Netscape 4.5). They said they hadn't included it because it was Netscape that was doing the wrong thing and the patch might break correct clients. So I don't think this belongs in the port, unless it can be made optional somehow. If you want this patch included, I think the best solution would be to get the OpenLDAP guys to make it an option to configure. Someone seems to have been messing with this port: all of the conf files have been added to PLIST. I don't know about you, but I don't like pkg_delete unlinking all of my carefully constructed configuration files. >How-To-Repeat: >Fix: diff -ruN openldap.orig/Makefile openldap/Makefile --- openldap.orig/Makefile Tue Oct 26 11:54:21 1999 +++ openldap/Makefile Mon Dec 20 17:41:34 1999 @@ -1,12 +1,12 @@ # New ports collection makefile for: openldap -# Version required: 1.2.7 +# Version required: 1.2.8 # Date created: 20 Sep 1998 # Whom: Lachlan O'Dea # # $FreeBSD: ports/net/openldap/Makefile,v 1.9 1999/10/26 01:54:21 mharo Exp $ # -DISTNAME= openldap-1.2.7 +DISTNAME= openldap-1.2.8 CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \ ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \ @@ -21,8 +21,8 @@ MAINTAINER= ulmo@earthling.net -WRKSRC= ${WRKDIR}/ldap GNU_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX} --localstatedir=/var/run .include .include "${FILESDIR}/manpages" diff -ruN openldap.orig/files/md5 openldap/files/md5 --- openldap.orig/files/md5 Tue Oct 26 11:54:22 1999 +++ openldap/files/md5 Mon Dec 20 17:21:02 1999 @@ -1 +1 @@ -MD5 (openldap-1.2.7.tgz) = be5866cfa50fdf083f5230b3837181e8 +MD5 (openldap-1.2.8.tgz) = aa2b56cb5947721757aecab2e85b801d diff -ruN openldap.orig/patches/patch-aa openldap/patches/patch-aa --- openldap.orig/patches/patch-aa Wed Oct 27 18:27:11 1999 +++ openldap/patches/patch-aa Thu Jan 1 10:00:00 1970 @@ -1,20 +0,0 @@ ---- servers/slapd/add.c.orig Fri Jan 29 00:11:49 1999 -+++ servers/slapd/add.c Sat Oct 23 13:31:43 1999 -@@ -180,6 +180,9 @@ - bv.bv_len = strlen( bv.bv_val ); - } - attr_merge( e, "creatorsname", bvals ); -+ /* Netscape Communicator 4.5 seems to expect modification information -+ to be present within newly created items. */ -+ attr_merge( e, "modifiersname", bvals ); - - ldap_pvt_thread_mutex_lock( ¤ttime_mutex ); - #ifndef LDAP_LOCALTIME -@@ -194,4 +197,7 @@ - bv.bv_val = buf; - bv.bv_len = strlen( bv.bv_val ); - attr_merge( e, "createtimestamp", bvals ); -+ /* Netscape Communicator 4.5 seems to expect modification information -+ to be present within newly created items. */ -+ attr_merge( e, "modifytimestamp", bvals ); - } diff -ruN openldap.orig/patches/patch-ab openldap/patches/patch-ab --- openldap.orig/patches/patch-ab Mon Nov 1 12:35:16 1999 +++ openldap/patches/patch-ab Thu Jan 1 10:00:00 1970 @@ -1,11 +0,0 @@ ---- configure.orig Mon Nov 1 09:24:55 1999 -+++ configure Mon Nov 1 09:25:14 1999 -@@ -112,7 +112,7 @@ - datadir='${prefix}/share' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' --localstatedir='${prefix}/var' -+localstatedir='/var/run' - libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' diff -ruN openldap.orig/pkg/PLIST openldap/pkg/PLIST --- openldap.orig/pkg/PLIST Mon Nov 1 12:03:44 1999 +++ openldap/pkg/PLIST Mon Dec 20 17:59:17 1999 @@ -5,19 +5,12 @@ bin/ldappasswd bin/ldapsearch bin/ud -etc/openldap/ldap.conf etc/openldap/ldap.conf.default -etc/openldap/ldapfilter.conf etc/openldap/ldapfilter.conf.default -etc/openldap/ldapsearchprefs.conf etc/openldap/ldapsearchprefs.conf.default -etc/openldap/ldaptemplates.conf etc/openldap/ldaptemplates.conf.default -etc/openldap/slapd.at.conf etc/openldap/slapd.at.conf.default -etc/openldap/slapd.conf etc/openldap/slapd.conf.default -etc/openldap/slapd.oc.conf etc/openldap/slapd.oc.conf.default include/disptmpl.h include/lber.h @@ -49,5 +42,4 @@ share/openldap/go500gw.help share/openldap/ldapfriendly share/openldap/rcpt500.help -@dirrm etc/openldap @dirrm share/openldap >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message