X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cyrus-sasl-split-sql.patch;h=2a15a9f2b6e90060764fcf36bbb67e4da08c522b;hb=a83cce40cc16df28eb5305c3b46bac6ec1094cd5;hp=da75a1a719c85bfab24c4bd715e01fc3a2394833;hpb=c8d3a85d80f1ba09818103634f9ad4dceea558bf;p=packages%2Fcyrus-sasl.git

diff --git a/cyrus-sasl-split-sql.patch b/cyrus-sasl-split-sql.patch
index da75a1a..2a15a9f 100644
--- a/cyrus-sasl-split-sql.patch
+++ b/cyrus-sasl-split-sql.patch
@@ -1,78 +1,93 @@
---- 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 @@
+--- cyrus-sasl-2.1.25/configure.in.orig	2011-09-17 08:56:00.724155985 +0200
++++ cyrus-sasl-2.1.25/configure.in	2011-09-17 09:03:48.277504973 +0200
+@@ -691,10 +691,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_SRCS="$SASL_STATIC_SRCS ../plugins/sql.c"
+-    SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/sql.c"
 -    SASL_STATIC_OBJS="$SASL_STATIC_OBJS sql.o"
      AC_DEFINE(STATIC_SQL,[],[Link SQL plugin staticly])
    fi
  else
-@@ -683,6 +680,8 @@
+@@ -741,6 +738,8 @@
  	CMU_ADD_LIBPATH_TO(${with_mysql}, LIB_MYSQL)
       fi
  
 +     SASL_MECHS="$SASL_MECHS libmysql.la"
-+     SASL_STATIC_OBJS="$SASL_STATIC_OBJS"
++     SASL_STATIC_OBJS="$SASL_STATIC_OBJS mysql.o"
       LIB_MYSQL_DIR=$LIB_MYSQL
       LIB_MYSQL="$LIB_MYSQL -lmysqlclient"
  
-@@ -747,6 +746,8 @@
+@@ -805,6 +804,8 @@
  	CMU_ADD_LIBPATH_TO(${with_pgsql}, LIB_PGSQL)
       fi
  
 +     SASL_MECHS="$SASL_MECHS libpgsql.la"
-+     SASL_STATIC_OBJS="$SASL_STATIC_OBJS"
++     SASL_STATIC_OBJS="$SASL_STATIC_OBJS pgsql.o"
       LIB_PGSQL_DIR=$LIB_PGSQL
       LIB_PGSQL="$LIB_PGSQL -lpq"
  
-@@ -808,6 +809,8 @@
+@@ -866,6 +867,8 @@
           LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
       fi
  
 +     SASL_MECHS="$SASL_MECHS libsqlite.la"
-+     SASL_STATIC_OBJS="$SASL_STATIC_OBJS"
++     SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite.o"
       LIB_SQLITE_DIR=$LIB_SQLITE
       LIB_SQLITE="$LIB_SQLITE -lsqlite"
  
---- 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 @@
+@@ -918,6 +921,8 @@
+          LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
+      fi
+ 
++     SASL_MECHS="$SASL_MECHS libsqlite3.la"
++     SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite3.o"
+      LIB_SQLITE3_DIR=$LIB_SQLITE3
+      LIB_SQLITE3="$LIB_SQLITE3 -lsqlite3"
+ 
+--- cyrus-sasl-2.1.25/plugins/Makefile.am.orig	2011-09-05 16:18:10.000000000 +0200
++++ cyrus-sasl-2.1.25/plugins/Makefile.am	2011-09-16 19:41:32.459226542 +0200
+@@ -66,7 +66,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 libpassdss.la libsasldb.la libsql.la libldapdb.la
-+	libntlm.la libpassdss.la libsasldb.la libmysql.la libpgsql.la libsqlite.la libldapdb.la
+ 	libgs2.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
+-	libscram.la libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
++	libscram.la libntlm.la libpassdss.la libsasldb.la libmysql.la libpgsql.la libsqlite.la libsqlite3.la libldapdb.la
  
  libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
- libplain_la_LDFLAGS = -version-info $(plain_version)
-@@ -147,17 +147,41 @@
+ libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
+@@ -129,18 +129,51 @@
  libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libldapdb_la_LIBADD = $(COMPAT_OBJS)
+ libldapdb_la_LIBADD = $(LIB_LDAP) $(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)
+-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) $(LIB_SQLITE3) \
+-	$(AM_LDFLAGS)
 -libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
 -libsql_la_LIBADD = $(COMPAT_OBJS)
 -
 +libmysql_la_SOURCES = mysql.c mysql_init.c $(common_sources)
-+libmysql_la_LDFLAGS = $(LIB_MYSQL)  -version-info $(sql_version)
++libmysql_la_LDFLAGS = $(LIB_MYSQL) $(AM_LDFLAGS)
 +libmysql_la_DEPENDENCIES = $(COMPAT_OBJS)
 +libmysql_la_LIBADD = $(COMPAT_OBJS)
 +
 +libpgsql_la_SOURCES = pgsql.c pgsql_init.c $(common_sources)
-+libpgsql_la_LDFLAGS = $(LIB_PGSQL) -version-info $(sql_version)
++libpgsql_la_LDFLAGS = $(LIB_PGSQL) $(AM_LDFLAGS)
 +libpgsql_la_DEPENDENCIES = $(COMPAT_OBJS)
 +libpgsql_la_LIBADD = $(COMPAT_OBJS)
 +
 +libsqlite_la_SOURCES = sqlite.c sqlite_init.c $(common_sources)
-+libsqlite_la_LDFLAGS = $(LIB_SQLITE) -version-info $(sql_version)
++libsqlite_la_LDFLAGS = $(LIB_SQLITE) $(AM_LDFLAGS)
 +libsqlite_la_DEPENDENCIES = $(COMPAT_OBJS)
 +libsqlite_la_LIBADD = $(COMPAT_OBJS)
 +
++libsqlite3_la_SOURCES = sqlite3.c sqlite3_init.c $(common_sources)
++libsqlite3_la_LDFLAGS = $(LIB_SQLITE3) $(AM_LDFLAGS)
++libsqlite3_la_DEPENDENCIES = $(COMPAT_OBJS)
++libsqlite3_la_LIBADD = $(COMPAT_OBJS)
++
 +mysql.c:
 +	sed -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g' -e 's#HAVE_SQLITE#HAVE_NO_SQLITE#g' \
 +		-e 's#sql_auxprop_plug_init#mysql_auxprop_plug_init#g' \
@@ -84,27 +99,32 @@
 +		sql.c > pgsql.c
 +
 +sqlite.c:
-+	sed -e 's#HAVE_MYSQL#HAVE_NO_MYSQL#g' -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g' \
++	sed -e 's#HAVE_MYSQL#HAVE_NO_MYSQL#g' -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g' -e 's#HAVE_SQLITE3#HAVE_NO_SQLITE3#g' \
 +		-e 's#sql_auxprop_plug_init#sqlite_auxprop_plug_init#g' \
 +		sql.c > sqlite.c
++
++sqlite3.c:
++	sed -e 's#HAVE_MYSQL#HAVE_NO_MYSQL#g' -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g' -e 's#HAVE_SQLITE$$#HAVE_NO_SQLITE#g' \
++		-e 's#sql_auxprop_plug_init#sqlite3_auxprop_plug_init#g' \
++		sql.c > sqlite3.c
  
  # Instructions for making the _init files
  
- init_src=anonymous_init.c crammd5_init.c digestmd5_init.c gssapiv2_init.c \
+ init_src=anonymous_init.c crammd5_init.c digestmd5_init.c scram_init.c gs2_init.c gssapiv2_init.c \
  kerberos4_init.c login_init.c plain_init.c srp_init.c otp_init.c ntlm_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
++passdss_init.c sasldb_init.c mysql_init.c pgsql_init.c sqlite_init.c sqlite3_init.c ldapdb_init.c
  
  
  CLEANFILES=$(init_src)
---- 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
+--- cyrus-sasl-2.1.25/plugins/makeinit.sh.orig	2011-05-11 21:25:55.000000000 +0200
++++ cyrus-sasl-2.1.25/plugins/makeinit.sh	2011-09-16 19:42:14.509227950 +0200
+@@ -47,7 +47,7 @@
  done
  
--for mech in sasldb sql ldapdb; do
-+for mech in sasldb mysql pgsql sqlite ldapdb; do
+ # auxprop plugins
+-for auxprop in sasldb sql ldapdb; do
++for auxprop in sasldb mysql pgsql sqlite sqlite3 ldapdb; do
  
  echo "
  #include <config.h>