OpenPKG Specs / changeset

     1.1 --- a/sasl/sasl.patch	Fri Oct 05 22:43:05 2012 +0200
     1.2 +++ b/sasl/sasl.patch	Sat Oct 06 16:24:01 2012 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: configure
     1.5  --- configure.orig	2006-05-18 21:30:13 +0200
     1.6  +++ configure	2008-12-25 18:48:51 +0100
     1.7 -@@ -3944,9 +3944,6 @@
     1.8 +@@ -5015,9 +5015,6 @@
     1.9   
    1.10   fi
    1.11   
    1.12 @@ -10,19 +10,19 @@
    1.13  -fi
    1.14   
    1.15   
    1.16 - # Check whether --with-purecov or --without-purecov was given.
    1.17 -@@ -5125,7 +5122,7 @@
    1.18 + # Check whether --with-purecov was given.
    1.19 +@@ -6422,7 +6419,7 @@
    1.20   	fi
    1.21   
    1.22   	saved_LIBS=$LIBS
    1.23 --        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
    1.24 +-        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
    1.25  +        for dbname in db
    1.26             do
    1.27   	    LIBS="$saved_LIBS -l$dbname"
    1.28   	    cat >conftest.$ac_ext <<_ACEOF
    1.29 -@@ -5205,6 +5202,54 @@
    1.30 - fi
    1.31 - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1.32 +@@ -6526,6 +6523,54 @@
    1.33 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
    1.34 +       conftest$ac_exeext conftest.$ac_ext
    1.35           fi
    1.36  +        if test "$dblib" = "no"; then
    1.37  +	    cat >conftest.$ac_ext <<_ACEOF
    1.38 @@ -75,18 +75,18 @@
    1.39   	LIBS=$saved_LIBS
    1.40   
    1.41   	LDFLAGS=$BDB_SAVE_LDFLAGS
    1.42 -@@ -5882,7 +5927,7 @@
    1.43 +@@ -7232,7 +7277,7 @@
    1.44   	fi
    1.45   
    1.46   	saved_LIBS=$LIBS
    1.47 --        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
    1.48 +-        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
    1.49  +        for dbname in db
    1.50             do
    1.51   	    LIBS="$saved_LIBS -l$dbname"
    1.52   	    cat >conftest.$ac_ext <<_ACEOF
    1.53 -@@ -5962,6 +6007,54 @@
    1.54 - fi
    1.55 - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1.56 +@@ -7336,6 +7381,54 @@
    1.57 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
    1.58 +       conftest$ac_exeext conftest.$ac_ext
    1.59           fi
    1.60  +        if test "$dblib" = "no"; then
    1.61  +	    cat >conftest.$ac_ext <<_ACEOF
    1.62 @@ -139,7 +139,7 @@
    1.63   	LIBS=$saved_LIBS
    1.64   
    1.65   	LDFLAGS=$BDB_SAVE_LDFLAGS
    1.66 -@@ -12005,20 +12098,20 @@
    1.67 +@@ -14476,20 +14569,20 @@
    1.68        fi
    1.69   
    1.70        LIB_SQLITE_DIR=$LIB_SQLITE
    1.71 @@ -151,37 +151,37 @@
    1.72        else
    1.73            CPPFLAGS="${CPPFLAGS} -I${with_sqlite}"
    1.74        fi
    1.75 --       echo "$as_me:$LINENO: checking for sqlite_open in -lsqlite" >&5
    1.76 --echo $ECHO_N "checking for sqlite_open in -lsqlite... $ECHO_C" >&6
    1.77 +-       { $as_echo "$as_me:$LINENO: checking for sqlite_open in -lsqlite" >&5
    1.78 +-$as_echo_n "checking for sqlite_open in -lsqlite... " >&6; }
    1.79  +       echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
    1.80  +echo $ECHO_N "checking for sqlite3_open in -lsqlite3... $ECHO_C" >&6
    1.81   if test "${ac_cv_lib_sqlite_sqlite_open+set}" = set; then
    1.82 -   echo $ECHO_N "(cached) $ECHO_C" >&6
    1.83 +   $as_echo_n "(cached) " >&6
    1.84   else
    1.85     ac_check_lib_save_LIBS=$LIBS
    1.86  -LIBS="-lsqlite $LIB_SQLITE_DIR $LIBS"
    1.87  +LIBS="-lsqlite3 $LIB_SQLITE_DIR $LIBS"
    1.88   cat >conftest.$ac_ext <<_ACEOF
    1.89 - #line $LINENO "configure"
    1.90   /* confdefs.h.  */
    1.91 -@@ -12033,11 +12126,11 @@
    1.92 + _ACEOF
    1.93 +@@ -14503,11 +14596,11 @@
    1.94 + #ifdef __cplusplus
    1.95 + extern "C"
    1.96   #endif
    1.97 - /* We use char because int might match the return type of a gcc2
    1.98 -    builtin and then its argument prototype would still apply.  */
    1.99  -char sqlite_open ();
   1.100  +char sqlite3_open ();
   1.101   int
   1.102   main ()
   1.103   {
   1.104 --sqlite_open ();
   1.105 -+sqlite3_open ();
   1.106 +-return sqlite_open ();
   1.107 ++return sqlite3_open ();
   1.108     ;
   1.109     return 0;
   1.110   }
   1.111  Index: lib/saslint.h
   1.112  --- lib/saslint.h.orig	2006-04-18 22:25:45 +0200
   1.113  +++ lib/saslint.h	2008-12-25 18:48:51 +0100
   1.114 -@@ -109,8 +109,6 @@
   1.115 +@@ -118,8 +118,6 @@
   1.116     const char *appname;
   1.117   } sasl_global_callbacks_t;
   1.118   
   1.119 @@ -193,7 +193,7 @@
   1.120  Index: lib/server.c
   1.121  --- lib/server.c.orig	2006-05-17 18:46:13 +0200
   1.122  +++ lib/server.c	2008-12-25 18:48:51 +0100
   1.123 -@@ -95,7 +95,7 @@
   1.124 +@@ -90,7 +90,7 @@
   1.125   
   1.126   static mech_list_t *mechlist = NULL; /* global var which holds the list */
   1.127   
   1.128 @@ -202,7 +202,7 @@
   1.129   
   1.130   /* set the password for a user
   1.131    *  conn        -- SASL connection
   1.132 -@@ -477,16 +477,8 @@
   1.133 +@@ -606,16 +606,8 @@
   1.134           return SASL_CONTINUE;
   1.135       }
   1.136   
   1.137 @@ -213,7 +213,7 @@
   1.138  -    /* getconfpath_cb->proc MUST be a sasl_getconfpath_t; if only C had a type
   1.139  -       system */
   1.140  -    result = ((sasl_getconfpath_t *)(getconfpath_cb->proc))(getconfpath_cb->context,
   1.141 --						    &path_to_config);
   1.142 +-							    (char **) &path_to_config);
   1.143  -    if (result != SASL_OK) goto done;
   1.144  -    if (path_to_config == NULL) path_to_config = "";
   1.145  +    result = SASL_OK;
   1.146 @@ -448,7 +448,7 @@
   1.147   }
   1.148   #endif /* HAVE_SQLITE */
   1.149   
   1.150 -@@ -771,7 +802,7 @@
   1.151 +@@ -918,7 +949,7 @@
   1.152       settings = (sql_settings_t *) glob_context;
   1.153       
   1.154       sparams->utils->log(NULL, SASL_LOG_DEBUG,
   1.155 @@ -456,8 +456,8 @@
   1.156  +			"sql plugin parse the username %s\n", user);
   1.157       
   1.158       user_buf = sparams->utils->malloc(ulen + 1);
   1.159 -     if (!user_buf) goto done;
   1.160 -@@ -849,7 +880,7 @@
   1.161 +     if (!user_buf) {
   1.162 +@@ -1022,7 +1053,7 @@
   1.163   	}
   1.164       
   1.165   	sparams->utils->log(NULL, SASL_LOG_DEBUG,
   1.166 @@ -466,14 +466,17 @@
   1.167   			    realname, escap_userid, escap_realm);
   1.168   	
   1.169   	/* create a statement that we will use */
   1.170 -@@ -864,9 +895,15 @@
   1.171 +@@ -1043,12 +1074,18 @@
   1.172   	/* run the query */
   1.173   	if (!settings->sql_engine->sql_exec(conn, query, value, sizeof(value),
   1.174   					    &value_len, sparams->utils)) {
   1.175  +            sparams->utils->log(NULL, SASL_LOG_DEBUG,
   1.176  +                                "sql plugin query successful\n");
   1.177 - 	    sparams->utils->prop_set(sparams->propctx, cur->name,
   1.178 - 				     value, value_len);
   1.179 + 	    sparams->utils->prop_set(sparams->propctx,
   1.180 + 				     cur->name,
   1.181 + 				     value,
   1.182 + 				     (int)value_len);
   1.183 + 	    ret = SASL_OK;
   1.184   	}
   1.185  +        else {
   1.186  +            sparams->utils->log(NULL, SASL_LOG_DEBUG,
   1.187 @@ -485,7 +488,7 @@
   1.188  Index: sample/client.c
   1.189  --- sample/client.c.orig	2004-03-09 18:35:32 +0100
   1.190  +++ sample/client.c	2008-12-25 18:48:51 +0100
   1.191 -@@ -133,13 +133,11 @@
   1.192 +@@ -137,13 +137,11 @@
   1.193       return SASL_OK;
   1.194   }
   1.195   
   1.196 @@ -500,7 +503,7 @@
   1.197   
   1.198   static int
   1.199   getsecret(sasl_conn_t *conn,
   1.200 -@@ -155,7 +153,7 @@
   1.201 +@@ -159,7 +157,7 @@
   1.202       if (! conn || ! psecret || id != SASL_CB_PASS)
   1.203   	return SASL_BADPARAM;
   1.204   
   1.205 @@ -512,7 +515,7 @@
   1.206  Index: sample/sample-client.c
   1.207  --- sample/sample-client.c.orig	2004-10-26 13:14:33 +0200
   1.208  +++ sample/sample-client.c	2008-12-25 18:48:51 +0100
   1.209 -@@ -244,13 +244,11 @@
   1.210 +@@ -245,13 +245,11 @@
   1.211     return SASL_OK;
   1.212   }
   1.213   
   1.214 @@ -527,7 +530,7 @@
   1.215   
   1.216   static int
   1.217   getsecret(sasl_conn_t *conn,
   1.218 -@@ -264,7 +262,7 @@
   1.219 +@@ -265,7 +263,7 @@
   1.220     if (! conn || ! psecret || id != SASL_CB_PASS)
   1.221       return SASL_BADPARAM;
   1.222   
   1.223 @@ -536,7 +539,7 @@
   1.224     if (! password)
   1.225       return SASL_FAIL;
   1.226   
   1.227 -@@ -307,7 +305,7 @@
   1.228 +@@ -308,7 +306,7 @@
   1.229     fflush(stdout);
   1.230     
   1.231     if (id == SASL_CB_ECHOPROMPT) {
   1.232 @@ -557,15 +560,15 @@
   1.233  Index: saslauthd/Makefile.in
   1.234  --- saslauthd/Makefile.in.orig	2008-12-25 18:48:51 +0100
   1.235  +++ saslauthd/Makefile.in	2008-12-25 18:48:51 +0100
   1.236 -@@ -621,7 +621,7 @@
   1.237 +@@ -722,7 +722,7 @@
   1.238   
   1.239   install-data-local: saslauthd.8
   1.240   	$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
   1.241  -	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
   1.242  +	$(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8
   1.243 + 
   1.244   # Tell versions [3.59,3.63) of GNU make to not export all variables.
   1.245   # Otherwise a system limit (for SysV at least) may be exceeded.
   1.246 - .NOEXPORT:
   1.247  Index: saslauthd/lak.c
   1.248  --- saslauthd/lak.c.orig	2005-05-15 07:49:51 +0200
   1.249  +++ saslauthd/lak.c	2008-12-25 18:48:51 +0100
   1.250 @@ -577,8 +580,8 @@
   1.251   #ifdef HAVE_OPENSSL
   1.252   #ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT
   1.253   #define OPENSSL_DISABLE_OLD_DES_SUPPORT
   1.254 -@@ -57,7 +58,7 @@
   1.255 - 
   1.256 +@@ -58,7 +59,7 @@
   1.257 + #define LDAP_DEPRECATED 1
   1.258   #include <ldap.h>
   1.259   #include <lber.h>
   1.260  -#include <sasl.h>
   1.261 @@ -586,15 +589,3 @@
   1.262   #include "lak.h"
   1.263   
   1.264   typedef struct lak_auth_method {
   1.265 -Index: utils/pluginviewer.c
   1.266 ---- utils/pluginviewer.c.orig	2006-05-17 18:46:17 +0200
   1.267 -+++ utils/pluginviewer.c	2008-12-25 18:48:51 +0100
   1.268 -@@ -536,7 +536,7 @@
   1.269 -         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"
   1.270 - 	        "\t-a\tlist auxprop plugins\n"
   1.271 -                 "\t-s\tlist server authentication (SASL) plugins\n"
   1.272 --                "\t-s\tlist client authentication (SASL) plugins\n"
   1.273 -+                "\t-c\tlist client authentication (SASL) plugins\n"
   1.274 - 	        "\t-b ...\t#bits to use for encryption\n"
   1.275 - 	        "\t\tmin=N\tminumum #bits to use (1 => integrity)\n"
   1.276 - 	        "\t\tmax=N\tmaximum #bits to use\n"

     2.1 --- a/sasl/sasl.spec	Fri Oct 05 22:43:05 2012 +0200
     2.2 +++ b/sasl/sasl.spec	Sat Oct 06 16:24:01 2012 +0200
     2.3 @@ -31,7 +31,7 @@
     2.4  Class:        BASE
     2.5  Group:        Cryptography
     2.6  License:      BSD
     2.7 -Version:      2.1.23
     2.8 +Version:      2.1.25
     2.9  Release:      20120800
    2.10  
    2.11  #   package options
    2.12 @@ -115,6 +115,9 @@
    2.13      %{l_shtool} subst \
    2.14          -e 's;u_int\([0-9]*\)_t;uint\1_t;g' \
    2.15          sasldb/db_berkeley.c
    2.16 +    %{l_shtool} subst \
    2.17 +        -e 's;extern int gethostname(char \*,\) int;\1 size_t;' \
    2.18 +        lib/saslutil.c
    2.19      %patch -p0
    2.20  
    2.21  %build