Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv13374
Modified Files:
libaprutil.0-mysql.info libaprutil.0-postgresql.info
libaprutil.0-shlibs.info libaprutil.0-shlibs.patch
libaprutil.0-sqlite3.info openldap24.info openldap24.patch
Log Message:
New upstream version and switch to db53-aes.
Index: libaprutil.0-shlibs.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libaprutil.0-shlibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libaprutil.0-shlibs.patch 10 Jan 2011 22:49:00 -0000 1.2
+++ libaprutil.0-shlibs.patch 18 Jan 2012 23:59:48 -0000 1.3
@@ -1,6 +1,6 @@
-diff -ru apr-util-1.3.10.orig/apr-util.pc.in apr-util-1.3.10/apr-util.pc.in
---- apr-util-1.3.10.orig/apr-util.pc.in 2008-05-23 17:27:59.000000000
-0400
-+++ apr-util-1.3.10/apr-util.pc.in 2010-10-15 19:38:27.000000000 -0400
+diff -ru apr-util-1.4.1.orig/apr-util.pc.in apr-util-1.4.1/apr-util.pc.in
+--- apr-util-1.4.1.orig/apr-util.pc.in 2008-05-23 17:27:37.000000000 -0400
++++ apr-util-1.4.1/apr-util.pc.in 2012-01-18 14:21:54.000000000 -0500
@@ -9,5 +9,5 @@
Version: @APRUTIL_DOTTED_VERSION@
# assume that apr-util requires libapr of same major version
@@ -8,18 +8,22 @@
-Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@
+Libs: -L${libdir} -l@APRUTIL_LIBNAME@
Cflags: -I${includedir}
-diff -ru apr-util-1.3.10.orig/apu-config.in apr-util-1.3.10/apu-config.in
---- apr-util-1.3.10.orig/apu-config.in 2010-09-29 10:22:45.000000000 -0400
-+++ apr-util-1.3.10/apu-config.in 2010-10-15 19:38:27.000000000 -0400
-@@ -27,7 +27,7 @@
+diff -ru apr-util-1.4.1.orig/apu-config.in apr-util-1.4.1/apu-config.in
+--- apr-util-1.4.1.orig/apu-config.in 2010-11-26 09:21:37.000000000 -0500
++++ apr-util-1.4.1/apu-config.in 2012-01-18 15:29:48.000000000 -0500
+@@ -27,9 +27,9 @@
libdir="@libdir@"
includedir="@includedir@"
-LIBS="@APRUTIL_EXPORT_LIBS@"
+-INCLUDES="@APRUTIL_INCLUDES@"
+-LDFLAGS="@APRUTIL_LDFLAGS@"
+LIBS=""
- INCLUDES="@APRUTIL_INCLUDES@"
- LDFLAGS="@APRUTIL_LDFLAGS@"
++INCLUDES="-I${prefix}/include"
++LDFLAGS="-L${prefix}/lib"
LDAP_LIBS="@LDADD_ldap@"
+ DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
+
@@ -122,7 +122,7 @@
DBM_LIBS=""
;;
@@ -29,49 +33,38 @@
;;
--ldap-libs)
flags="$flags $LDAP_LIBS"
-diff -ru apr-util-1.3.10.orig/configure apr-util-1.3.10/configure
---- apr-util-1.3.10.orig/configure 2010-10-01 07:56:47.000000000 -0400
-+++ apr-util-1.3.10/configure 2010-10-15 19:46:14.000000000 -0400
-@@ -10928,15 +10928,15 @@
- fi
+diff -ru apr-util-1.4.1.orig/configure apr-util-1.4.1/configure
+--- apr-util-1.4.1.orig/configure 2011-12-07 17:53:06.000000000 -0500
++++ apr-util-1.4.1/configure 2012-01-18 14:41:34.000000000 -0500
+@@ -12857,14 +12857,14 @@
bdb_version="5"
-- if test ""0"" != "-1"; then
-- bdb_version="$bdb_version."0""
-+ if test ""1"" != "-1"; then
-+ bdb_version="$bdb_version."1""
+ if test ""1"" != "-1"; then
+- bdb_version="$bdb_version."1""
++ bdb_version="$bdb_version."3""
if test ""-1"" != "-1"; then
bdb_version="$bdb_version."-1""
fi
fi
bdb_places="$places"
- bdb_default_search_headers="db50/db.h db5/db.h db.h"
-- bdb_default_search_lib_names="db-5.0 db5-5.0 db50 db5 db"
-+ bdb_default_search_lib_names="db-5.1 db5-5.1 db51 db5 db"
+ bdb_default_search_headers="db51/db.h db5/db.h db.h"
+- bdb_default_search_lib_names="db-5.1 db5-5.1 db51 db5 db"
++ bdb_default_search_lib_names="db-5.3 db5-5.1 db51 db5 db"
apu_have_db=0
-@@ -11005,7 +11005,7 @@
- # changes if the user runs `configure' with a different set of
- # switches.
-
-- cache_id="`echo
apu_cv_check_berkeley_db_"5"_"0"_"-1"_${bdb_header}_${bdb_libname}_in_${bdb_place}
\
-+ cache_id="`echo
apu_cv_check_berkeley_db_"5"_"1"_"-1"_${bdb_header}_${bdb_libname}_in_${bdb_place}
\
- | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
-
-
-@@ -11019,7 +11019,7 @@
+@@ -12946,7 +12946,7 @@
apu_try_berkeley_db_save_libs="$LIBS"
apu_check_berkeley_db_major="5"
-- apu_check_berkeley_db_minor="0"
-+ apu_check_berkeley_db_minor="1"
+- apu_check_berkeley_db_minor="1"
++ apu_check_berkeley_db_minor="3"
apu_check_berkeley_db_patch="-1"
apu_try_berkeley_db_header=$bdb_header
apu_try_berkeley_db_libname=$bdb_libname
-diff -ru apr-util-1.3.10.orig/test/Makefile.in apr-util-1.3.10/test/Makefile.in
---- apr-util-1.3.10.orig/test/Makefile.in 2009-11-12 19:16:45.000000000
-0500
-+++ apr-util-1.3.10/test/Makefile.in 2010-10-15 19:38:27.000000000 -0400
+diff -ru apr-util-1.4.1.orig/test/Makefile.in apr-util-1.4.1/test/Makefile.in
+--- apr-util-1.4.1.orig/test/Makefile.in 2009-11-12 19:16:38.000000000
-0500
++++ apr-util-1.4.1/test/Makefile.in 2012-01-18 14:21:54.000000000 -0500
@@ -23,7 +23,7 @@
TARGETS = $(PROGRAMS)
Index: libaprutil.0-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libaprutil.0-shlibs.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libaprutil.0-shlibs.info 23 Nov 2011 02:18:56 -0000 1.4
+++ libaprutil.0-shlibs.info 18 Jan 2012 23:59:48 -0000 1.5
@@ -1,24 +1,25 @@
Package: libaprutil.0-shlibs
-Version: 1.3.10
-Revision: 2
+Version: 1.4.1
+Revision: 1
Depends: <<
- db51-aes-shlibs | db51-shlibs,
+ db53-aes-shlibs,
expat1-shlibs,
gdbm3-shlibs,
- libapr.0-shlibs (>= 1.4.2-1),
+ libapr.0-shlibs (>= 1.4.5-1),
libiconv,
openldap24-shlibs
<<
BuildDepends: <<
- db51-aes | db51,
+ db53-aes,
expat1,
fink (>= 0.24.12),
gdbm3,
- libapr.0-dev (>= 1.4.2-1),
+ libapr.0-dev (>= 1.4.5-1),
libiconv-dev,
openldap24-dev,
- pkgconfig
+ pkgconfig,
+ system-openssl-dev
<<
Replaces: libaprutil0-shlibs
# a transient libaprutil0-shlibs accidentally installed something else at the
install_name location
@@ -26,15 +27,14 @@
Suggests: libaprutil.0-mysql, libaprutil.0-odbc, libaprutil.0-postgresql,
libaprutil.0-sqlite2, libaprutil.0-sqlite3
Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 6a6f501a1b2a45166b8ffd6df29204bb
+Source-MD5: 52b31b33fb1aa16e65ddaefc76e41151
PatchFile: %n.patch
-PatchFile-MD5: 904951c57a5805f9e093e6cc10b64250
+PatchFile-MD5: 6f63a00b02f0274c27e8753a3044e342
PatchScript: <<
### Fix layout
perl -pi -e 's,/usr/local,%p,g' config.layout
%{default_script}
- perl -pi -e 's/db50/db51/; s/db-5.0/db-5.1/' configure
<<
UseMaxBuildJobs: false
@@ -44,9 +44,11 @@
--with-ldap-include=%p/include \
--with-ldap-lib=%p/lib \
--with-ldap \
- --with-dbm=db51 \
+ --with-dbm=db \
--with-gdbm=%p \
--with-berkeley-db=%p \
+ --with-crypto \
+ --with-openssl=%p/lib/system-openssl \
--without-pgsql \
--without-mysql \
--without-sqlite2 \
@@ -61,15 +63,13 @@
InstallScript: <<
make install DESTDIR=%d
/bin/rm %i/lib/aprutil.exp
- #No need for dependency_libs in .la files if not building static libs
- perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/lib/*.la
%i/lib/apr-util-1/*la
cd %i/lib && ln -s libaprutil.0.dylib libaprutil-1.dylib
<<
DocFiles: CHANGES LICENSE NOTICE README
Shlibs: <<
- %p/lib/libaprutil.0.dylib 4.0.0 %n (>= 1.3.4-4)
+ %p/lib/libaprutil.0.dylib 5.0.0 %n (>= 1.4.1-4)
<<
SplitOff: <<
Index: openldap24.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/openldap24.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- openldap24.patch 13 Mar 2009 15:11:12 -0000 1.1
+++ openldap24.patch 18 Jan 2012 23:59:48 -0000 1.2
@@ -1,7 +1,7 @@
-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 @@
+diff -ruN openldap-2.4.25.orig/include/ldap.h openldap-2.4.25/include/ldap.h
+--- openldap-2.4.25.orig/include/ldap.h 2011-01-06 13:43:19.000000000
-0500
++++ openldap-2.4.25/include/ldap.h 2011-04-07 16:26:19.000000000 -0400
+@@ -2518,5 +2518,25 @@
LDAPControl **ctrls,
LDAPDerefRes **drp ));
@@ -27,16 +27,16 @@
+
LDAP_END_DECL
#endif /* _LDAP_H */
-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
+diff -ruN openldap-2.4.25.orig/libraries/libldap/Makefile.in
openldap-2.4.25/libraries/libldap/Makefile.in
+--- openldap-2.4.25.orig/libraries/libldap/Makefile.in 2011-03-24
14:22:43.000000000 -0400
++++ openldap-2.4.25/libraries/libldap/Makefile.in 2011-04-07
16:28:12.000000000 -0400
@@ -27,7 +27,7 @@
init.c options.c print.c string.c util-int.c schema.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
+ assertion.c deref.c ldif.c fetch.c
OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
@@ -40,7 +40,7 @@
@@ -45,12 +45,12 @@
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
+ assertion.lo deref.lo ldif.lo fetch.lo
LDAP_INCDIR= ../../include
-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
+diff -ruN openldap-2.4.25.orig/libraries/libldap/ntlm.c
openldap-2.4.25/libraries/libldap/ntlm.c
+--- openldap-2.4.25.orig/libraries/libldap/ntlm.c 1969-12-31
19:00:00.000000000 -0500
++++ openldap-2.4.25/libraries/libldap/ntlm.c 2011-04-07 16:26:19.000000000
-0400
@@ -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.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
+diff -ruN openldap-2.4.25.orig/libraries/libldap_r/Makefile.in
openldap-2.4.25/libraries/libldap_r/Makefile.in
+--- openldap-2.4.25.orig/libraries/libldap_r/Makefile.in 2011-03-24
14:22:43.000000000 -0400
++++ openldap-2.4.25/libraries/libldap_r/Makefile.in 2011-04-07
16:28:55.000000000 -0400
@@ -29,7 +29,7 @@
init.c options.c print.c string.c util-int.c schema.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
+ assertion.c deref.c ldif.c fetch.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 \
+ thr_posix.c thr_cthreads.c thr_thr.c thr_nt.c \
@@ -47,7 +47,7 @@
init.lo options.lo print.lo string.lo util-int.lo schema.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
+ assertion.lo deref.lo ldif.lo fetch.lo
LDAP_INCDIR= ../../include
Index: libaprutil.0-mysql.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libaprutil.0-mysql.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libaprutil.0-mysql.info 23 Nov 2011 02:18:56 -0000 1.3
+++ libaprutil.0-mysql.info 18 Jan 2012 23:59:48 -0000 1.4
@@ -1,6 +1,6 @@
Package: libaprutil.0-mysql
-Version: 1.3.10
-Revision: 2
+Version: 1.4.1
+Revision: 1
Depends: <<
libaprutil.0-shlibs (>= %v-%r),
@@ -8,30 +8,30 @@
openldap24-shlibs
<<
BuildDepends: <<
- db51-aes | db51,
+ db53-aes,
expat1,
fink (>= 0.24.12),
gdbm3,
- libapr.0-dev (>= 1.4.2-1),
+ libapr.0-dev (>= 1.4.5-1),
libaprutil.0-dev (>= %v-%r),
libiconv-dev,
mysql-unified-dev,
openldap24-dev,
- pkgconfig
+ pkgconfig,
+ system-openssl-dev
<<
Replaces: libaprutil0-shlibs, libaprutil.0-shlibs (<< 1.3.4-9)
# a transient libaprutil0-shlibs accidentally installed something else at the
install_name location
Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 6a6f501a1b2a45166b8ffd6df29204bb
+Source-MD5: 52b31b33fb1aa16e65ddaefc76e41151
PatchFile: libaprutil.0-shlibs.patch
-PatchFile-MD5: 904951c57a5805f9e093e6cc10b64250
+PatchFile-MD5: 6f63a00b02f0274c27e8753a3044e342
PatchScript: <<
### Fix layout
perl -pi -e 's,/usr/local,%p,g' config.layout
%{default_script}
- perl -pi -e 's/db50/db51/; s/db-5.0/db-5.1/' configure
<<
UseMaxBuildJobs: false
@@ -41,9 +41,11 @@
--with-ldap-include=%p/include \
--with-ldap-lib=%p/lib \
--with-ldap \
- --with-dbm=db51 \
+ --with-dbm=db \
--with-gdbm=%p \
--with-berkeley-db=%p \
+ --with-crypto \
+ --with-openssl=%p/lib/system-openssl \
--without-pgsql \
--with-mysql=%p \
--without-sqlite2 \
@@ -62,8 +64,6 @@
InstallScript: <<
make install-modules prefix=%i APU_MODULES=dbd/apr_dbd_mysql.la
- #No need for dependency_libs in .la files if not building static libs
- perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/lib/apr-util-1/*la
<<
DocFiles: CHANGES LICENSE NOTICE README
Index: libaprutil.0-postgresql.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libaprutil.0-postgresql.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libaprutil.0-postgresql.info 23 Nov 2011 02:18:56 -0000 1.3
+++ libaprutil.0-postgresql.info 18 Jan 2012 23:59:48 -0000 1.4
@@ -1,37 +1,37 @@
Package: libaprutil.0-postgresql
-Version: 1.3.10
-Revision: 2
+Version: 1.4.1
+Revision: 1
Depends: <<
libaprutil.0-shlibs (>= %v-%r),
openldap24-shlibs,
- postgresql84-shlibs
+ postgresql90-shlibs
<<
BuildDepends: <<
- db51-aes | db51,
+ db53-aes,
expat1,
fink (>= 0.24.12),
gdbm3,
- libapr.0-dev (>= 1.4.2-1),
+ libapr.0-dev (>= 1.4.5-1),
libaprutil.0-dev (>= %v-%r),
libiconv-dev,
openldap24-dev,
pkgconfig,
- postgresql84-dev
+ postgresql90-dev,
+ system-openssl-dev
<<
Replaces: libaprutil0-shlibs, libaprutil.0-shlibs (<< 1.3.4-9)
# a transient libaprutil0-shlibs accidentally installed something else at the
install_name location
Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 6a6f501a1b2a45166b8ffd6df29204bb
+Source-MD5: 52b31b33fb1aa16e65ddaefc76e41151
PatchFile: libaprutil.0-shlibs.patch
-PatchFile-MD5: 904951c57a5805f9e093e6cc10b64250
+PatchFile-MD5: 6f63a00b02f0274c27e8753a3044e342
PatchScript: <<
### Fix layout
perl -pi -e 's,/usr/local,%p,g' config.layout
%{default_script}
- perl -pi -e 's/db50/db51/; s/db-5.0/db-5.1/' configure
<<
UseMaxBuildJobs: false
@@ -41,9 +41,11 @@
--with-ldap-include=%p/include \
--with-ldap-lib=%p/lib \
--with-ldap \
- --with-dbm=db51 \
+ --with-dbm=db \
--with-gdbm=%p \
--with-berkeley-db=%p \
+ --with-crypto \
+ --with-openssl=%p/lib/system-openssl \
--with-pgsql=%p \
--without-mysql \
--without-sqlite2 \
@@ -62,8 +64,6 @@
InstallScript: <<
make install-modules prefix=%i APU_MODULES=dbd/apr_dbd_pgsql.la
- #No need for dependency_libs in .la files if not building static libs
- perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/lib/apr-util-1/*la
<<
DocFiles: CHANGES LICENSE NOTICE README
Index: openldap24.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/openldap24.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- openldap24.info 10 Jan 2011 22:49:00 -0000 1.7
+++ openldap24.info 18 Jan 2012 23:59:48 -0000 1.8
@@ -1,7 +1,7 @@
Info4: <<
Package: openldap24%type_pkg[-64bit]
-Version: 2.4.23
-Revision: 2
+Version: 2.4.28
+Revision: 1
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] =
-64bit ) i386
Distribution: ( %type_raw[-64bit] = -64bit ) 10.5, ( %type_raw[-64bit] =
-64bit ) 10.6
@@ -21,11 +21,11 @@
sam-BR: ftp://ftp.matrix.com.br/pub/openldap/
sam-CR: ftp://mirrors.ucr.ac.cr/openldap/
<<
-Source-MD5: 90150b8c0d0192e10b30157e68844ddf
+Source-MD5: 196023e552eeb259e048edcd61a9645b
Depends: %N-shlibs (= %v-%r), daemonic, ( %type_raw[-64bit] = -64bit )
64bit-cpu
BuildDepends: <<
- cyrus-sasl2%type_pkg[-64bit]-dev (>= 2.1.23-2),
- db51-aes%type_pkg[-64bit] | db51%type_pkg[-64bit],
+ cyrus-sasl2%type_pkg[-64bit]-dev (>= 2.1.25-1),
+ db53-aes%type_pkg[-64bit],
fink (>= 0.24.12-1),
system-openssl-dev
<<
@@ -33,21 +33,15 @@
Replaces: openldap-ssl, openldap23, openldap24, openldap24-64bit
Provides: openldap
PatchFile: %{ni}.patch
-PatchFile-MD5: ec42537114bef900c443bb413397d870
+PatchFile-MD5: 0492da596271831c1eae985c611f1199
NoSetLDFLAGS: True
-SetLibs: -lkrb5 -L%p/lib/system-openssl/lib -L%p/%lib -ldb-5.1
+SetLDFLAGS: -Wl,-dead_strip_dylibs
+SetLibs: -lkrb5 -L%p/lib/system-openssl/lib -L%p/%lib -ldb-5.3
SetCPPFLAGS: -I%p/lib/system-openssl/include -I%p/include/db5 -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 --libdir='${prefix}/%lib'
+UseMaxBuildJobs: true
+ConfigureParams: --libexecdir=%p/sbin --mandir=%p/share/man --with-cyrus-sasl
--enable-ldap --disable-dependency-tracking --enable-dynamic --enable-shared
--disable-static --libdir='${prefix}/%lib'
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
-
if [ "%type_raw[-64bit]" == "-64bit" ]; then
export CC="gcc -m64"
fi
@@ -55,8 +49,6 @@
<<
InstallScript: <<
make install DESTDIR=%d
- #No need for dependency_libs in .la files if not building static libs
- perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/%lib/*.la
<<
DocFiles: ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README build/LICENSE-2.0.1
doc/drafts/draft*
ConfFiles: <<
@@ -66,16 +58,16 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- cyrus-sasl2%type_pkg[-64bit]-shlibs (>= 2.1.23-2),
- db51-aes%type_pkg[-64bit]-shlibs | db51%type_pkg[-64bit]-shlibs,
+ cyrus-sasl2%type_pkg[-64bit]-shlibs (>= 2.1.25-1),
+ db53-aes%type_pkg[-64bit]-shlibs,
( %type_raw[-64bit] = -64bit ) 64bit-cpu
<<
Description: Shared libraries for LDAP
Files: %lib/*-2.4.2*.dylib
Shlibs: <<
- %p/%lib/liblber-2.4.2.dylib 8.0.0 %n (>= 2.4.17-1) %type_num[-64bit]
- %p/%lib/libldap-2.4.2.dylib 8.0.0 %n (>= 2.4.17-1) %type_num[-64bit]
- %p/%lib/libldap_r-2.4.2.dylib 8.0.0 %n (>= 2.4.17-1) %type_num[-64bit]
+ %p/%lib/liblber-2.4.2.dylib 11.0.0 %n (>= 2.4.28-1) %type_num[-64bit]
+ %p/%lib/libldap-2.4.2.dylib 11.0.0 %n (>= 2.4.28-1) %type_num[-64bit]
+ %p/%lib/libldap_r-2.4.2.dylib 11.0.0 %n (>= 2.4.28-1) %type_num[-64bit]
<<
DocFiles: ANNOUNCEME 2.4.2.dylib 11.0.0 %n (>= 2.4.28-1)
%type_num[-64bit] oc/drafts/draft* isable-dependency-tracking
--enable-dynamic --enable-shared --disable-static
--libdir='${prefix}/%lib' refix}/%lib' F+ Ñÿ 0±F+
Ñÿ p Ñÿ ë=rE+ 6 è è ! è !
Ñÿ Ñÿ xÔF+ Ñÿ "!rE+ >rE+
Ñÿ ð
rE+ _ Ñÿ ÀÏòF+ ó(rE+ ÀòF+ ØÄòF+ ¨ÉòF+ JsE+ xÔF+
Ñÿ p
Ñÿ ë=rE+ à! à! Ñÿ Ñÿ ÈnF+
Ñÿ "!rE+ >rE+ Ñÿ ð
rE+ _ Ñÿ P Ñÿ H Ñÿ ;E+ p Ñÿ ó(rE+ JsE+
Ñÿ P Ñÿ ë=rE+ G H I J K M N O P
Ñÿ Ñÿ HUEF+ Ñÿ "!rE+ >rE+
Ñÿ 0ÏòF+ ó(rE+ àF+ "F+ ÀòF+ ØÄòF+ ¨ÉòF+ JsE+ HUEF+
Ñÿ ` Ñÿ ë=rE+ 8UEF+ Ñÿ
Ñÿ ë=rE+ (UEF+ Ñÿ À Ñÿ ë=rE+ UEF+
Ñÿ ð Ñÿ ë=rE+
¨ÎòF+ ó(rE+ ¨ÉòF+ p Ñÿ Ø"F+ æ'rE+ ØÄòF+
Ñÿ yØ"F+ æ'rE+ ÀòF+ À
Ñÿ ZØ"F+ æ'rE+ Ø"F+ àF+ "F+ ÀòF+ ØäF+ ØÄòF+ ¨ÉòF+ JsE+ ;E+ ]îE+ Ñÿ p"F+ p Ñÿ @ Ñÿ ë=rE+ 5 6 7 8 : < = > ? @ B D
Ñÿ Ñÿ à]ëE+ Ñÿ ó(rE+ è4E+ ð
Ñÿ ]îE+ æ'rE+ è4E+ Õ_@f ÆS
Qöl±í ÁsºE+ Ñÿ à]ëE+ Ñÿ P Ñÿ ë=rE+ u]ÞÓ
4Q ÷U^Qʧ ¶uª¹ñìò*Äv´òóE+ Ð Ñÿ FðUG+ FðUG+ ?EñE+ Ñÿ
Ñÿ ° Ñÿ _ Ñÿ P Ñÿ H Ñÿ Ñÿ BðUG+ à Ñÿ ØäF+ éF+ JsE+ ÿÿÿÿÿÿÿÿBðUG+ Ñÿ ë=rE NT
CHANGES COPYRIGHT LICENSE README build/LICENSE-2.0.1
<<
@@ -133,9 +125,10 @@
Homepage: http://www.openldap.org
InfoTest: <<
- # Tests take a LONG time to run.
+ # Tests take a LONG time to run. Really. I mean it. A Looooooooong time.
TestSuiteSize: large
TestScript: <<
+ rm tests/scripts/test048-syncrepl-multiproxy
make check || exit 2
<<
<<
Index: libaprutil.0-sqlite3.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libaprutil.0-sqlite3.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libaprutil.0-sqlite3.info 23 Nov 2011 02:18:56 -0000 1.3
+++ libaprutil.0-sqlite3.info 18 Jan 2012 23:59:48 -0000 1.4
@@ -1,6 +1,6 @@
Package: libaprutil.0-sqlite3
-Version: 1.3.10
-Revision: 2
+Version: 1.4.1
+Revision: 1
Depends: <<
libaprutil.0-shlibs (>= %v-%r),
@@ -8,30 +8,30 @@
sqlite3-shlibs
<<
BuildDepends: <<
- db51-aes | db51,
+ db53-aes,
expat1,
fink (>= 0.24.12),
gdbm3,
- libapr.0-dev (>= 1.4.2-1),
+ libapr.0-dev (>= 1.4.5-1),
libaprutil.0-dev (>= %v-%r),
libiconv-dev,
openldap24-dev,
pkgconfig,
- sqlite3-dev
+ sqlite3-dev,
+ system-openssl-dev
<<
Replaces: libaprutil0-shlibs, libaprutil.0-shlibs (<< 1.3.4-9)
# a transient libaprutil0-shlibs accidentally installed something else at the
install_name location
Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 6a6f501a1b2a45166b8ffd6df29204bb
+Source-MD5: 52b31b33fb1aa16e65ddaefc76e41151
PatchFile: libaprutil.0-shlibs.patch
-PatchFile-MD5: 904951c57a5805f9e093e6cc10b64250
+PatchFile-MD5: 6f63a00b02f0274c27e8753a3044e342
PatchScript: <<
### Fix layout
perl -pi -e 's,/usr/local,%p,g' config.layout
%{default_script}
- perl -pi -e 's/db50/db51/; s/db-5.0/db-5.1/' configure
<<
UseMaxBuildJobs: false
@@ -41,9 +41,11 @@
--with-ldap-include=%p/include \
--with-ldap-lib=%p/lib \
--with-ldap \
- --with-dbm=db51 \
+ --with-dbm=db \
--with-gdbm=%p \
--with-berkeley-db=%p \
+ --with-crypto \
+ --with-openssl=%p/lib/system-openssl \
--without-pgsql \
--without-mysql \
--without-sqlite2 \
@@ -62,8 +64,6 @@
InstallScript: <<
make install-modules prefix=%i APU_MODULES=dbd/apr_dbd_sqlite3.la
- #No need for dependency_libs in .la files if not building static libs
- perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/lib/apr-util-1/*la
<<
DocFiles: CHANGES LICENSE NOTICE README
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
