Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Dec 1998 17:25:08 +1100 (EST)
From:      lodea@vet.com.au
To:        FreeBSD-gnats-submit@FreeBSD.ORG
Subject:   ports/9241: Update of OpenLDAP to 1.1.1
Message-ID:  <199812300625.RAA15523@angmar.mel.cybec.com.au>

next in thread | raw e-mail | index | archive | help

>Number:         9241
>Category:       ports
>Synopsis:       Update OpenLDAP port to 1.1.1
>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 Dec 29 22:30:00 PST 1998
>Last-Modified:
>Originator:     Lachlan O'Dea
>Organization:
Cybec
>Release:        FreeBSD 2.2.7-STABLE i386
>Environment:

>Description:
OpenLDAP version 1.1.1 has been released.
<http://www.OpenLDAP.org/software/>;

>How-To-Repeat:

>Fix:
This port no longer requires patches. The files patch-aa, patch-ab and
patch-ac should be deleted.

diff -ruN openldap/Makefile openldap.new/Makefile
--- openldap/Makefile	Tue Oct 27 00:02:26 1998
+++ openldap.new/Makefile	Wed Dec 30 15:28:14 1998
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    openldap
-# Version required:     1.0.2
+# Version required:     1.1.1
 # Date created:         20 Sep 1998
 # Whom:                 Lachlan O'Dea
 #
 # $Id: Makefile,v 1.2 1998/10/26 13:02:26 vanilla Exp $
 #
 
-DISTNAME=       openldap-1.0.2
+DISTNAME=       openldap-1.1.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
 EXTRACT_SUFX=	.tgz
@@ -14,15 +14,12 @@
 MAINTAINER=     ulmo@earthling.net
 
 WRKSRC=		${WRKDIR}/ldap
-MANCOMPRESSED=	yes
+GNU_CONFIGURE=	yes
 
 .include "files/manpages"
 
-MAKE_ENV=	LDAP_PREFIX=${PREFIX} \
-		EXTRACFLAGS="${CFLAGS}"
-
-pre-patch:
-	${CP} ${WRKSRC}/Make-common.dist ${WRKSRC}/Make-common
+pre-build:
+	cd ${WRKSRC} ; make depend
 
 post-install:
 	strip ${PREFIX}/bin/ldapadd ${PREFIX}/bin/ldapdelete \
diff -ruN openldap/files/manpages openldap.new/files/manpages
--- openldap/files/manpages	Sat Oct 10 14:40:45 1998
+++ openldap.new/files/manpages	Wed Dec 30 14:38:22 1998
@@ -35,7 +35,7 @@
 MAN3+=	ldap_sort.3
 MAN3+=	ldap_ufn.3
 MAN3+=	ldap_url.3
-MAN3+=	regex.3
+MAN5+=	ldap.conf.5
 MAN5+=	ldapfilter.conf.5
 MAN5+=	ldapfriendly.5
 MAN5+=	ldapsearchprefs.conf.5
diff -ruN openldap/files/md5 openldap.new/files/md5
--- openldap/files/md5	Tue Oct 27 00:02:26 1998
+++ openldap.new/files/md5	Wed Dec 30 12:39:27 1998
@@ -1 +1 @@
-MD5 (openldap-1.0.2.tgz) = c451152abce9273cb1403cab4940b2e6
+MD5 (openldap-1.1.1.tgz) = fe6d55119e06857454f21e0a9aeb5b02
diff -ruN openldap/patches/patch-aa openldap.new/patches/patch-aa
--- openldap/patches/patch-aa	Tue Oct 27 00:02:26 1998
+++ openldap.new/patches/patch-aa	Thu Jan  1 10:00:00 1970
@@ -1,24 +0,0 @@
---- Make-common.orig	Fri Oct 16 18:59:29 1998
-+++ Make-common	Fri Oct 16 19:08:04 1998
-@@ -189,7 +189,7 @@
- 
- # Locations of auxilary programs
- # (excepts to below are generally defined in Make-platform)
--LDAP_SENDMAIL?=/usr/lib/sendmail
-+LDAP_SENDMAIL?=/usr/sbin/sendmail
- LDAP_EDITOR?=/usr/ucb/vi
- LDAP_FINGER?=/usr/ucb/finger
- 
-@@ -261,10 +261,10 @@
- # LDAP_ACLGROUP=-DACLGROUP
- 
- # uncomment these lines to enable support for CRYPT passwords in LDBM.
--# LDAP_CRYPT=-DLDAP_CRYPT
-+LDAP_CRYPT=-DLDAP_CRYPT
- # LDAP_CRYPT_LIB?=
- # and comment this line out
--LDAP_CRYPT_LIB=
-+# LDAP_CRYPT_LIB=
- 
- # uncomment these lines to enable support fro tcp_wrappers in servers.
- # Requires tcp_wrappers.
diff -ruN openldap/patches/patch-ab openldap.new/patches/patch-ab
--- openldap/patches/patch-ab	Tue Oct 27 00:02:26 1998
+++ openldap.new/patches/patch-ab	Thu Jan  1 10:00:00 1970
@@ -1,11 +0,0 @@
---- build/platforms/freebsd2-gcc/Make-platform.orig	Wed Sep 16 11:55:05 1998
-+++ build/platforms/freebsd2-gcc/Make-platform	Fri Oct 16 18:59:41 1998
-@@ -6,7 +6,7 @@
- #
- # add any platform-specific overrides below here
- #
--EXTRACFLAGS=-O -g
-+EXTRACFLAGS?=-O -g
- LDBMBACKEND=-DLDBM_USE_DBBTREE
- LDBMINCLUDE=-I/usr/include
- 
diff -ruN openldap/patches/patch-ac openldap.new/patches/patch-ac
--- openldap/patches/patch-ac	Tue Oct 27 00:02:26 1998
+++ openldap.new/patches/patch-ac	Thu Jan  1 10:00:00 1970
@@ -1,13 +0,0 @@
---- build/platforms/freebsd3-gcc/Make-platform.orig	Wed Sep 16 11:55:05 1998
-+++ build/platforms/freebsd3-gcc/Make-platform	Fri Oct 16 19:06:39 1998
-@@ -30,8 +30,8 @@
- THREADS= -DPOSIX_THREADS -D_THREAD_SAFE -DPTHREAD_PREEMPTIVE
- 
- # use special gcc flag to include libc_r.a
--THREADSLIB= -pthread
--#THREADSLIB= -lc_r
-+#THREADSLIB= -pthread
-+THREADSLIB= -lc_r
- 
- # if you built/installed with -DNOLIBC_R, you'll need uncomment
- # out the following
diff -ruN openldap/pkg/PLIST openldap.new/pkg/PLIST
--- openldap/pkg/PLIST	Sat Oct 10 14:40:45 1998
+++ openldap.new/pkg/PLIST	Wed Dec 30 14:34:52 1998
@@ -4,24 +4,21 @@
 bin/ldapmodrdn
 bin/ldapsearch
 bin/ud
-bin/xrpcomp
-etc/ldap/go500gw.help
-etc/ldap/ldapfilter.conf
-etc/ldap/ldapfriendly
-etc/ldap/ldapsearchprefs.conf
-etc/ldap/ldaptemplates.conf
-etc/ldap/rcpt500.help
-etc/ldap/slapd.at.conf
-etc/ldap/slapd.conf
-etc/ldap/slapd.oc.conf
+etc/openldap/ldapfilter.conf.default
+etc/openldap/ldapsearchprefs.conf.default
+etc/openldap/ldaptemplates.conf.default
+etc/openldap/slapd.at.conf.default
+etc/openldap/slapd.conf.default
+etc/openldap/slapd.oc.conf.default
 include/disptmpl.h
 include/lber.h
 include/ldap.h
-include/proto-lber.h
-include/proto-ldap.h
+include/ldap_cdefs.h
 include/srchpref.h
 lib/liblber.a
+lib/liblber.la
 lib/libldap.a
+lib/libldap.la
 libexec/fax500
 libexec/go500
 libexec/go500gw
@@ -31,6 +28,7 @@
 libexec/rp500
 libexec/slapd
 libexec/slurpd
+libexec/xrpcomp
 sbin/centipede
 sbin/ldbmcat
 sbin/ldbmtest
@@ -39,4 +37,6 @@
 sbin/ldif2id2entry
 sbin/ldif2index
 sbin/ldif2ldbm
-@dirrm etc/ldap
+share/openldap/go500gw.help
+share/openldap/ldapfriendly
+share/openldap/rcpt500.help

>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199812300625.RAA15523>