Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17838
Modified Files:
libaprutil.0-mysql.info libaprutil.0-odbc.info
libaprutil.0-postgresql.info libaprutil.0-shlibs.info
libaprutil.0-shlibs.patch libaprutil.0-sqlite2.info
libaprutil.0-sqlite3.info
Removed Files:
libaprutil.0-odbc.patch libaprutil.0-sqlite2.patch
Log Message:
New upstream libaprutil.0 1.5.1.
--- libaprutil.0-sqlite2.patch DELETED ---
Index: libaprutil.0-shlibs.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libaprutil.0-shlibs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libaprutil.0-shlibs.patch 18 Jan 2012 23:59:48 -0000 1.3
+++ libaprutil.0-shlibs.patch 30 Dec 2012 12:36:00 -0000 1.4
@@ -33,35 +33,6 @@
;;
--ldap-libs)
flags="$flags $LDAP_LIBS"
-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 ""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="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
-@@ -12946,7 +12946,7 @@
- apu_try_berkeley_db_save_libs="$LIBS"
-
- apu_check_berkeley_db_major="5"
-- 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.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
Index: libaprutil.0-sqlite2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libaprutil.0-sqlite2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libaprutil.0-sqlite2.info 8 Mar 2012 19:00:19 -0000 1.1
+++ libaprutil.0-sqlite2.info 30 Dec 2012 12:36:00 -0000 1.2
@@ -1,5 +1,5 @@
Package: libaprutil.0-sqlite2
-Version: 1.3.12
+Version: 1.5.1
Revision: 1
Depends: <<
@@ -8,14 +8,15 @@
sqlite-shlibs
<<
BuildDepends: <<
- db51-aes | db51,
+ db53-aes,
expat1,
fink (>= 0.24.12),
gdbm3,
- libapr.0-dev (>= 1.4.5-1),
+ libapr.0-dev (>= 1.4.6-1),
libaprutil.0-dev (>= %v-%r),
libiconv-dev,
openldap24-dev,
+ openssl100-dev (>= 1.0.1c-1),
pkgconfig,
sqlite-dev
<<
@@ -23,10 +24,10 @@
# a transient libaprutil0-shlibs accidentally installed something else at the
install_name location
Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 0f671b037ca62751a8a7005578085560
+Source-MD5: 9c1db8606e520f201c451ec9a0b095f6
-PatchFile: %n.patch
-PatchFile-MD5: 6d23b40b503e2a91033803b510f74298
+PatchFile: libaprutil.0-shlibs.patch
+PatchFile-MD5: eb4274f2998a4146164237056265fa6e
PatchScript: <<
### Fix layout
perl -pi -e 's,/usr/local,%p,g' config.layout
@@ -40,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 \
--without-pgsql \
--without-mysql \
--with-sqlite2=%p \
@@ -60,9 +63,7 @@
<<
InstallScript: <<
- make install-modules prefix=%i APU_MODULES=dbd/apr_dbd_sqlite2.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
+ make install-modules prefix=%i APU_MODULES=dbd/apr_dbd_sqlite3.la
<<
DocFiles: CHANGES LICENSE NOTICE README
Index: libaprutil.0-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libaprutil.0-shlibs.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libaprutil.0-shlibs.info 18 Jan 2012 23:59:48 -0000 1.5
+++ libaprutil.0-shlibs.info 30 Dec 2012 12:36:00 -0000 1.6
@@ -1,25 +1,26 @@
Package: libaprutil.0-shlibs
-Version: 1.4.1
+Version: 1.5.1
Revision: 1
Depends: <<
db53-aes-shlibs,
expat1-shlibs,
gdbm3-shlibs,
- libapr.0-shlibs (>= 1.4.5-1),
+ libapr.0-shlibs (>= 1.4.6-1),
libiconv,
- openldap24-shlibs
+ openldap24-shlibs,
+ openssl100-shlibs (>= 1.0.1c-1)
<<
BuildDepends: <<
db53-aes,
expat1,
fink (>= 0.24.12),
gdbm3,
- libapr.0-dev (>= 1.4.5-1),
+ libapr.0-dev (>= 1.4.6-1),
libiconv-dev,
openldap24-dev,
- pkgconfig,
- system-openssl-dev
+ openssl100-dev (>= 1.0.1c-1),
+ pkgconfig
<<
Replaces: libaprutil0-shlibs
# a transient libaprutil0-shlibs accidentally installed something else at the
install_name location
@@ -27,10 +28,10 @@
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: 52b31b33fb1aa16e65ddaefc76e41151
+Source-MD5: 9c1db8606e520f201c451ec9a0b095f6
PatchFile: %n.patch
-PatchFile-MD5: 6f63a00b02f0274c27e8753a3044e342
+PatchFile-MD5: eb4274f2998a4146164237056265fa6e
PatchScript: <<
### Fix layout
perl -pi -e 's,/usr/local,%p,g' config.layout
@@ -48,7 +49,7 @@
--with-gdbm=%p \
--with-berkeley-db=%p \
--with-crypto \
- --with-openssl=%p/lib/system-openssl \
+ --with-openssl=%p \
--without-pgsql \
--without-mysql \
--without-sqlite2 \
@@ -69,7 +70,7 @@
DocFiles: CHANGES LICENSE NOTICE README
Shlibs: <<
- %p/lib/libaprutil.0.dylib 5.0.0 %n (>= 1.4.1-4)
+ %p/lib/libaprutil.0.dylib 6.0.0 %n (>= 1.5.1-1)
<<
SplitOff: <<
Index: libaprutil.0-odbc.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libaprutil.0-odbc.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libaprutil.0-odbc.info 8 Mar 2012 19:00:19 -0000 1.1
+++ libaprutil.0-odbc.info 30 Dec 2012 12:36:00 -0000 1.2
@@ -1,5 +1,5 @@
Package: libaprutil.0-odbc
-Version: 1.3.12
+Version: 1.5.1
Revision: 1
Depends: <<
@@ -8,25 +8,26 @@
unixodbc2-shlibs | unixodbc2-nox-shlibs
<<
BuildDepends: <<
- db51-aes | db51,
+ db53-aes,
expat1,
fink (>= 0.24.12),
gdbm3,
- libapr.0-dev (>= 1.4.5-1),
+ libapr.0-dev (>= 1.4.6-1),
libaprutil.0-dev (>= %v-%r),
libiconv-dev,
openldap24-dev,
+ openssl100-dev (>= 1.0.1c-1),
pkgconfig,
- unixodbc2 | unixodbc2-nox
+ unixodbc2-dev | unixodbc2-nox-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: 0f671b037ca62751a8a7005578085560
+Source-MD5: 9c1db8606e520f201c451ec9a0b095f6
-PatchFile: %n.patch
-PatchFile-MD5: 6d23b40b503e2a91033803b510f74298
+PatchFile: libaprutil.0-shlibs.patch
+PatchFile-MD5: eb4274f2998a4146164237056265fa6e
PatchScript: <<
### Fix layout
perl -pi -e 's,/usr/local,%p,g' config.layout
@@ -40,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 \
--without-pgsql \
--without-mysql \
--without-sqlite2 \
@@ -61,8 +64,6 @@
InstallScript: <<
make install-modules prefix=%i APU_MODULES=dbd/apr_dbd_odbc.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-mysql.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libaprutil.0-mysql.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libaprutil.0-mysql.info 18 Jan 2012 23:59:48 -0000 1.4
+++ libaprutil.0-mysql.info 30 Dec 2012 12:36:00 -0000 1.5
@@ -1,5 +1,5 @@
Package: libaprutil.0-mysql
-Version: 1.4.1
+Version: 1.5.1
Revision: 1
Depends: <<
@@ -12,22 +12,22 @@
expat1,
fink (>= 0.24.12),
gdbm3,
- libapr.0-dev (>= 1.4.5-1),
+ libapr.0-dev (>= 1.4.6-1),
libaprutil.0-dev (>= %v-%r),
libiconv-dev,
mysql-unified-dev,
openldap24-dev,
- pkgconfig,
- system-openssl-dev
+ openssl100-dev (>= 1.0.1c-1),
+ pkgconfig
<<
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: 52b31b33fb1aa16e65ddaefc76e41151
+Source-MD5: 9c1db8606e520f201c451ec9a0b095f6
PatchFile: libaprutil.0-shlibs.patch
-PatchFile-MD5: 6f63a00b02f0274c27e8753a3044e342
+PatchFile-MD5: eb4274f2998a4146164237056265fa6e
PatchScript: <<
### Fix layout
perl -pi -e 's,/usr/local,%p,g' config.layout
@@ -45,7 +45,7 @@
--with-gdbm=%p \
--with-berkeley-db=%p \
--with-crypto \
- --with-openssl=%p/lib/system-openssl \
+ --with-openssl=%p \
--without-pgsql \
--with-mysql=%p \
--without-sqlite2 \
Index: libaprutil.0-postgresql.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libaprutil.0-postgresql.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libaprutil.0-postgresql.info 18 Jan 2012 23:59:48 -0000 1.4
+++ libaprutil.0-postgresql.info 30 Dec 2012 12:36:00 -0000 1.5
@@ -1,33 +1,33 @@
Package: libaprutil.0-postgresql
-Version: 1.4.1
+Version: 1.5.1
Revision: 1
Depends: <<
libaprutil.0-shlibs (>= %v-%r),
openldap24-shlibs,
- postgresql90-shlibs
+ postgresql92-shlibs
<<
BuildDepends: <<
db53-aes,
expat1,
fink (>= 0.24.12),
gdbm3,
- libapr.0-dev (>= 1.4.5-1),
+ libapr.0-dev (>= 1.4.6-1),
libaprutil.0-dev (>= %v-%r),
libiconv-dev,
openldap24-dev,
+ openssl100-dev (>= 1.0.1c-1),
pkgconfig,
- postgresql90-dev,
- system-openssl-dev
+ postgresql92-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: 52b31b33fb1aa16e65ddaefc76e41151
+Source-MD5: 9c1db8606e520f201c451ec9a0b095f6
PatchFile: libaprutil.0-shlibs.patch
-PatchFile-MD5: 6f63a00b02f0274c27e8753a3044e342
+PatchFile-MD5: eb4274f2998a4146164237056265fa6e
PatchScript: <<
### Fix layout
perl -pi -e 's,/usr/local,%p,g' config.layout
@@ -45,7 +45,7 @@
--with-gdbm=%p \
--with-berkeley-db=%p \
--with-crypto \
- --with-openssl=%p/lib/system-openssl \
+ --with-openssl=%p \
--with-pgsql=%p \
--without-mysql \
--without-sqlite2 \
--- libaprutil.0-odbc.patch DELETED ---
Index: libaprutil.0-sqlite3.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libaprutil.0-sqlite3.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libaprutil.0-sqlite3.info 18 Jan 2012 23:59:48 -0000 1.4
+++ libaprutil.0-sqlite3.info 30 Dec 2012 12:36:00 -0000 1.5
@@ -1,5 +1,5 @@
Package: libaprutil.0-sqlite3
-Version: 1.4.1
+Version: 1.5.1
Revision: 1
Depends: <<
@@ -12,22 +12,22 @@
expat1,
fink (>= 0.24.12),
gdbm3,
- libapr.0-dev (>= 1.4.5-1),
+ libapr.0-dev (>= 1.4.6-1),
libaprutil.0-dev (>= %v-%r),
libiconv-dev,
openldap24-dev,
+ openssl100-dev (>= 1.0.1c-1),
pkgconfig,
- sqlite3-dev,
- system-openssl-dev
+ sqlite3-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: 52b31b33fb1aa16e65ddaefc76e41151
+Source-MD5: 9c1db8606e520f201c451ec9a0b095f6
PatchFile: libaprutil.0-shlibs.patch
-PatchFile-MD5: 6f63a00b02f0274c27e8753a3044e342
+PatchFile-MD5: eb4274f2998a4146164237056265fa6e
PatchScript: <<
### Fix layout
perl -pi -e 's,/usr/local,%p,g' config.layout
@@ -45,7 +45,7 @@
--with-gdbm=%p \
--with-berkeley-db=%p \
--with-crypto \
- --with-openssl=%p/lib/system-openssl \
+ --with-openssl=%p \
--without-pgsql \
--without-mysql \
--without-sqlite2 \
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_123012
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
