- fix most critical build warnings (#433583)

- use external db4
This commit is contained in:
Tomáš Mráz 2008-09-10 13:44:15 +00:00
parent da64ac9b23
commit 57b2bbb8b3

View File

@ -1,11 +1,10 @@
%define _plugindir2 %{_libdir}/sasl2
%define db_version 4.7.25
%define bootstrap_cyrus_sasl 0
Summary: The Cyrus SASL library
Name: cyrus-sasl
Version: 2.1.22
Release: 17%{?dist}
Release: 18%{?dist}
License: BSD
Group: System Environment/Libraries
# Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@ -13,7 +12,6 @@ Group: System Environment/Libraries
# new tarball.
Source0: cyrus-sasl-%{version}-nodlcompatorsrp.tar.gz
Source4: saslauthd.init
Source6: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
Source7: sasl-mechlist.c
Source8: sasl-checkpass.c
Source9: saslauthd.sysconfig
@ -30,10 +28,13 @@ Patch27: cyrus-sasl-2.1.22-automake-1.10.patch
Patch28: cyrus-sasl-2.1.21-keytab.patch
Patch30: cyrus-sasl-2.1.22-rimap.patch
Patch31: cyrus-sasl-2.1.22-kerberos4.patch
Patch32: cyrus-sasl-2.1.22-warnings.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig
BuildRequires: mysql-devel, postgresql-devel, zlib-devel
BuildRequires: db4-devel
%if ! %{bootstrap_cyrus_sasl}
BuildRequires: openldap-devel
%endif
@ -131,10 +132,10 @@ The %{name}-krb4 package contains the Cyrus SASL plugins which
support Kerberos 4 authentication.
%prep
%setup -q -a 6
%setup -q
chmod -x doc/*.html
chmod -x include/*.h
%patch10 -p1 -b .db_bundle
#%patch10 -p1 -b .db_bundle
%patch11 -p1 -b .no_rpath
%patch15 -p1 -b .path
%patch24 -p1 -b .sizes
@ -144,6 +145,7 @@ chmod -x include/*.h
%patch28 -p1 -b .keytab
%patch30 -p1 -b .rimap
%patch31 -p1 -b .krb4
%patch32 -p1 -b .warnings
# FIXME - we remove these files directly so that we can avoid using the -f
# flag, which has a nasty habit of overwriting files like COPYING.
@ -170,19 +172,6 @@ popd
%build
CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
# Bundling copy of Berkeley DB, for sasldb support.
topdir=`pwd`
pushd db-%{db_version}/build_unix
../dist/configure \
--with-mutex=UNIX/fcntl --disable-shared --enable-static --with-pic \
--with-uniquename=_cyrus_sasl_sasldb_rh \
--prefix=${topdir}/db-instroot \
--includedir=${topdir}/db-instroot/include \
--libdir=${topdir}/db-instroot/lib
make
make install
popd
# Find Kerberos.
krb5_prefix=`krb5-config --prefix`
if test x$krb5_prefix = x%{_prefix} ; then
@ -234,8 +223,6 @@ LDFLAGS=`echo $LDFLAGS $SQL_LDFLAGS | cleanup_flags`; export LDFLAGS
--with-gss_impl=mit \
--with-rc4 \
--with-dblib=berkeley \
--with-bdb-incdir=${topdir}/db-instroot/include \
--with-bdb-libdir=${topdir}/db-instroot/lib \
--with-saslauthd=/var/run/saslauthd --without-pwcheck \
%if ! %{bootstrap_cyrus_sasl}
--with-ldap \
@ -393,6 +380,10 @@ fi
%{_sbindir}/sasl2-shared-mechlist
%changelog
* Wed Sep 29 2008 Tomas Mraz <tmraz@redhat.com> - 2.1.22-18
- fix most critical build warnings (#433583)
- use external db4
* Fri Aug 29 2008 Tomas Mraz <tmraz@redhat.com> - 2.1.22-17
- always link against the internal db4 (#459163)
- rediff patches for no fuzz