- merged 1.6.0 from PLD

diff --git a/apr-util-db.patch b/apr-util-db.patch
deleted file mode 100644 (file)
index 72f5dcf..0000000
--- a/apr-util-db.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c.orig       2008-11-21 09:22:35.000000000 +0100
-+++ apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c    2010-05-21 09:34:59.958939260 +0200
-@@ -37,7 +37,9 @@
-  * DB_185, DB2, DB3, and DB4.
-  */
- 
--#if   defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
-+#if   defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR > 4)
-+#define DB_VER 4
-+#elif   defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
- /* We will treat anything greater than 4.1 as DB4.
-  * We can treat 4.0 as DB3.
-  */
---- apr-util-1.3.9/build/dbm.m4.orig   2008-11-21 07:32:58.000000000 +0100
-+++ apr-util-1.3.9/build/dbm.m4        2010-05-21 09:40:46.866935908 +0200
-@@ -112,7 +112,7 @@
-         changequote([,])
-         unset $cache_id
-         AC_CHECK_HEADER([$bdb_header], [
--          if test "$1" = "3" -o "$1" = "4"; then
-+          if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then
-             # We generate a separate cache variable for each prefix and libname
-             # we search under.  That way, we avoid caching information that
-             # changes if the user runs `configure' with a different set of
-@@ -522,6 +522,44 @@
-     apu_db_version=4
-   fi
- ])
-+dnl
-+dnl APU_CHECK_DB48: is DB4.8 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB48], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.4.8 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("4", "8", "-1",
-+    "$places",
-+    "db48/db.h db4/db.h db.h",
-+    "db-4.8 db4-4.8 db48 db4 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=4
-+  fi
-+])
-+dnl
-+dnl APU_CHECK_DB50: is DB5.0 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB50], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.5.0 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("5", "0", "-1",
-+    "$places",
-+    "db50/db.h db5/db.h db.h",
-+    "db-5.0 db5-5.0 db50 db5 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=5
-+  fi
-+])
- 
- AC_DEFUN([APU_CHECK_DB], [
-   requested=$1
-@@ -606,6 +644,18 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db48)
-+    APU_CHECK_DB48("$check_places")
-+    if test "$apu_db_version" != "4"; then
-+      AC_MSG_ERROR(Berkeley db4 not found)
-+    fi
-+    ;;
-+  db50)
-+    APU_CHECK_DB50("$check_places")
-+    if test "$apu_db_version" != "5"; then
-+      AC_MSG_ERROR(Berkeley db5 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -618,6 +668,10 @@
- AC_DEFUN([APU_CHECK_DB_ALL], [
-   all_places=$1
-  
-+  APU_CHECK_DB50("$all_places")
-+  if test "$apu_db_version" != "5"; then
-+  APU_CHECK_DB48("$all_places")
-+  if test "$apu_db_version" != "4"; then
-   APU_CHECK_DB47("$all_places")
-   if test "$apu_db_version" != "4"; then
-     APU_CHECK_DB46("$all_places")
-@@ -652,6 +706,8 @@
-       fi
-     fi
-   fi
-+  fi
-+  fi
-   AC_MSG_CHECKING(for Berkeley DB)
-   if test "$apu_have_db" = "1"; then
-     AC_MSG_RESULT(found db$apu_db_version)
-@@ -679,11 +735,11 @@
-   apu_db_version=0
- 
-   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])],
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50}])],
-   [
-     if test "$withval" = "yes"; then
-       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
--        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47,db48,db50])
-     fi
-     requested="$withval"
-   ], [
-@@ -882,6 +938,14 @@
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;
-+    db48)
-+      apu_use_db=1
-+      apu_default_dbm=db4
-+      ;;
-+    db50)
-+      apu_use_db=1
-+      apu_default_dbm=db5
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -889,7 +953,7 @@
-       ;;
-     *)
-       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
--        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
-       ;;
-   esac
- 

diff --git a/apr-util-link.patch b/apr-util-link.patch
index eaa9b7b2dd6c6d95b8dd6eca8e956544446f4ea1..d85fac44510db8bdea7809022845f170c891483e 100644 (file)
--- a/apr-util-link.patch
+++ b/apr-util-link.patch
@@ -13,3 +13,17 @@
  AC_MSG_CHECKING(if system crypt() function is threadsafe)
  if test "x$apu_crypt_threadsafe" = "x1"; then
    AC_DEFINE(APU_CRYPT_THREADSAFE, 1, [Define if the system crypt() function is threadsafe])
+--- apr-util-1.5.4/configure.in~       2016-04-08 22:47:59.000000000 +0200
++++ apr-util-1.5.4/configure.in        2016-04-08 22:50:43.902956204 +0200
+@@ -227,6 +227,11 @@ AC_SUBST(APRUTIL_EXPORT_LIBS)
+ AC_SUBST(APRUTIL_PRIV_INCLUDES)
+ APRUTIL_INCLUDES="$APRUTIL_INCLUDES -I/usr/include/apr"
+ AC_SUBST(APRUTIL_INCLUDES)
++
++APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib])
++APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib32])
++APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib64])
++
+ AC_SUBST(APRUTIL_LDFLAGS)
+ AC_SUBST(APRUTIL_LIBS)
+ AC_SUBST(LDFLAGS)

diff --git a/apr-util.spec b/apr-util.spec
index 58baf34984b2c5d54913478b882ad189a70842e2..c92929421810296f35663aa0396543f54ee1ecfe 100644 (file)
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -1,6 +1,7 @@
+# NOTE: drop freetds bcond if/when upstream removes the rest of dbd-freetds code
 #
 # Conditional build:
-%bcond_without freetds # without FreeTDS (sybdb) DBD module
+%bcond_with    freetds # without FreeTDS (sybdb) DBD module [unsupported since 1.6.0]
 %bcond_without mysql   # without MySQL DBD module
 %bcond_without odbc    # without ODBC DBD module
 %bcond_with    oracle  # with Oracle DBD module (BR: proprietary libs)
@@ -12,36 +13,26 @@
 %bcond_without openssl # without OpenSSL crypto module
 %bcond_without tests   # don't perform "make check"
 
-%define        dbver   db45
-
-# tests fail on x32
-%ifarch x32
-%undefine      with_nss
-%endif
-
-# files list broken, feel free to really fix
-%ifarch alpha
-%undefine      with_mysql
-%endif
+%define        dbver   db47
 
 Summary:       A companion library to Apache Portable Runtime
 Summary(pl.UTF-8):     Biblioteka towarzysząca Apache Portable Runtime
 Name:          apr-util
-Version:       1.5.4
+Version:       1.6.0
 Release:       2
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries
 Source0:       http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5: 2202b18f269ad606d70e1864857ed93c
+# Source0-md5: 069a9a980776acab05212c5f37ef8368
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-config-noldap.patch
 Patch2:                %{name}-libtool.patch
 Patch3:                %{name}-flags.patch
 URL:           http://apr.apache.org/
-BuildRequires: apr-devel >= 1:1.3.0
+BuildRequires: apr-devel >= 1:1.6.0
 BuildRequires: autoconf >= 2.59
-BuildRequires: db-devel >= 4.5
+BuildRequires: db-devel >= 4.7
 BuildRequires: expat-devel
 %{?with_freetds:BuildRequires: freetds-devel}
 BuildRequires: libtool
@@ -55,7 +46,8 @@ BuildRequires:        rpm >= 4.4.9-56
 %{?with_sqlite3:BuildRequires: sqlite3-devel >= 3}
 %{?with_odbc:BuildRequires:    unixODBC-devel}
 BuildRequires: which
-Requires:      apr >= 1:1.3.0
+Requires:      apr >= 1:1.6.0
+%{!?with_freetds:Obsoletes:    apr-util-dbd-freetds}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _includedir     /usr/include/apr-util
@@ -206,7 +198,7 @@ Summary:    Header files and development documentation for apr-util
 Summary(pl.UTF-8):     Pliki nagłówkowe i dokumentacja programisty do apr-util
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      apr-devel >= 1:1.3.0
+Requires:      apr-devel >= 1:1.6.0
 Requires:      expat-devel
 
 %description devel
@@ -234,9 +226,6 @@ Statyczna biblioteka apr-util.
 %patch2 -p1
 %patch3 -p1
 
-# ensure system expat is used
-%{__rm} -r xml/expat
-
 echo '
 <Layout TLD>
     prefix:        %{_prefix}