rpms/cyrus-sasl
7
0
Fork 0
Code Issues Pull Requests Releases Activity

cyrus-sasl-2.1.25-current-db.patch is not needed anymore, use of --with-bdb=db is enough

Browse Source
This commit is contained in:
Petr Lautrbach 2013-01-15 18:09:41 +01:00
parent 5c0901a6f3
commit 8d1ec7945f
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cyrus-sasl-2.1.25-current-db.patch
View File

@ -1,12 +0,0 @@
diff -up cyrus-sasl-2.1.25/cmulocal/berkdb.m4.current-db cyrus-sasl-2.1.25/cmulocal/berkdb.m4
--- cyrus-sasl-2.1.25/cmulocal/berkdb.m4.current-db 2010-01-22 16:12:01.000000000 +0100
+++ cyrus-sasl-2.1.25/cmulocal/berkdb.m4 2012-12-10 21:30:20.982219356 +0100
@@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
fi
saved_LIBS=$LIBS
- for dbname in ${with_bdb} db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+ for dbname in ${with_bdb} db db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
do
LIBS="$saved_LIBS -l$dbname"
AC_TRY_LINK([#include <stdio.h>

3
cyrus-sasl.spec
View File

@ -31,7 +31,6 @@ Patch27: cyrus-sasl-2.1.22-automake-1.10.patch
Patch28: cyrus-sasl-2.1.21-keytab.patch
Patch31: cyrus-sasl-2.1.22-kerberos4.patch
Patch32: cyrus-sasl-2.1.26-warnings.patch
Patch33: cyrus-sasl-2.1.25-current-db.patch
Patch34: cyrus-sasl-2.1.22-ldap-timeout.patch
# removed due to #759334
#Patch38: cyrus-sasl-2.1.23-pam_rhosts.patch
@ -170,7 +169,6 @@ chmod -x include/*.h
%patch24 -p1 -b .sizes
%patch31 -p1 -b .krb4
%patch32 -p1 -b .warnings
%patch33 -p1 -b .current-db
%patch34 -p1 -b .ldap-timeout
%patch42 -p1 -b .relro
%patch43 -p1 -b .null-crypt
@ -253,6 +251,7 @@ echo "$LDFLAGS"
--with-gss_impl=mit \
--with-rc4 \
--with-dblib=berkeley \
--with-bdb=db \
--with-saslauthd=/run/saslauthd --without-pwcheck \
%if ! %{bootstrap_cyrus_sasl}
--with-ldap \