# HG changeset patch # User Michael Schloh von Bennewitz # Date 1349533441 -7200 # Node ID 914043724d209f0f4e58154ae9166c6c198b274a # Parent 2dcb72c32e873b08dac3dec544aa6adc3796612c Update to new vendor software version and adjust patch code accordingly. Unfortunately the vendor has apparently failed to properly test this release which depends on missing object symbols in libsasl2.a(common.o): undefined reference to `sasl_randcreate' undefined reference to `sasl_mkchal' undefined reference to `sasl_utf8verify' undefined reference to `sasl_rand' undefined reference to `sasl_churn' undefined reference to `sasl_encode64' undefined reference to `sasl_decode64' undefined reference to `sasl_erasebuffer' undefined reference to `sasl_randfree' undefined reference to `sasl_strlower' undefined reference to `get_fqhostname' ...yet to be patched. diff -r 2dcb72c32e87 -r 914043724d20 sasl/sasl.patch --- a/sasl/sasl.patch Fri Oct 05 22:43:05 2012 +0200 +++ b/sasl/sasl.patch Sat Oct 06 16:24:01 2012 +0200 @@ -1,7 +1,7 @@ Index: configure --- configure.orig 2006-05-18 21:30:13 +0200 +++ configure 2008-12-25 18:48:51 +0100 -@@ -3944,9 +3944,6 @@ +@@ -5015,9 +5015,6 @@ fi @@ -10,19 +10,19 @@ -fi - # Check whether --with-purecov or --without-purecov was given. -@@ -5125,7 +5122,7 @@ + # Check whether --with-purecov was given. +@@ -6422,7 +6419,7 @@ fi saved_LIBS=$LIBS -- for dbname in 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 +- 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 + for dbname in db do LIBS="$saved_LIBS -l$dbname" cat >conftest.$ac_ext <<_ACEOF -@@ -5205,6 +5202,54 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +@@ -6526,6 +6523,54 @@ + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi + if test "$dblib" = "no"; then + cat >conftest.$ac_ext <<_ACEOF @@ -75,18 +75,18 @@ LIBS=$saved_LIBS LDFLAGS=$BDB_SAVE_LDFLAGS -@@ -5882,7 +5927,7 @@ +@@ -7232,7 +7277,7 @@ fi saved_LIBS=$LIBS -- for dbname in 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 +- 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 + for dbname in db do LIBS="$saved_LIBS -l$dbname" cat >conftest.$ac_ext <<_ACEOF -@@ -5962,6 +6007,54 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +@@ -7336,6 +7381,54 @@ + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi + if test "$dblib" = "no"; then + cat >conftest.$ac_ext <<_ACEOF @@ -139,7 +139,7 @@ LIBS=$saved_LIBS LDFLAGS=$BDB_SAVE_LDFLAGS -@@ -12005,20 +12098,20 @@ +@@ -14476,20 +14569,20 @@ fi LIB_SQLITE_DIR=$LIB_SQLITE @@ -151,37 +151,37 @@ else CPPFLAGS="${CPPFLAGS} -I${with_sqlite}" fi -- echo "$as_me:$LINENO: checking for sqlite_open in -lsqlite" >&5 --echo $ECHO_N "checking for sqlite_open in -lsqlite... $ECHO_C" >&6 +- { $as_echo "$as_me:$LINENO: checking for sqlite_open in -lsqlite" >&5 +-$as_echo_n "checking for sqlite_open in -lsqlite... " >&6; } + echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5 +echo $ECHO_N "checking for sqlite3_open in -lsqlite3... $ECHO_C" >&6 if test "${ac_cv_lib_sqlite_sqlite_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsqlite $LIB_SQLITE_DIR $LIBS" +LIBS="-lsqlite3 $LIB_SQLITE_DIR $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ -@@ -12033,11 +12126,11 @@ + _ACEOF +@@ -14503,11 +14596,11 @@ + #ifdef __cplusplus + extern "C" #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char sqlite_open (); +char sqlite3_open (); int main () { --sqlite_open (); -+sqlite3_open (); +-return sqlite_open (); ++return sqlite3_open (); ; return 0; } Index: lib/saslint.h --- lib/saslint.h.orig 2006-04-18 22:25:45 +0200 +++ lib/saslint.h 2008-12-25 18:48:51 +0100 -@@ -109,8 +109,6 @@ +@@ -118,8 +118,6 @@ const char *appname; } sasl_global_callbacks_t; @@ -193,7 +193,7 @@ Index: lib/server.c --- lib/server.c.orig 2006-05-17 18:46:13 +0200 +++ lib/server.c 2008-12-25 18:48:51 +0100 -@@ -95,7 +95,7 @@ +@@ -90,7 +90,7 @@ static mech_list_t *mechlist = NULL; /* global var which holds the list */ @@ -202,7 +202,7 @@ /* set the password for a user * conn -- SASL connection -@@ -477,16 +477,8 @@ +@@ -606,16 +606,8 @@ return SASL_CONTINUE; } @@ -213,7 +213,7 @@ - /* getconfpath_cb->proc MUST be a sasl_getconfpath_t; if only C had a type - system */ - result = ((sasl_getconfpath_t *)(getconfpath_cb->proc))(getconfpath_cb->context, -- &path_to_config); +- (char **) &path_to_config); - if (result != SASL_OK) goto done; - if (path_to_config == NULL) path_to_config = ""; + result = SASL_OK; @@ -448,7 +448,7 @@ } #endif /* HAVE_SQLITE */ -@@ -771,7 +802,7 @@ +@@ -918,7 +949,7 @@ settings = (sql_settings_t *) glob_context; sparams->utils->log(NULL, SASL_LOG_DEBUG, @@ -456,8 +456,8 @@ + "sql plugin parse the username %s\n", user); user_buf = sparams->utils->malloc(ulen + 1); - if (!user_buf) goto done; -@@ -849,7 +880,7 @@ + if (!user_buf) { +@@ -1022,7 +1053,7 @@ } sparams->utils->log(NULL, SASL_LOG_DEBUG, @@ -466,14 +466,17 @@ realname, escap_userid, escap_realm); /* create a statement that we will use */ -@@ -864,9 +895,15 @@ +@@ -1043,12 +1074,18 @@ /* run the query */ if (!settings->sql_engine->sql_exec(conn, query, value, sizeof(value), &value_len, sparams->utils)) { + sparams->utils->log(NULL, SASL_LOG_DEBUG, + "sql plugin query successful\n"); - sparams->utils->prop_set(sparams->propctx, cur->name, - value, value_len); + sparams->utils->prop_set(sparams->propctx, + cur->name, + value, + (int)value_len); + ret = SASL_OK; } + else { + sparams->utils->log(NULL, SASL_LOG_DEBUG, @@ -485,7 +488,7 @@ Index: sample/client.c --- sample/client.c.orig 2004-03-09 18:35:32 +0100 +++ sample/client.c 2008-12-25 18:48:51 +0100 -@@ -133,13 +133,11 @@ +@@ -137,13 +137,11 @@ return SASL_OK; } @@ -500,7 +503,7 @@ static int getsecret(sasl_conn_t *conn, -@@ -155,7 +153,7 @@ +@@ -159,7 +157,7 @@ if (! conn || ! psecret || id != SASL_CB_PASS) return SASL_BADPARAM; @@ -512,7 +515,7 @@ Index: sample/sample-client.c --- sample/sample-client.c.orig 2004-10-26 13:14:33 +0200 +++ sample/sample-client.c 2008-12-25 18:48:51 +0100 -@@ -244,13 +244,11 @@ +@@ -245,13 +245,11 @@ return SASL_OK; } @@ -527,7 +530,7 @@ static int getsecret(sasl_conn_t *conn, -@@ -264,7 +262,7 @@ +@@ -265,7 +263,7 @@ if (! conn || ! psecret || id != SASL_CB_PASS) return SASL_BADPARAM; @@ -536,7 +539,7 @@ if (! password) return SASL_FAIL; -@@ -307,7 +305,7 @@ +@@ -308,7 +306,7 @@ fflush(stdout); if (id == SASL_CB_ECHOPROMPT) { @@ -557,15 +560,15 @@ Index: saslauthd/Makefile.in --- saslauthd/Makefile.in.orig 2008-12-25 18:48:51 +0100 +++ saslauthd/Makefile.in 2008-12-25 18:48:51 +0100 -@@ -621,7 +621,7 @@ +@@ -722,7 +722,7 @@ install-data-local: saslauthd.8 $(mkinstalldirs) $(DESTDIR)$(mandir)/man8 - $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8 + $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: Index: saslauthd/lak.c --- saslauthd/lak.c.orig 2005-05-15 07:49:51 +0200 +++ saslauthd/lak.c 2008-12-25 18:48:51 +0100 @@ -577,8 +580,8 @@ #ifdef HAVE_OPENSSL #ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT #define OPENSSL_DISABLE_OLD_DES_SUPPORT -@@ -57,7 +58,7 @@ - +@@ -58,7 +59,7 @@ + #define LDAP_DEPRECATED 1 #include #include -#include @@ -586,15 +589,3 @@ #include "lak.h" typedef struct lak_auth_method { -Index: utils/pluginviewer.c ---- utils/pluginviewer.c.orig 2006-05-17 18:46:17 +0200 -+++ utils/pluginviewer.c 2008-12-25 18:48:51 +0100 -@@ -536,7 +536,7 @@ - fprintf(stderr, "%s: Usage: %s [-a] [-s] [-c] [-b min=N,max=N] [-e ssf=N,id=ID] [-m MECHS] [-x AUXPROP_MECH] [-f FLAGS] [-i local=IP,remote=IP] [-p PATH]\n" - "\t-a\tlist auxprop plugins\n" - "\t-s\tlist server authentication (SASL) plugins\n" -- "\t-s\tlist client authentication (SASL) plugins\n" -+ "\t-c\tlist client authentication (SASL) plugins\n" - "\t-b ...\t#bits to use for encryption\n" - "\t\tmin=N\tminumum #bits to use (1 => integrity)\n" - "\t\tmax=N\tmaximum #bits to use\n" diff -r 2dcb72c32e87 -r 914043724d20 sasl/sasl.spec --- a/sasl/sasl.spec Fri Oct 05 22:43:05 2012 +0200 +++ b/sasl/sasl.spec Sat Oct 06 16:24:01 2012 +0200 @@ -31,7 +31,7 @@ Class: BASE Group: Cryptography License: BSD -Version: 2.1.23 +Version: 2.1.25 Release: 20120800 # package options @@ -115,6 +115,9 @@ %{l_shtool} subst \ -e 's;u_int\([0-9]*\)_t;uint\1_t;g' \ sasldb/db_berkeley.c + %{l_shtool} subst \ + -e 's;extern int gethostname(char \*,\) int;\1 size_t;' \ + lib/saslutil.c %patch -p0 %build