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