- db 4.6 supported

[packages/cyrus-sasl.git] / cyrus-sasl-split-sql.patch

diff --git a/cyrus-sasl-split-sql.patch b/cyrus-sasl-split-sql.patch
index 7d281882e84dc25e2c0b5b02d9502e8e03e71d53..da75a1a719c85bfab24c4bd715e01fc3a2394833 100644 (file)
--- a/cyrus-sasl-split-sql.patch
+++ b/cyrus-sasl-split-sql.patch
@@ -1,17 +1,17 @@
-diff -urN cyrus-sasl-2.1.20.org/configure.in cyrus-sasl-2.1.20/configure.in
---- cyrus-sasl-2.1.20.org/configure.in 2004-10-24 22:05:13.000000000 +0200
-+++ cyrus-sasl-2.1.20/configure.in     2005-04-04 23:12:57.615789008 +0200
-@@ -584,9 +584,7 @@
+--- cyrus-sasl-2.1.21/configure.in.orig        2005-05-20 23:27:03.114432120 +0200
++++ cyrus-sasl-2.1.21/configure.in     2005-05-20 23:45:10.826074816 +0200
+@@ -633,10 +633,7 @@
  AC_MSG_CHECKING(SQL)
  if test "$sql" != no; then
    AC_MSG_RESULT(enabled)
 -  SASL_MECHS="$SASL_MECHS libsql.la"
    if test "$enable_static" = yes; then
--    SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/sql.o"
+-    SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sql.c"
+-    SASL_STATIC_OBJS="$SASL_STATIC_OBJS sql.o"
      AC_DEFINE(STATIC_SQL,[],[Link SQL plugin staticly])
    fi
  else
-@@ -633,6 +631,8 @@
+@@ -683,6 +680,8 @@
        CMU_ADD_LIBPATH_TO(${with_mysql}, LIB_MYSQL)
       fi
  
@@ -20,7 +20,7 @@ diff -urN cyrus-sasl-2.1.20.org/configure.in cyrus-sasl-2.1.20/configure.in
       LIB_MYSQL_DIR=$LIB_MYSQL
       LIB_MYSQL="$LIB_MYSQL -lmysqlclient"
  
-@@ -697,6 +697,8 @@
+@@ -747,6 +746,8 @@
        CMU_ADD_LIBPATH_TO(${with_pgsql}, LIB_PGSQL)
       fi
  
@@ -29,7 +29,7 @@ diff -urN cyrus-sasl-2.1.20.org/configure.in cyrus-sasl-2.1.20/configure.in
       LIB_PGSQL_DIR=$LIB_PGSQL
       LIB_PGSQL="$LIB_PGSQL -lpq"
  
-@@ -758,6 +760,8 @@
+@@ -808,6 +809,8 @@
           LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
       fi
  
@@ -38,21 +38,20 @@ diff -urN cyrus-sasl-2.1.20.org/configure.in cyrus-sasl-2.1.20/configure.in
       LIB_SQLITE_DIR=$LIB_SQLITE
       LIB_SQLITE="$LIB_SQLITE -lsqlite"
  
-diff -urN cyrus-sasl-2.1.20.org/plugins/Makefile.am cyrus-sasl-2.1.20/plugins/Makefile.am
---- cyrus-sasl-2.1.20.org/plugins/Makefile.am  2004-10-24 22:05:20.000000000 +0200
-+++ cyrus-sasl-2.1.20/plugins/Makefile.am      2005-04-04 23:22:49.454815800 +0200
-@@ -77,7 +77,7 @@
+--- cyrus-sasl-2.1.21/plugins/Makefile.am.orig 2005-05-07 06:54:18.000000000 +0200
++++ cyrus-sasl-2.1.21/plugins/Makefile.am      2005-05-20 23:53:09.158357256 +0200
+@@ -79,7 +79,7 @@
  sasl_LTLIBRARIES = @SASL_MECHS@
  EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
        libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
--      libntlm.la libsasldb.la libsql.la
-+      libntlm.la libsasldb.la libmysql.la libpgsql.la libsqlite.la
+-      libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
++      libntlm.la libpassdss.la libsasldb.la libmysql.la libpgsql.la libsqlite.la libldapdb.la
  
  libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
  libplain_la_LDFLAGS = -version-info $(plain_version)
-@@ -135,17 +135,41 @@
- libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
+@@ -147,17 +147,41 @@
+ libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libldapdb_la_LIBADD = $(COMPAT_OBJS)
  
 -libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
 -libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
@@ -93,20 +92,19 @@ diff -urN cyrus-sasl-2.1.20.org/plugins/Makefile.am cyrus-sasl-2.1.20/plugins/Ma
  
  init_src=anonymous_init.c crammd5_init.c digestmd5_init.c gssapiv2_init.c \
  kerberos4_init.c login_init.c plain_init.c srp_init.c otp_init.c ntlm_init.c \
--sasldb_init.c sql_init.c
-+sasldb_init.c mysql_init.c pgsql_init.c sqlite_init.c
+-passdss_init.c sasldb_init.c sql_init.c ldapdb_init.c
++passdss_init.c sasldb_init.c mysql_init.c pgsql_init.c sqlite_init.c ldapdb_init.c
  
  
  CLEANFILES=$(init_src)
-diff -urN cyrus-sasl-2.1.20.org/plugins/makeinit.sh cyrus-sasl-2.1.20/plugins/makeinit.sh
---- cyrus-sasl-2.1.20.org/plugins/makeinit.sh  2003-07-15 19:38:59.000000000 +0200
-+++ cyrus-sasl-2.1.20/plugins/makeinit.sh      2005-04-04 23:00:03.871750928 +0200
+--- cyrus-sasl-2.1.21/plugins/makeinit.sh.orig 2005-02-16 21:49:49.000000000 +0100
++++ cyrus-sasl-2.1.21/plugins/makeinit.sh      2005-05-20 23:53:28.019489928 +0200
 @@ -45,7 +45,7 @@
  " > ${mech}_init.c
  done
  
--for mech in sasldb sql ; do
-+for mech in sasldb mysql pgsql sqlite ; do
+-for mech in sasldb sql ldapdb; do
++for mech in sasldb mysql pgsql sqlite ldapdb; do
  
  echo "
  #include <config.h>