Bump up to 1.4.1.

New packages for OpenSSL and NSS crypto support.
This commit is contained in:
Bojan Smojver 2011-12-15 10:25:56 +11:00
parent e3fac272af
commit f508ce4aff
6 changed files with 45 additions and 21 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ apr-util-1.3.9.tar.bz2
/.build*.log
/apr-util-1.3.11.tar.bz2
/apr-util-1.3.12.tar.bz2
/apr-util-1.4.1.tar.bz2

View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iQIcBAABCgAGBQJN1TAWAAoJEOxYLrY5/wksk8oQALjjEvTXg+CkqcOfm/7FIW/m
3Wo9KOx059HrPi9/D3aYkxZPOUEv2V+uTXaU4b7pe8wQ6MOPGGkwIiPJhxz6V8Og
Z5xsxFuZTfY/gwG+9O/b9a77jGcVY9QJh5740UzwDRiVA0IsIDg5uRwfEWkxyle4
l+aYwKBF4f4VPvgB8bo3ORjBFCybr2/BuAuUzVZhwKua8nN2lSN7QfR7nJFL88AC
ilOCF4crMhuF6jTPVc079lzOynHGIjkIdjDlZRRjWNyFPtF/4Ad1YKG6n5RoEAcS
zTiPPElzS3yHeBAwfBw4xlpfrdGZin5KP1yqUYjYQnxDwG2fxXSmAKULVW3+YCFy
JCysHZ224yJFde2IpJhP6R4QWMayfyAL19HwtmP4XFKRWsgkZVCOtgNd80ptjf7N
uiRJqn/6Cbo0mP8sCho4PRwi0BLpqPK4nKs5S4j50UwV97jEjKc1X1EDVuymPLb2
AB7U0di3KpTlXd5zNpsiYEcPOI7jOlkeZFTdRDZru+9fCVKDD2pYJztkfU3WMmSP
P19JeH+iPLVmptEQ5CyX1eEWhxUF4Jc8GZhH/t2qFsySRJK80lTmq7cuTxWhw+or
dBFcJTDyqWRJnFVxy6ZRBG6QZF5jndhQjWYc3Yf/p+bx3iQJW9WhqH3iY0GXxpeW
j/I2UjdHZ1P01JvHAV2x
=Tw0d
-----END PGP SIGNATURE-----

View File

@ -27,12 +27,13 @@
test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_init.lo"
test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_option.lo"
test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_rebind.lo"
@@ -65,10 +85,8 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
fi
@@ -81,11 +81,9 @@
APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_crypto_openssl $LDADD_crypto_nss"
APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds $LDADD_dbd_odbc"
- APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_ldap"
APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_crypto_openssl $LDADD_crypto_nss"
APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds $LDADD_dbd_odbc"
- APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_ldap"

View File

@ -0,0 +1,8 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
Comment: GPGTools - http://gpgtools.org
iEYEABECAAYFAk7f7loACgkQNEqETXUdfyfQtwCePykrvmWzOLE4E0mIIHbWDhzW
cdUAn2rBabd2Ab1HSDArwjow6B8hMGal
=n6ut
-----END PGP SIGNATURE-----

View File

@ -3,7 +3,7 @@
Summary: Apache Portable Runtime Utility library
Name: apr-util
Version: 1.3.12
Version: 1.4.1
Release: 1%{?dist}
License: ASL 2.0
Group: System Environment/Libraries
@ -92,6 +92,24 @@ Requires: apr-util = %{version}-%{release}
%description ldap
This package provides the LDAP support for the apr-util.
%package openssl
Group: Development/Libraries
Summary: APR utility library OpenSSL crytpo support
BuildRequires: openssl-devel
Requires: apr-util = %{version}-%{release}
%description openssl
This package provides the OpenSSL crypto support for the apr-util.
%package nss
Group: Development/Libraries
Summary: APR utility library NSS crytpo support
BuildRequires: nss-devel
Requires: apr-util = %{version}-%{release}
%description nss
This package provides the NSS crypto support for the apr-util.
%prep
%setup -q
%patch1 -p1 -b .pkgconf
@ -107,7 +125,8 @@ export ac_cv_ldap_set_rebind_proc_style=three
--with-ldap --without-gdbm \
--with-sqlite3 --with-pgsql --with-mysql --with-freetds --with-odbc \
--with-berkeley-db \
--without-sqlite2
--without-sqlite2 \
--with-crypto --with-openssl --with-nss
make %{?_smp_mflags}
%install
@ -181,6 +200,14 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_libdir}/apr-util-%{apuver}/apr_ldap*
%files openssl
%defattr(-,root,root,-)
%{_libdir}/apr-util-%{apuver}/apr_crypto_openssl*
%files nss
%defattr(-,root,root,-)
%{_libdir}/apr-util-%{apuver}/apr_crypto_nss*
%files devel
%defattr(-,root,root,-)
%{_bindir}/apu-%{apuver}-config
@ -191,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/*.m4
%changelog
* Thu Dec 15 2011 Bojan Smojver <bojan@rexursive.com> - 1.4.1-1
- bump up to 1.4.1
* Fri May 20 2011 Bojan Smojver <bojan@rexursive.com> - 1.3.12-1
- bump up to 1.3.12

View File

@ -1 +1,2 @@
0f671b037ca62751a8a7005578085560 apr-util-1.3.12.tar.bz2
52b31b33fb1aa16e65ddaefc76e41151 apr-util-1.4.1.tar.bz2