]>
Commit | Line | Data |
---|---|---|
94e6777d JB |
1 | --- cyrus-sasl-2.1.25/configure.in.orig 2011-09-17 08:56:00.724155985 +0200 |
2 | +++ cyrus-sasl-2.1.25/configure.in 2011-09-17 09:03:48.277504973 +0200 | |
3 | @@ -691,10 +691,7 @@ | |
e4c21ce7 AM |
4 | AC_MSG_CHECKING(SQL) |
5 | if test "$sql" != no; then | |
6 | AC_MSG_RESULT(enabled) | |
7 | - SASL_MECHS="$SASL_MECHS libsql.la" | |
8 | if test "$enable_static" = yes; then | |
94e6777d | 9 | - SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/sql.c" |
c8d3a85d | 10 | - SASL_STATIC_OBJS="$SASL_STATIC_OBJS sql.o" |
e4c21ce7 AM |
11 | AC_DEFINE(STATIC_SQL,[],[Link SQL plugin staticly]) |
12 | fi | |
13 | else | |
94e6777d | 14 | @@ -741,6 +738,8 @@ |
e4c21ce7 AM |
15 | CMU_ADD_LIBPATH_TO(${with_mysql}, LIB_MYSQL) |
16 | fi | |
17 | ||
18 | + SASL_MECHS="$SASL_MECHS libmysql.la" | |
94e6777d | 19 | + SASL_STATIC_OBJS="$SASL_STATIC_OBJS mysql.o" |
e4c21ce7 AM |
20 | LIB_MYSQL_DIR=$LIB_MYSQL |
21 | LIB_MYSQL="$LIB_MYSQL -lmysqlclient" | |
22 | ||
94e6777d | 23 | @@ -805,6 +804,8 @@ |
e4c21ce7 AM |
24 | CMU_ADD_LIBPATH_TO(${with_pgsql}, LIB_PGSQL) |
25 | fi | |
26 | ||
27 | + SASL_MECHS="$SASL_MECHS libpgsql.la" | |
94e6777d | 28 | + SASL_STATIC_OBJS="$SASL_STATIC_OBJS pgsql.o" |
e4c21ce7 AM |
29 | LIB_PGSQL_DIR=$LIB_PGSQL |
30 | LIB_PGSQL="$LIB_PGSQL -lpq" | |
31 | ||
94e6777d | 32 | @@ -866,6 +867,8 @@ |
e4c21ce7 AM |
33 | LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}" |
34 | fi | |
35 | ||
36 | + SASL_MECHS="$SASL_MECHS libsqlite.la" | |
94e6777d | 37 | + SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite.o" |
e4c21ce7 AM |
38 | LIB_SQLITE_DIR=$LIB_SQLITE |
39 | LIB_SQLITE="$LIB_SQLITE -lsqlite" | |
40 | ||
94e6777d JB |
41 | @@ -918,6 +921,8 @@ |
42 | LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}" | |
43 | fi | |
44 | ||
45 | + SASL_MECHS="$SASL_MECHS libsqlite3.la" | |
46 | + SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite3.o" | |
47 | LIB_SQLITE3_DIR=$LIB_SQLITE3 | |
48 | LIB_SQLITE3="$LIB_SQLITE3 -lsqlite3" | |
49 | ||
50 | --- cyrus-sasl-2.1.25/plugins/Makefile.am.orig 2011-09-05 16:18:10.000000000 +0200 | |
51 | +++ cyrus-sasl-2.1.25/plugins/Makefile.am 2011-09-16 19:41:32.459226542 +0200 | |
52 | @@ -66,7 +66,7 @@ | |
e4c21ce7 AM |
53 | sasl_LTLIBRARIES = @SASL_MECHS@ |
54 | EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \ | |
94e6777d JB |
55 | libgs2.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \ |
56 | - libscram.la libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la | |
57 | + libscram.la libntlm.la libpassdss.la libsasldb.la libmysql.la libpgsql.la libsqlite.la libsqlite3.la libldapdb.la | |
e4c21ce7 AM |
58 | |
59 | libplain_la_SOURCES = plain.c plain_init.c $(common_sources) | |
94e6777d JB |
60 | libplain_la_DEPENDENCIES = $(COMPAT_OBJS) |
61 | @@ -129,18 +129,51 @@ | |
c8d3a85d | 62 | libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) |
94e6777d | 63 | libldapdb_la_LIBADD = $(LIB_LDAP) $(COMPAT_OBJS) |
e4c21ce7 AM |
64 | |
65 | -libsql_la_SOURCES = sql.c sql_init.c $(common_sources) | |
94e6777d JB |
66 | -libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) $(LIB_SQLITE3) \ |
67 | - $(AM_LDFLAGS) | |
e4c21ce7 AM |
68 | -libsql_la_DEPENDENCIES = $(COMPAT_OBJS) |
69 | -libsql_la_LIBADD = $(COMPAT_OBJS) | |
70 | - | |
71 | +libmysql_la_SOURCES = mysql.c mysql_init.c $(common_sources) | |
94e6777d | 72 | +libmysql_la_LDFLAGS = $(LIB_MYSQL) $(AM_LDFLAGS) |
e4c21ce7 AM |
73 | +libmysql_la_DEPENDENCIES = $(COMPAT_OBJS) |
74 | +libmysql_la_LIBADD = $(COMPAT_OBJS) | |
75 | + | |
76 | +libpgsql_la_SOURCES = pgsql.c pgsql_init.c $(common_sources) | |
94e6777d | 77 | +libpgsql_la_LDFLAGS = $(LIB_PGSQL) $(AM_LDFLAGS) |
e4c21ce7 AM |
78 | +libpgsql_la_DEPENDENCIES = $(COMPAT_OBJS) |
79 | +libpgsql_la_LIBADD = $(COMPAT_OBJS) | |
80 | + | |
81 | +libsqlite_la_SOURCES = sqlite.c sqlite_init.c $(common_sources) | |
94e6777d | 82 | +libsqlite_la_LDFLAGS = $(LIB_SQLITE) $(AM_LDFLAGS) |
e4c21ce7 AM |
83 | +libsqlite_la_DEPENDENCIES = $(COMPAT_OBJS) |
84 | +libsqlite_la_LIBADD = $(COMPAT_OBJS) | |
85 | + | |
94e6777d JB |
86 | +libsqlite3_la_SOURCES = sqlite3.c sqlite3_init.c $(common_sources) |
87 | +libsqlite3_la_LDFLAGS = $(LIB_SQLITE3) $(AM_LDFLAGS) | |
88 | +libsqlite3_la_DEPENDENCIES = $(COMPAT_OBJS) | |
89 | +libsqlite3_la_LIBADD = $(COMPAT_OBJS) | |
90 | + | |
e4c21ce7 AM |
91 | +mysql.c: |
92 | + sed -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g' -e 's#HAVE_SQLITE#HAVE_NO_SQLITE#g' \ | |
93 | + -e 's#sql_auxprop_plug_init#mysql_auxprop_plug_init#g' \ | |
94 | + sql.c > mysql.c | |
95 | + | |
96 | +pgsql.c: | |
97 | + sed -e 's#HAVE_MYSQL#HAVE_NO_MYSQL#g' -e 's#HAVE_SQLITE#HAVE_NO_SQLITE#g' \ | |
98 | + -e 's#sql_auxprop_plug_init#pgsql_auxprop_plug_init#g' \ | |
99 | + sql.c > pgsql.c | |
100 | + | |
101 | +sqlite.c: | |
94e6777d | 102 | + 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' \ |
e4c21ce7 AM |
103 | + -e 's#sql_auxprop_plug_init#sqlite_auxprop_plug_init#g' \ |
104 | + sql.c > sqlite.c | |
94e6777d JB |
105 | + |
106 | +sqlite3.c: | |
107 | + 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' \ | |
108 | + -e 's#sql_auxprop_plug_init#sqlite3_auxprop_plug_init#g' \ | |
109 | + sql.c > sqlite3.c | |
e4c21ce7 AM |
110 | |
111 | # Instructions for making the _init files | |
112 | ||
94e6777d | 113 | init_src=anonymous_init.c crammd5_init.c digestmd5_init.c scram_init.c gs2_init.c gssapiv2_init.c \ |
e4c21ce7 | 114 | kerberos4_init.c login_init.c plain_init.c srp_init.c otp_init.c ntlm_init.c \ |
c8d3a85d | 115 | -passdss_init.c sasldb_init.c sql_init.c ldapdb_init.c |
94e6777d | 116 | +passdss_init.c sasldb_init.c mysql_init.c pgsql_init.c sqlite_init.c sqlite3_init.c ldapdb_init.c |
e4c21ce7 AM |
117 | |
118 | ||
119 | CLEANFILES=$(init_src) | |
94e6777d JB |
120 | --- cyrus-sasl-2.1.25/plugins/makeinit.sh.orig 2011-05-11 21:25:55.000000000 +0200 |
121 | +++ cyrus-sasl-2.1.25/plugins/makeinit.sh 2011-09-16 19:42:14.509227950 +0200 | |
122 | @@ -47,7 +47,7 @@ | |
e4c21ce7 AM |
123 | done |
124 | ||
94e6777d JB |
125 | # auxprop plugins |
126 | -for auxprop in sasldb sql ldapdb; do | |
127 | +for auxprop in sasldb mysql pgsql sqlite sqlite3 ldapdb; do | |
e4c21ce7 AM |
128 | |
129 | echo " | |
130 | #include <config.h> |