Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32080
Modified Files:
openldap24.info openldap24.patch
Log Message:
New upstream version.
Index: openldap24.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/openldap24.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- openldap24.info 3 Dec 2008 02:26:14 -0000 1.1
+++ openldap24.info 16 Feb 2009 13:23:10 -0000 1.2
@@ -1,5 +1,5 @@
Package: openldap24
-Version: 2.4.13
+Version: 2.4.14
Revision: 1
Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
Source: mirror:custom:openldap-release/openldap-%v.tgz
@@ -18,25 +18,35 @@
nam-US: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
sam-BR: ftp://ftp.matrix.com.br/pub/openldap/
<<
-Source-MD5: 5382bbb4c67172c48c871b6d24b7f8cc
+Source-MD5: fe2089adac9e9bef7172c2fb61cb6ae9
Depends: %N-shlibs (= %v-%r), daemonic
BuildDepends: <<
cyrus-sasl2-dev (>= 2.1.22-1),
db47-aes | db47,
fink (>= 0.24.12-1),
- readline5 (>= 5.0-1004),
system-openssl-dev
<<
Conflicts: openldap-ssl, openldap23
Replaces: openldap-ssl, openldap23
PatchFile: %n.patch
-PatchFile-MD5: 34d1db39b87219562177f02d131e4d7d
+PatchFile-MD5: ec42537114bef900c443bb413397d870
NoSetLDFLAGS: True
SetLibs: -lkrb5 -ldb-4.7 -L%p/lib/system-openssl/lib -L%p/lib
SetCPPFLAGS: -I%p/lib/system-openssl/include -I%p/include/db4 -DBIND_8_COMPAT
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
ConfigureParams: --libexecdir=%p/sbin --mandir=%p/share/man --with-cyrus-sasl
--enable-ldap --enable-ldbm --disable-dependency-tracking --enable-dynamic
--enable-shared --disable-static
+CompileScript: <<
+ #!/bin/bash -ev
+ # This bit enables stripping unused libs on 10.5 and later.
+ let version=`uname -r | cut -f 1 -d .`
+ if [ $version -ge 9 ]; then
+ export LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs"
+ fi
+
+ ./configure %c
+ make
+<<
InstallScript: <<
make install DESTDIR=%d
#No need for dependency_libs in .la files if not building static libs
@@ -51,15 +61,14 @@
Package: %N-shlibs
Depends: <<
cyrus-sasl2-shlibs (>= 2.1.22-1),
- db47-aes-shlibs | db47-shlibs,
- readline5-shlibs (>= 5.0-1004)
+ db47-aes-shlibs | db47-shlibs
<<
Description: Shared libraries for LDAP
Files: lib/*-2.4.2*.dylib
Shlibs: <<
- %p/lib/liblber-2.4.2.dylib 6.0.0 %n (>= 2.4.13-1)
- %p/lib/libldap-2.4.2.dylib 6.0.0 %n (>= 2.4.13-1)
- %p/lib/libldap_r-2.4.2.dylib 6.0.0 %n (>= 2.4.13-1)
+ %p/lib/liblber-2.4.2.dylib 7.0.0 %n (>= 2.4.14-1)
+ %p/lib/libldap-2.4.2.dylib 7.0.0 %n (>= 2.4.14-1)
+ %p/lib/libldap_r-2.4.2.dylib 7.0.0 %n (>= 2.4.14-1)
<<
DocFiles: ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README build/LICENSE-2.0.1
<<
@@ -116,10 +125,13 @@
License: Restrictive/Distributable
Homepage: http://www.openldap.org
-# Disabling tests for now as test048-syncrepl-multiproxy is failing.
-#InfoTest: <<
-# Tests take a LONG time to run.
-# TestSuiteSize: large
-# TestScript: make check || exit 2
-#<<
+# Disabling test048-syncrepl-multiproxy
+InfoTest: <<
+ # Tests take a LONG time to run.
+ TestSuiteSize: large
+ TestScript: <<
+ rm tests/scripts/test048-syncrepl-multiproxy
+ make check || exit 2
+ <<
+<<
Index: openldap24.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/openldap24.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- openldap24.patch 3 Dec 2008 02:26:14 -0000 1.1
+++ openldap24.patch 16 Feb 2009 13:23:10 -0000 1.2
@@ -1,7 +1,7 @@
-diff -ruN openldap-2.4.13.orig/include/ldap.h openldap-2.4.13/include/ldap.h
---- openldap-2.4.13.orig/include/ldap.h 2008-11-10 19:07:27.000000000
-0500
-+++ openldap-2.4.13/include/ldap.h 2008-12-02 20:00:05.000000000 -0500
-@@ -2452,5 +2452,25 @@
+diff -ruN openldap-2.4.14.orig/include/ldap.h openldap-2.4.14/include/ldap.h
+--- openldap-2.4.14.orig/include/ldap.h 2009-01-26 18:29:53.000000000
-0500
++++ openldap-2.4.14/include/ldap.h 2009-02-16 06:38:18.000000000 -0500
+@@ -2461,5 +2461,25 @@
LDAPControl **ctrls,
LDAPDerefRes **drp ));
@@ -27,30 +27,30 @@
+
LDAP_END_DECL
#endif /* _LDAP_H */
-diff -ruN openldap-2.4.13.orig/libraries/libldap/Makefile.in
openldap-2.4.13/libraries/libldap/Makefile.in
---- openldap-2.4.13.orig/libraries/libldap/Makefile.in 2008-11-10
14:15:16.000000000 -0500
-+++ openldap-2.4.13/libraries/libldap/Makefile.in 2008-12-02
20:03:07.000000000 -0500
-@@ -26,7 +26,7 @@
- request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
+diff -ruN openldap-2.4.14.orig/libraries/libldap/Makefile.in
openldap-2.4.14/libraries/libldap/Makefile.in
+--- openldap-2.4.14.orig/libraries/libldap/Makefile.in 2009-01-26
18:29:53.000000000 -0500
++++ openldap-2.4.14/libraries/libldap/Makefile.in 2009-02-16
06:36:11.000000000 -0500
+@@ -27,7 +27,7 @@
init.c options.c print.c string.c util-int.c schema.c \
- charray.c tls.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ tls2.c tls_o.c tls_g.c tls_m.c \
- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
assertion.c deref.c
OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
-@@ -38,7 +38,7 @@
- request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
+@@ -40,7 +40,7 @@
init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- charray.lo tls.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ tls2.lo tls_o.lo tls_g.lo tls_m.lo \
- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
assertion.lo deref.lo
LDAP_INCDIR= ../../include
-diff -ruN openldap-2.4.13.orig/libraries/libldap/ntlm.c
openldap-2.4.13/libraries/libldap/ntlm.c
---- openldap-2.4.13.orig/libraries/libldap/ntlm.c 1969-12-31
19:00:00.000000000 -0500
-+++ openldap-2.4.13/libraries/libldap/ntlm.c 2008-12-02 20:00:05.000000000
-0500
+diff -ruN openldap-2.4.14.orig/libraries/libldap/ntlm.c
openldap-2.4.14/libraries/libldap/ntlm.c
+--- openldap-2.4.14.orig/libraries/libldap/ntlm.c 1969-12-31
19:00:00.000000000 -0500
++++ openldap-2.4.14/libraries/libldap/ntlm.c 2009-02-16 06:38:18.000000000
-0500
@@ -0,0 +1,138 @@
+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04
20:38:21 kurt Exp $ */
+/*
@@ -190,24 +190,24 @@
+ return( ld->ld_errno );
+}
+
-diff -ruN openldap-2.4.13.orig/libraries/libldap_r/Makefile.in
openldap-2.4.13/libraries/libldap_r/Makefile.in
---- openldap-2.4.13.orig/libraries/libldap_r/Makefile.in 2008-11-07
19:14:45.000000000 -0500
-+++ openldap-2.4.13/libraries/libldap_r/Makefile.in 2008-12-02
20:00:05.000000000 -0500
-@@ -28,7 +28,7 @@
- request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
+diff -ruN openldap-2.4.14.orig/libraries/libldap_r/Makefile.in
openldap-2.4.14/libraries/libldap_r/Makefile.in
+--- openldap-2.4.14.orig/libraries/libldap_r/Makefile.in 2009-01-26
19:03:04.000000000 -0500
++++ openldap-2.4.14/libraries/libldap_r/Makefile.in 2009-02-16
06:37:40.000000000 -0500
+@@ -29,7 +29,7 @@
init.c options.c print.c string.c util-int.c schema.c \
- charray.c tls.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ tls2.c tls_o.c tls_g.c tls_m.c \
- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- assertion.c
+ assertion.c deref.c
SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \
thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
-@@ -45,7 +45,7 @@
- request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
+@@ -47,7 +47,7 @@
init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- charray.lo tls.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ tls2.lo tls_o.lo tls_g.lo tls_m.lo \
- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- assertion.lo
+ assertion.lo deref.lo
LDAP_INCDIR= ../../include
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
