Date: Sat, 27 May 2000 14:43:25 +0200 (CEST) From: rguyom@321.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/18841: net/openldap: upgrade to 1.2.10 and dynamic linking of executables Message-ID: <20000527124325.A5003311@diabolic-cow.mail.dotcom.fr>
next in thread | raw e-mail | index | archive | help
>Number: 18841 >Category: ports >Synopsis: net/openldap: upgrade to 1.2.10 and dynamic linking of executables >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat May 27 06:00:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Rémi Guyomarch >Release: FreeBSD 4.0-STABLE i386 >Organization: none >Environment: 4.0-STABLE updated May 24 >Description: 1) 1.2.10 is the latest stable version according to www.opendlap.org 2) This port links all clients, utilities and servers with static ldap libraries. This is both a waste of diskspace and memory at runtime. With dynamic linking I got a ~700 KB package instead of a 1+ MB package with static linking. The patches are in fact a back port of the patches found in the openldap CVS tree : http://www.openldap.org/devel/cvsweb.cgi/build/lib-shared.mk.diff?r1=1.6&r2=1.7&hideattic=1&sortbydate=0 http://www.openldap.org/devel/cvsweb.cgi/build/lib.mk.diff?r1=1.9&r2=1.10&hideattic=1&sortbydate=0 http://www.openldap.org/devel/cvsweb.cgi/tests/scripts/defines.sh.diff?r1=1.32&r2=1.33&hideattic=1&sortbydate=0 patch-aa is the only one required to links all clients and servers dynamically. patch-ab and patch-ac are just there to be complete. patch-db is exactly the same as with 1.2.9, only configure's line numbers have changed. >How-To-Repeat: Build this port. >Fix: diff -urN /usr/ports/net/openldap/Makefile openldap/Makefile --- /usr/ports/net/openldap/Makefile Thu May 25 22:37:32 2000 +++ openldap/Makefile Thu May 25 23:37:34 2000 @@ -6,7 +6,7 @@ # PORTNAME= openldap -PORTVERSION= 1.2.9 +PORTVERSION= 1.2.10 CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/ \ ftp://ftp.net.lut.ac.uk/openldap/openldap-release/ \ @@ -25,10 +25,11 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db/ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/db2 -D_THREAD_SAFE" \ LDFLAGS=-L${LOCALBASE}/lib +CONFIGURE_ARGS+= --enable-ldbm --with-ldbm-api=db2 .endif GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=/var/run --enable-shared --enable-dns +CONFIGURE_ARGS+= --localstatedir=/var/run --enable-shared --enable-dns # Include tcp-wrapper support .if exists(/usr/include/tcpd.h) diff -urN /usr/ports/net/openldap/files/md5 openldap/files/md5 --- /usr/ports/net/openldap/files/md5 Wed Feb 2 19:54:48 2000 +++ openldap/files/md5 Thu May 25 22:42:57 2000 @@ -1 +1 @@ -MD5 (openldap-1.2.9.tgz) = d6ef63849c5a5367cfac84f99a0263e2 +MD5 (openldap-1.2.10.tgz) = d4b904a4da62bbfb2110dfc0cddb6b90 diff -urN /usr/ports/net/openldap/patches/patch-aa openldap/patches/patch-aa --- /usr/ports/net/openldap/patches/patch-aa Thu Jan 1 01:00:00 1970 +++ openldap/patches/patch-aa Thu May 25 22:50:45 2000 @@ -0,0 +1,12 @@ +--- build/lib-shared.mk~ Thu May 25 22:46:57 2000 ++++ build/lib-shared.mk Thu May 25 22:50:24 2000 +@@ -20,5 +20,9 @@ + (d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@) + $(RM) ../`$(BASENAME) $@ .la`.a; \ + (d=`$(PWD)`; t=`$(BASENAME) $@ .la`.a; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t) ++ # If we want our binaries to link dynamically with libldap{,_r} liblber... ++ # We also symlink the .so.# so we can run the tests without installing ++ (d=`$(PWD)`; t=`$(BASENAME) $@ .la`.so; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t) ++ (d=`$(PWD)`; b=`$(BASENAME) $@ .la`; t=`ls $$d/.libs/$$b.so.?`; $(LN_S) `$(BASENAME) $$d`/.libs/`$(BASENAME) $$t` ../`$(BASENAME) $$t`) + + Makefile: $(top_srcdir)/build/lib-shared.mk diff -urN /usr/ports/net/openldap/patches/patch-ab openldap/patches/patch-ab --- /usr/ports/net/openldap/patches/patch-ab Thu Jan 1 01:00:00 1970 +++ openldap/patches/patch-ab Fri May 26 00:34:56 2000 @@ -0,0 +1,8 @@ +--- tests/scripts/defines.sh~ Wed May 26 02:06:42 1999 ++++ tests/scripts/defines.sh Thu May 25 22:53:23 2000 +@@ -53,3 +53,5 @@ + ACLOUTMASTER=$DATADIR/acl.out.master + REPLOUTMASTER=$DATADIR/repl.out.master + MODSRCHFILTERS=$DATADIR/modify.search.filters ++# Just in case we linked the binaries dynamically ++export LD_LIBRARY_PATH=`pwd`/../libraries diff -urN /usr/ports/net/openldap/patches/patch-ac openldap/patches/patch-ac --- /usr/ports/net/openldap/patches/patch-ac Thu Jan 1 01:00:00 1970 +++ openldap/patches/patch-ac Thu May 25 22:58:39 2000 @@ -0,0 +1,12 @@ +--- build/lib.mk~ Thu Jan 7 18:36:30 1999 ++++ build/lib.mk Thu May 25 22:58:26 2000 +@@ -27,7 +27,8 @@ + clean-common: FORCE + $(RM) $(LIBRARY) ../$(LIBRARY) $(XLIBRARY) \ + $(PROGRAMS) $(XPROGRAMS) $(XSRCS) $(XXSRCS) \ +- *.o *.lo a.out core version.c .libs/* ++ *.o *.lo a.out core version.c .libs/* \ ++ ../`$(BASENAME) $(LIBRARY) .la`.so* + + depend-common: FORCE + $(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $(XXSRCS) diff -urN /usr/ports/net/openldap/patches/patch-db openldap/patches/patch-db --- /usr/ports/net/openldap/patches/patch-db Sun Apr 2 05:27:52 2000 +++ openldap/patches/patch-db Thu May 25 23:48:30 2000 @@ -1,13 +1,13 @@ ---- configure.orig Mon Jan 17 11:53:36 2000 -+++ configure Thu Mar 2 18:40:40 2000 -@@ -6011,14 +6011,14 @@ +--- configure~ Fri Mar 10 22:18:23 2000 ++++ configure Thu May 25 23:48:13 2000 +@@ -6113,14 +6113,14 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ol_LIBS="$LIBS" - echo $ac_n "checking for db_open in -ldb""... $ac_c" 1>&6 --echo "configure:6016: checking for db_open in -ldb" >&5 +-echo "configure:6118: checking for db_open in -ldb" >&5 + echo $ac_n "checking for db_open in -ldb2""... $ac_c" 1>&6 -+echo "configure:6016: checking for db_open in -ldb2" >&5 ++echo "configure:6118: checking for db_open in -ldb2" >&5 ac_lib_var=`echo db'_'db_open | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16,9 +16,9 @@ -LIBS="-ldb $LIBS" +LIBS="-ldb2 $LIBS" cat > conftest.$ac_ext <<EOF - #line 6024 "configure" + #line 6126 "configure" #include "confdefs.h" -@@ -6046,7 +6046,7 @@ +@@ -6148,7 +6148,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 >Release-Note: >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?20000527124325.A5003311>