--- /dev/null
+--- 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
+
--- /dev/null
+#
+# Conditional build:
+%bcond_without freetds # without FreeTDS (sybdb) DBD module
+%bcond_without mysql # without MySQL DBD module
+%bcond_without odbc # without ODBC DBD module
+%bcond_with oracle # with Oracle DBD module (BR: proprietary libs)
+%bcond_without pgsql # without PostgreSQL DBD module
+%bcond_with sqlite2 # with SQLite 2.x DBD module
+%bcond_without sqlite3 # without SQLite3 DBD module
+%bcond_without ldap # without LDAP module
+%bcond_without nss # without NSS crypto module
+%bcond_without openssl # without OpenSSL crypto module
+%bcond_without tests # don't perform "make check"
+
+# define dbver db50
+%if 0%{!?dbver:1}
+ %if "%{pld_release}" == "th"
+ %define dbver db53
+ %endif
+ %if "%{pld_release}" == "ac"
+ %define dbver db42
+ %endif
+%endif
+
+# tests fail on x32
+%ifarch x32
+%undefine with_nss
+%endif
+
+# files list broken, feel free to really fix
+%ifarch alpha
+%undefine with_mysql
+%endif
+
+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
+Release: 1
+Epoch: 1
+License: Apache v2.0
+Group: Libraries
+Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
+# Source0-md5: 2202b18f269ad606d70e1864857ed93c
+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: autoconf >= 2.59
+%if "%{pld_release}" == "th"
+BuildRequires: db-devel >= 4.7
+%endif
+%if "%{pld_release}" == "ac"
+BuildRequires: db-devel >= 4.2
+BuildConflicts: db4.5-devel
+%endif
+BuildRequires: expat-devel
+%{?with_freetds:BuildRequires: freetds-devel}
+BuildRequires: libtool
+%{?with_mysql:BuildRequires: mysql-devel}
+%{?with_nss:BuildRequires: nss-devel}
+%{?with_ldap:BuildRequires: openldap-devel >= 2.3.0}
+%{?with_openssl:BuildRequires: openssl-devel}
+%{?with_pgsql:BuildRequires: postgresql-devel}
+BuildRequires: rpm >= 4.4.9-56
+%{?with_sqlite2:BuildRequires: sqlite-devel >= 2}
+%{?with_sqlite3:BuildRequires: sqlite3-devel >= 3}
+%{?with_odbc:BuildRequires: unixODBC-devel}
+BuildRequires: which
+Requires: apr >= 1:1.3.0
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define _includedir /usr/include/apr-util
+
+%description
+A companion library to Apache Portable Runtime.
+
+%description -l pl.UTF-8
+Biblioteka towarzysząca dla biblioteki Apache Portable Runtime
+(przenośnej biblioteki uruchomieniowej).
+
+%package crypto-nss
+Summary: APR cryptographic module using Mozilla NSS library
+Summary(pl.UTF-8): Moduł kryptograficzny APR wykorzystujący bibliotekę Mozilla NSS
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description crypto-nss
+APR cryptographic module using Mozilla NSS library.
+
+%description crypto-nss -l pl.UTF-8
+Moduł kryptograficzny APR wykorzystujący bibliotekę Mozilla NSS.
+
+%package crypto-openssl
+Summary: APR cryptographic module using OpenSSL library
+Summary(pl.UTF-8): Moduł kryptograficzny APR wykorzystujący bibliotekę OpenSSL
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description crypto-openssl
+APR cryptographic module using OpenSSL library.
+
+%description crypto-openssl -l pl.UTF-8
+Moduł kryptograficzny APR wykorzystujący bibliotekę OpenSSL.
+
+%package dbd-freetds
+Summary: DBD driver for FreeTDS (Sybase/MS SQL)
+Summary(pl.UTF-8): Sterownik DBD dla FreeTDS (Sybase/MS SQL)
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-freetds
+DBD driver for FreeTDS (Sybase/MS SQL).
+
+%description dbd-freetds -l pl.UTF-8
+Sterownik DBD dla FreeTDS (Sybase/MS SQL).
+
+%package dbd-mysql
+Summary: DBD driver for MySQL
+Summary(pl.UTF-8): Sterownik DBD dla MySQL-a
+License: GPL
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-mysql
+DBD driver for MySQL.
+
+%description dbd-mysql -l pl.UTF-8
+Sterownik DBD dla MySQL-a.
+
+%package dbd-odbc
+Summary: DBD driver for ODBC
+Summary(pl.UTF-8): Sterownik DBD dla ODBC
+License: GPL
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-odbc
+DBD driver for ODBC.
+
+%description dbd-odbc -l pl.UTF-8
+Sterownik DBD dla ODBC.
+
+%package dbd-oracle
+Summary: DBD driver for Oracle
+Summary(pl.UTF-8): Sterownik DBD dla Oracle'a
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-oracle
+DBD driver for Oracle.
+
+%description dbd-oracle -l pl.UTF-8
+Sterownik DBD dla Oracle'a.
+
+%package dbd-pgsql
+Summary: DBD driver for PostgreSQL
+Summary(pl.UTF-8): Sterownik DBD dla PostgreSQL-a
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-pgsql
+DBD driver for PostgreSQL.
+
+%description dbd-pgsql -l pl.UTF-8
+Sterownik DBD dla PostgreSQL-a.
+
+%package dbd-sqlite2
+Summary: DBD driver for SQLite 2
+Summary(pl.UTF-8): Sterownik DBD dla SQLite 2
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-sqlite2
+DBD driver for SQLite 2.
+
+%description dbd-sqlite2 -l pl.UTF-8
+Sterownik DBD dla SQLite 2.
+
+%package dbd-sqlite3
+Summary: DBD driver for SQLite 3
+Summary(pl.UTF-8): Sterownik DBD dla SQLite 3
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-sqlite3
+DBD driver for SQLite 3.
+
+%description dbd-sqlite3 -l pl.UTF-8
+Sterownik DBD dla SQLite 3.
+
+%package dbm-db
+Summary: DBM driver for DB
+Summary(pl.UTF-8): Sterownik DBM dla DB
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dbm-db
+DBM driver for DB.
+
+%description dbm-db -l pl.UTF-8
+Sterownik DBM dla DB.
+
+%package ldap
+Summary: APR LDAP driver
+Summary(pl.UTF-8): Sterownik APR dla LDAP
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description ldap
+APR LDAP driver.
+
+%description ldap -l pl.UTF-8
+Sterownik APR dla LDAP.
+
+%package devel
+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: expat-devel
+
+%description devel
+Header files and development documentation for apr-util.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe i dokumentacja programisty do apr-util.
+
+%package static
+Summary: Static apr-util library
+Summary(pl.UTF-8): Statyczna biblioteka apr-util
+Group: Development/Libraries
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+
+%description static
+Static apr-util library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka apr-util.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+# ensure system expat is used
+%{__rm} -r xml/expat
+
+echo '
+<Layout PLD>
+ prefix: %{_prefix}
+ exec_prefix: %{_exec_prefix}
+ bindir: %{_bindir}
+ sbindir: %{_sbindir}
+ libdir: %{_libdir}
+ libexecdir: %{_libdir}/apr
+ mandir: %{_mandir}
+ sysconfdir: %{_sysconfdir}
+ datadir: %{_datadir}
+ installbuilddir: %{_datadir}/build
+ includedir: %{_includedir}
+ localstatedir: %{_localstatedir}
+ runtimedir: %{_localstatedir}/run
+ libsuffix: -${APRUTIL_MAJOR_VERSION}
+</Layout>
+' > config.layout
+
+%build
+./buildconf \
+ --with-apr=%{_datadir}/apr
+
+%configure \
+ --enable-layout=PLD \
+ --with-apr=%{_bindir}/apr-1-config \
+ --with-berkeley-db=%{_prefix} \
+ --with-crypto \
+ --with-dbm=%{dbver} \
+ --with-iconv=%{_prefix} \
+%if %{with ldap}
+ --with-ldap \
+ --with-ldap-include=%{_prefix}/include \
+ --with-ldap-lib=%{_libdir} \
+%endif
+ %{?with_nss:--with-nss} \
+ %{?with_openssl:--with-openssl} \
+ %{!?with_freetds:--without-freetds} \
+ %{?with_mysql:--with-mysql=%{_prefix}} \
+ %{!?with_odbc:--without-odbc} \
+ %{?with_oracle:--with-oracle} \
+ %{!?with_pgsql:--without-pgsql} \
+ %{!?with_sqlite2:--without-sqlite2} \
+ %{!?with_sqlite3:--without-sqlite3}
+
+%{__make} \
+ CC="%{__cc}"
+
+%{?with_tests:%{__make} -j1 check}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/apr-util-1/*.{la,a}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc CHANGES NOTICE README
+%attr(755,root,root) %{_libdir}/libaprutil-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libaprutil-1.so.0
+%dir %{_libdir}/apr-util-1
+
+%if %{with nss}
+%files crypto-nss
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_crypto_nss-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_crypto_nss.so
+%endif
+
+%if %{with openssl}
+%files crypto-openssl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_crypto_openssl-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_crypto_openssl.so
+%endif
+
+%if %{with freetds}
+%files dbd-freetds
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_freetds-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_freetds.so
+%endif
+
+%if %{with mysql}
+%files dbd-mysql
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_mysql-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_mysql.so
+%endif
+
+%if %{with odbc}
+%files dbd-odbc
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_odbc-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_odbc.so
+%endif
+
+%if %{with oracle}
+%files dbd-oracle
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_oracle-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_oracle.so
+%endif
+
+%if %{with pgsql}
+%files dbd-pgsql
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_pgsql-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_pgsql.so
+%endif
+
+%if %{with sqlite2}
+%files dbd-sqlite2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_sqlite2-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_sqlite2.so
+%endif
+
+%if %{with sqlite3}
+%files dbd-sqlite3
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_sqlite3-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_sqlite3.so
+%endif
+
+%files dbm-db
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbm_db-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbm_db.so
+
+%if %{with ldap}
+%files ldap
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_ldap-1.so
+%attr(755,root,root) %{_libdir}/apr-util-1/apr_ldap.so
+%endif
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/apu-1-config
+%attr(755,root,root) %{_libdir}/libaprutil-1.so
+%{_libdir}/libaprutil-1.la
+%{_libdir}/aprutil.exp
+%{_includedir}
+%{_pkgconfigdir}/apr-util-1.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libaprutil-1.a
TLD / packages / apr-util.git / commitdiff