Codebase list cyrus-sasl2 / f248c2c
Adapt patches to new CVS checkout Ondřej Surý 12 years ago
13 changed file(s) with 30 addition(s) and 204 deletion(s). Raw diff Collapse all Expand all
00 Author: Fabian Fagerholm <fabbe@debian.org>
11 Description: Use versioned symbols for libsasl2.
2 --- trunk.orig/lib/Makefile.am
3 +++ trunk/lib/Makefile.am
4 @@ -60,8 +60,8 @@
2 --- a/lib/Makefile.am
3 +++ b/lib/Makefile.am
4 @@ -62,8 +62,8 @@ LIB_DOOR= @LIB_DOOR@
55 lib_LTLIBRARIES = libsasl2.la
66
77 libsasl2_la_SOURCES = $(common_sources) $(common_headers)
1313
1414 if MACOSX
1515 --- /dev/null
16 +++ trunk/Versions
16 +++ b/Versions
1717 @@ -0,0 +1,7 @@
1818 +SASL2 {
1919 + global:
00 Author: Fabian Fagerholm <fabbe@debian.org>
11 Description: Rename the testsuite program to sasltestsuite and use /etc/sasldb2
22 instead of ./sasldb as default path for the sasldb database file.
3 --- trunk.orig/utils/testsuite.c
4 +++ trunk/utils/testsuite.c
5 @@ -464,9 +464,9 @@
3 --- a/utils/testsuite.c
4 +++ b/utils/testsuite.c
5 @@ -464,9 +464,9 @@ int good_getopt(void *context __attribut
66 *len = (unsigned) strlen("sasldb");
77 return SASL_OK;
88 } else if (!strcmp(option, "sasldb_path")) {
1414 return SASL_OK;
1515 } else if (!strcmp(option, "canon_user_plugin")) {
1616 *result = cu_plugin;
17 @@ -2925,7 +2925,7 @@
17 @@ -2926,7 +2926,7 @@ void notes(void)
1818 void usage(void)
1919 {
2020 printf("Usage:\n" \
00 Author: Fabian Fagerholm <fabbe@debian.org>
11 Description: Use the correct path for the saslauthd.conf file, and use another
22 date format (cosmetic).
3 --- trunk.orig/saslauthd/saslauthd.mdoc
4 +++ trunk/saslauthd/saslauthd.mdoc
3 --- a/saslauthd/saslauthd.mdoc
4 +++ b/saslauthd/saslauthd.mdoc
55 @@ -10,7 +10,7 @@
66 .\" manpage in saslauthd.8 whenever you change this source
77 .\" version. Only the pre-formatted manpage is installed.
1111 .Dt SASLAUTHD 8
1212 .Os "CMU-SASL"
1313 .Sh NAME
14 @@ -216,7 +216,7 @@
14 @@ -216,7 +216,7 @@ instead.
1515 .Em (All platforms that support OpenLDAP 2.0 or higher)
1616 .Pp
1717 Authenticate against an ldap server. The ldap configuration parameters are
2020 changed with the -O parameter. See the LDAP_SASLAUTHD file included with the
2121 distribution for the list of available parameters.
2222 .It Li sia
23 @@ -249,7 +249,7 @@
23 @@ -249,7 +249,7 @@ was never intended to be used in this ma
2424 .Bl -tag -width "/var/run/saslauthd/mux"
2525 .It Pa /var/run/saslauthd/mux
2626 The default communications socket.
+0
-73
debian/patches/0004_missing_man_pages.diff less more
0 Author: Fabian Fagerholm <fabbe@debian.org>
1 Description: Add man pages for testsaslauthd, sasldbconverter2 and
2 sasltestsuite.
3 --- /dev/null
4 +++ trunk/saslauthd/testsaslauthd.8
5 @@ -0,0 +1,16 @@
6 +.\" testsaslauthd - SASL2 test tool
7 +.\" Dima Barsky 23/12/2002
8 +.\"
9 +
10 +.\"
11 +.TH TESTSASLAUTHD 8 "December 23, 2002" "CMU SASL"
12 +.SH NAME
13 +testsaslauthd \- a test tool for saslauthd
14 +.SH SYNOPSIS
15 +.B testsaslauthd -u username -p password
16 + [-r realm] [-s servicename]
17 + [-f socket path] [-R repeatnum]
18 +
19 +.SH DESCRIPTION
20 +This tool is for testing the saslauthd daemon. Do not use it unless you
21 +know what you are doing. Read the source code if you need more information.
22 --- /dev/null
23 +++ trunk/utils/sasldbconverter2.8
24 @@ -0,0 +1,23 @@
25 +.\" sasldbconverter-2 - Convert sasldb file into the new format
26 +.\" Dima Barsky 25/10/2002
27 +.\"
28 +
29 +.\"
30 +.TH SASLDBCONVERTER2 8 "October 25, 2002" "CMU SASL"
31 +.SH NAME
32 +sasldbconverter2 \- Convert sasldb file into the new format
33 +.SH SYNOPSIS
34 +.B sasldbconverter2 [sasldb_file]
35 +.SH DESCRIPTION
36 +.I sasldbconverter2
37 +takes the sasldb file specified on the
38 +command line and convert it to a new sasldb file in the default
39 +location (usually /etc/sasldb2). It is STRONGLY RECOMMENDED that you
40 +backup sasldb before allowing this program to run
41 +.SH OPTIONS
42 +.TP
43 +.SH KNOWN BUGS
44 +This only works for sasldb files that use the gdbm library.
45 +.TP
46 +.SH SEE ALSO
47 +rfc2222 \- Simple Authentication and Security Layer (SASL)
48 --- /dev/null
49 +++ trunk/utils/sasltestsuite.8
50 @@ -0,0 +1,22 @@
51 +.\" sasltestsuite - SASL2 test tool
52 +.\" Dima Barsky 23/11/2002
53 +.\"
54 +
55 +.\"
56 +.TH SASLTESTSUITE 8 "December 23, 2002" "CMU SASL"
57 +.SH NAME
58 +sasltestsuite \- SASL2 test tool
59 +.SH SYNOPSIS
60 +.B sasltestsuite [-g name] [-s seed] [-r tests] -a -M
61 + g -- gssapi service name to use (default: host)
62 + r -- # of random tests to do (default: 25)
63 + a -- do all corruption tests (and ignores random ones unless -r specified)
64 + n -- skip the initial "do correctly" tests
65 + h -- show this screen
66 + s -- random seed to use
67 + M -- detailed memory debugging ON
68 +
69 +.SH DESCRIPTION
70 +This tool is for testing the SASL2 installation. Do not use it
71 +unless you know what you are doing. Read the source code if you need
72 +more information.
00 Author: Fabian Fagerholm <fabbe@debian.org>
11 Description: Build the dbconverter-2 utility and change the path to the sasldb
22 database file to /etc/sasldb2.
3 --- trunk.orig/utils/Makefile.am
4 +++ trunk/utils/Makefile.am
3 --- a/utils/Makefile.am
4 +++ b/utils/Makefile.am
55 @@ -45,10 +45,10 @@
66 all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
77 all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
1515
1616 if NO_SASL_DB_MANS
1717 man_MANS =
18 --- trunk.orig/utils/dbconverter-2.c
19 +++ trunk/utils/dbconverter-2.c
20 @@ -385,7 +385,7 @@
18 --- a/utils/dbconverter-2.c
19 +++ b/utils/dbconverter-2.c
20 @@ -385,7 +385,7 @@ static struct sasl_callback goodsasl_cb[
2121
2222 int main(int argc, char **argv)
2323 {
2626 int result;
2727
2828 if (argc > 1) {
29 @@ -421,7 +421,7 @@
29 @@ -421,7 +421,7 @@ int main(int argc, char **argv)
3030
3131 printf("\nThis program will take the sasldb file specified on the\n"
3232 "command line and convert it to a new sasldb file in the default\n"
00 Author: Fabian Fagerholm <fabbe@debian.org>
11 Description: Fix linking with libsasldb.a when saslauthd is built with sasldb
22 support.
3 --- trunk.orig/saslauthd/configure.in
4 +++ trunk/saslauthd/configure.in
5 @@ -77,7 +77,7 @@
3 --- a/saslauthd/configure.in
4 +++ b/saslauthd/configure.in
5 @@ -77,7 +77,7 @@ if test "$authsasldb" != no; then
66 AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
77 SASL_DB_PATH_CHECK()
88 SASL_DB_CHECK()
00 Author: Fabian Fagerholm <fabbe@debian.org>
11 Description: Support and build against db4.8.
2 --- a/aclocal.m4
3 +++ b/aclocal.m4
4 @@ -1741,7 +1741,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
5 fi
6
7 saved_LIBS=$LIBS
8 - for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
9 + for dbname in db
10 do
11 LIBS="$saved_LIBS -l$dbname"
12 AC_TRY_LINK([#include <stdio.h>
132 --- a/cmulocal/berkdb.m4
143 +++ b/cmulocal/berkdb.m4
154 @@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
165 fi
176
187 saved_LIBS=$LIBS
19 - for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
20 + for dbname in db
8 - for dbname in ${with_bdb} db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
9 + for dbname in ${with_bdb} db
2110 do
2211 LIBS="$saved_LIBS -l$dbname"
2312 AC_TRY_LINK([#include <stdio.h>
24 --- a/saslauthd/aclocal.m4
25 +++ b/saslauthd/aclocal.m4
26 @@ -2068,7 +2068,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
27 fi
28
29 saved_LIBS=$LIBS
30 - for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
31 + for dbname in db
32 do
33 LIBS="$saved_LIBS -l$dbname"
34 AC_TRY_LINK([#include <stdio.h>
+0
-14
debian/patches/0024_allow_detection_of_heimdal.diff less more
0 Author: Roberto C. Sanchez <roberto@connexer.com>
1 Description: A patch to allow recognition of Heimdal with the heimdal-multidev
2 package
3 --- a/plugins/gssapi.c
4 +++ b/plugins/gssapi.c
5 @@ -86,7 +86,7 @@ static const char plugin_id[] = "$Id: gs
6
7 static const char * GSSAPI_BLANK_STRING = "";
8
9 -#ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE
10 +#if !defined(HAVE_GSS_C_NT_HOSTBASED_SERVICE) && !defined(GSS_C_NT_HOSTBASED_SERVICE)
11 extern gss_OID gss_nt_service_name;
12 #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
13 #endif
00 Author: Roberto C. Sanchez <roberto@connexer.com>
11 Description: Drop gratuitous dependency on krb5support
2 --- a/aclocal.m4
3 +++ b/aclocal.m4
4 @@ -2928,9 +2928,6 @@ if test "$gssapi" != no; then
5 fi
6
7 if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
8 - # check for libkrb5support first
9 - AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
10 -
11 gss_failed=0
12 AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
13 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
142 --- a/cmulocal/sasl2.m4
153 +++ b/cmulocal/sasl2.m4
164 @@ -112,9 +112,6 @@ if test "$gssapi" != no; then
2311 gss_failed=0
2412 AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
2513 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
26 --- a/saslauthd/aclocal.m4
27 +++ b/saslauthd/aclocal.m4
28 @@ -1335,9 +1335,6 @@ if test "$gssapi" != no; then
29 fi
30
31 if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
32 - # check for libkrb5support first
33 - AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
34 -
35 gss_failed=0
36 AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
37 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
00 --- a/plugins/ldapdb.c
11 +++ b/plugins/ldapdb.c
2 @@ -249,7 +249,7 @@ static int ldapdb_auxprop_lookup(void *g
3 result = SASL_UNAVAIL;
4 break;
2 @@ -251,6 +251,8 @@ static int ldapdb_auxprop_lookup(void *g
53
6 - case LDAP_PROXY_AUTHZ_FAILURE:
4 #if defined(LDAP_PROXY_AUTHZ_FAILURE)
5 case LDAP_PROXY_AUTHZ_FAILURE:
6 +#elif defined(LDAP_X_PROXY_AUTHZ_FAILURE)
77 + case LDAP_X_PROXY_AUTHZ_FAILURE:
8 #endif
89 case LDAP_INAPPROPRIATE_AUTH:
910 case LDAP_INVALID_CREDENTIALS:
10 case LDAP_INSUFFICIENT_ACCESS:
11 --- a/plugins/Makefile.am
12 +++ b/plugins/Makefile.am
13 @@ -119,7 +119,7 @@ libsasldb_la_LIBADD = ../sasldb/libsasld
14
15 libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
16 libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
17 -libldapdb_la_LIBADD = $(COMPAT_OBJS)
18 +libldapdb_la_LIBADD = $(LIB_LDAP) $(COMPAT_OBJS)
19
20 libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
21 libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) $(AM_LDFLAGS)
22 --- a/plugins/makeinit.sh
23 +++ b/plugins/makeinit.sh
24 @@ -90,4 +90,4 @@ SASL_AUXPROP_PLUG_INIT( $auxprop )
25 done
26
27 # ldapdb is also a canon_user plugin
28 -echo "SASL_CANONUSER_PLUG_INIT( ldap )" >> ldapdb_init.c
29 +echo "SASL_CANONUSER_PLUG_INIT( ldapdb )" >> ldapdb_init.c
30 --- a/plugins/ldapdb_init.c
31 +++ b/plugins/ldapdb_init.c
32 @@ -36,4 +36,4 @@ BOOL APIENTRY DllMain( HANDLE hModule,
33
34 SASL_AUXPROP_PLUG_INIT( ldapdb )
35
36 -SASL_CANONUSER_PLUG_INIT( ldap )
37 +SASL_CANONUSER_PLUG_INIT( ldapdb )
00 --- a/configure.in
11 +++ b/configure.in
2 @@ -829,9 +829,9 @@ case "$with_sqlite" in
2 @@ -856,9 +856,9 @@ case "$with_sqlite" in
33 notfound) AC_WARN([SQLite Library not found]); true;;
44 *)
55 if test -d ${with_sqlite}/lib; then
1111 fi
1212
1313 LIB_SQLITE_DIR=$LIB_SQLITE
14 @@ -881,9 +881,9 @@ case "$with_sqlite3" in
14 @@ -908,9 +908,9 @@ case "$with_sqlite3" in
1515 notfound) AC_WARN([SQLite3 Library not found]); true;;
1616 *)
1717 if test -d ${with_sqlite3}/lib; then
+0
-11
debian/patches/0032-missing_SQLITE3_in_plugins_Makefile.am.patch less more
0 --- a/plugins/Makefile.am
1 +++ b/plugins/Makefile.am
2 @@ -122,7 +122,7 @@ libldapdb_la_DEPENDENCIES = $(COMPAT_OBJ
3 libldapdb_la_LIBADD = $(LIB_LDAP) $(COMPAT_OBJS)
4
5 libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
6 -libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) $(AM_LDFLAGS)
7 +libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) $(LIB_SQLITE3) $(AM_LDFLAGS)
8 libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
9 libsql_la_LIBADD = $(COMPAT_OBJS)
10
00 0001_versioned_symbols.diff
11 0002_testsuite.diff
22 0003_saslauthd_mdoc.diff
3 0004_missing_man_pages.diff
43 0005_dbconverter.diff
54 0006_library_mutexes.diff
65 0009_sasldb_al.diff
98 0012_xopen_crypt_prototype.diff
109 0014_avoid_pic_overwrite.diff
1110 0017_db4.8.diff
12 0024_allow_detection_of_heimdal.diff
1311 0025_ld_as_needed.diff
1412 0026_drop_krb5support_dependency.diff
1513 0027_db5_support.diff
1715 0029-ldap_fixes.patch
1816 0030-dont_use_la_files_for_opening_plugins.patch
1917 0031-dont_use_-R_when_search_for_sqlite_libraries.patch
20 0032-missing_SQLITE3_in_plugins_Makefile.am.patch