rpms/cyrus-sasl/devel cyrus-sasl-2.1.22-db_bundle.patch, 1.1, 1.2 cyrus-sasl-2.1.22-kerberos4.patch, 1.1, 1.2 cyrus-sasl.spec, 1.70, 1.71

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29084

Modified Files:
	cyrus-sasl-2.1.22-db_bundle.patch 
	cyrus-sasl-2.1.22-kerberos4.patch cyrus-sasl.spec 
Log Message:
* Fri Aug 29 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-17
- always link against the internal db4 (#459163)
- rediff patches for no fuzz


cyrus-sasl-2.1.22-db_bundle.patch:

Index: cyrus-sasl-2.1.22-db_bundle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl-2.1.22-db_bundle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyrus-sasl-2.1.22-db_bundle.patch	22 May 2006 21:22:11 -0000	1.1
+++ cyrus-sasl-2.1.22-db_bundle.patch	29 Aug 2008 10:47:03 -0000	1.2
@@ -1,9 +1,10 @@
 Use TRY_LINK instead of CHECK_LIB and try linking with plain old -ldb to
 properly pick up uniq'ified single-use DB.
 
---- cyrus-sasl-2.1.22/cmulocal/berkdb.m4	2005-04-26 15:14:07.000000000 -0400
-+++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4	2006-05-19 16:33:52.000000000 -0400
-@@ -31,41 +31,22 @@
+diff -up cyrus-sasl-2.1.22/cmulocal/berkdb.m4.db_bundle cyrus-sasl-2.1.22/cmulocal/berkdb.m4
+--- cyrus-sasl-2.1.22/cmulocal/berkdb.m4.db_bundle	2005-04-26 21:14:07.000000000 +0200
++++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4	2008-08-29 11:58:37.000000000 +0200
+@@ -31,41 +31,22 @@ AC_DEFUN([CMU_DB_INC_WHERE], [
  # Test for lib files
  #
  
@@ -50,14 +51,15 @@
        if test "$ac_cv_found_db_lib" = "yes" ; then
          ac_cv_db_where_lib=$i
          AC_MSG_RESULT(found)
---- cyrus-sasl-2.1.22/utils/Makefile.am	2006-05-19 16:33:52.000000000 -0400
-+++ cyrus-sasl-2.1.22/utils/Makefile.am	2006-05-19 16:34:20.000000000 -0400
-@@ -58,7 +58,7 @@
+diff -up cyrus-sasl-2.1.22/utils/Makefile.am.db_bundle cyrus-sasl-2.1.22/utils/Makefile.am
+--- cyrus-sasl-2.1.22/utils/Makefile.am.db_bundle	2006-05-18 20:34:26.000000000 +0200
++++ cyrus-sasl-2.1.22/utils/Makefile.am	2008-08-29 11:58:37.000000000 +0200
+@@ -58,7 +58,7 @@ endif
  
  saslpasswd2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
  saslpasswd2_SOURCES = saslpasswd.c
 -sasldblistusers2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
 +sasldblistusers2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) @SASL_DB_LIB@
  sasldblistusers2_SOURCES = sasldblistusers.c
- dbconverter_2_CFLAGS = -DSASL_GDBM
- dbconverter_2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs) -lgdbm
+ dbconverter_2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
+ pluginviewer_LDADD = $(all_sasl_libs)

cyrus-sasl-2.1.22-kerberos4.patch:

Index: cyrus-sasl-2.1.22-kerberos4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl-2.1.22-kerberos4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyrus-sasl-2.1.22-kerberos4.patch	1 Jul 2008 21:35:14 -0000	1.1
+++ cyrus-sasl-2.1.22-kerberos4.patch	29 Aug 2008 10:47:03 -0000	1.2
@@ -1,5 +1,17 @@
---- cyrus-sasl-2.1.22/plugins/kerberos4.c~	2005-01-10 02:08:53.000000000 -0500
-+++ cyrus-sasl-2.1.22/plugins/kerberos4.c	2007-05-14 13:02:16.000000000 -0400
+diff -up cyrus-sasl-2.1.22/config/kerberos_v4.m4.krb4 cyrus-sasl-2.1.22/config/kerberos_v4.m4
+--- cyrus-sasl-2.1.22/config/kerberos_v4.m4.krb4	2005-05-07 06:14:55.000000000 +0200
++++ cyrus-sasl-2.1.22/config/kerberos_v4.m4	2008-08-14 23:41:26.000000000 +0200
+@@ -102,7 +102,6 @@ AC_DEFUN([SASL_KERBEROS_V4_CHK], [
+        if test -n "${cyrus_krbinclude}"; then
+          CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
+        fi
+-       LDFLAGS="$LDFLAGS -L$krb4/lib"
+     fi
+ 
+     if test "$with_des" != no; then
+diff -up cyrus-sasl-2.1.22/plugins/kerberos4.c.krb4 cyrus-sasl-2.1.22/plugins/kerberos4.c
+--- cyrus-sasl-2.1.22/plugins/kerberos4.c.krb4	2005-01-10 08:08:53.000000000 +0100
++++ cyrus-sasl-2.1.22/plugins/kerberos4.c	2008-08-14 23:36:33.000000000 +0200
 @@ -49,11 +49,7 @@
  #include <krb.h>
  


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- cyrus-sasl.spec	9 Jul 2008 13:18:50 -0000	1.70
+++ cyrus-sasl.spec	29 Aug 2008 10:47:03 -0000	1.71
@@ -5,7 +5,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -393,6 +393,10 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri Aug 29 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-17
+- always link against the internal db4 (#459163)
+- rediff patches for no fuzz
+
 * Wed Jul  9 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-16
 - update internal db4 (#449737)