Author: qboosh Date: Sat Sep 17 08:54:36 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.1.25
- updated nolibs,split-sql,gcc4,cryptedpw,db,keytab,parallel-make,gssapi-detect
patches
- removed obsolete automake_1_10,digest-commas,ac patches
- added gssapi_ext patch
- new plugins: gs2 (packaged in -gssapi), scram (new -scram package),
sqlite3 (from split sql plugin, new -sqlite3 package)
---- Files affected:
packages/cyrus-sasl:
cyrus-sasl-cryptedpw.patch (1.1 -> 1.2) , cyrus-sasl-db.patch (1.7 -> 1.8) ,
cyrus-sasl-gcc4.patch (1.3 -> 1.4) , cyrus-sasl-gssapi-detect.patch (1.2 ->
1.3) , cyrus-sasl-keytab.patch (1.1 -> 1.2) , cyrus-sasl-lt.patch (1.3 -> 1.4)
, cyrus-sasl-nolibs.patch (1.2 -> 1.3) , cyrus-sasl-parallel-make.patch (1.1 ->
1.2) , cyrus-sasl-split-sql.patch (1.4 -> 1.5) , cyrus-sasl.spec (1.206 ->
1.207) , cyrus-sasl-gssapi_ext.patch (NONE -> 1.1) (NEW), cyrus-sasl-ac.patch
(1.2 -> NONE) (REMOVED), cyrus-sasl-automake_1_10.patch (1.1 -> NONE)
(REMOVED), cyrus-sasl-digest-commas.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/cyrus-sasl/cyrus-sasl-cryptedpw.patch
diff -u packages/cyrus-sasl/cyrus-sasl-cryptedpw.patch:1.1
packages/cyrus-sasl/cyrus-sasl-cryptedpw.patch:1.2
--- packages/cyrus-sasl/cyrus-sasl-cryptedpw.patch:1.1 Thu Jul 21 00:29:21 2005
+++ packages/cyrus-sasl/cyrus-sasl-cryptedpw.patch Sat Sep 17 10:54:30 2011
@@ -28,10 +28,9 @@
<TD>sql_engine</TD><TD>SQL plugin</TD>
<TD>Name of SQL engine to use (possible values: 'mysql', 'pgsql',
'sqlite').</TD>
<TD><tt>mysql</tt></TD>
-diff -ruN cyrus-sasl-2.1.20-orig/lib/checkpw.c cyrus-sasl-2.1.20/lib/checkpw.c
---- cyrus-sasl-2.1.20-orig/lib/checkpw.c 2004-03-17 14:58:13.000000000
+0100
-+++ cyrus-sasl-2.1.20/lib/checkpw.c 2005-07-10 16:17:11.000000000 +0200
-@@ -94,6 +94,23 @@
+--- cyrus-sasl-2.1.25/lib/checkpw.c.orig 2009-12-03 20:07:01.000000000
+0100
++++ cyrus-sasl-2.1.25/lib/checkpw.c 2011-09-16 21:27:43.302773195 +0200
+@@ -95,6 +95,23 @@
# endif
#endif
@@ -55,7 +54,7 @@
/* we store the following secret to check plaintext passwords:
*
-@@ -143,7 +160,51 @@
+@@ -142,7 +159,51 @@
"*cmusaslsecretPLAIN",
NULL };
struct propval auxprop_values[3];
@@ -108,10 +107,10 @@
if (!conn || !userstr)
return SASL_BADPARAM;
-@@ -180,14 +241,31 @@
- goto done;
+@@ -188,14 +249,31 @@
+ return SASL_NOUSER;
}
-
+
- /* At the point this has been called, the username has been canonified
- * and we've done the auxprop lookup. This should be easy. */
- if(auxprop_values[0].name
@@ -148,8 +147,8 @@
} else if(auxprop_values[1].name
&& auxprop_values[1].values
&& auxprop_values[1].values[0]) {
-@@ -975,3 +1053,37 @@
- #endif
+@@ -1095,3 +1173,37 @@
+ #endif
{ NULL, NULL }
};
+
================================================================
Index: packages/cyrus-sasl/cyrus-sasl-db.patch
diff -u packages/cyrus-sasl/cyrus-sasl-db.patch:1.7
packages/cyrus-sasl/cyrus-sasl-db.patch:1.8
--- packages/cyrus-sasl/cyrus-sasl-db.patch:1.7 Tue May 18 21:13:46 2010
+++ packages/cyrus-sasl/cyrus-sasl-db.patch Sat Sep 17 10:54:30 2011
@@ -1,15 +1,14 @@
-diff -urN aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4
cyrus-sasl-2.1.22/cmulocal/berkdb.m4
---- aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2005-04-26 21:14:07.000000000
+0200
-+++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2006-10-02 20:36:17.137852392
+0200
+--- cyrus-sasl-2.1.25/cmulocal/berkdb.m4.orig 2010-01-22 16:12:01.000000000
+0100
++++ cyrus-sasl-2.1.25/cmulocal/berkdb.m4 2011-09-16 21:30:03.046111208
+0200
@@ -213,7 +213,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 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 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 ${with_bdb} db-5.1 db-5.0 db-4.8 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
do
LIBS="$saved_LIBS -l$dbname"
- AC_TRY_LINK([#include <db.h>],
+ AC_TRY_LINK([#include <stdio.h>
--- cyrus-sasl-2.1.23/sasldb/db_berkeley.c.orig 2009-04-28
17:09:18.000000000 +0200
+++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2010-05-18 21:02:20.418940098
+0200
@@ -100,7 +100,7 @@
================================================================
Index: packages/cyrus-sasl/cyrus-sasl-gcc4.patch
diff -u packages/cyrus-sasl/cyrus-sasl-gcc4.patch:1.3
packages/cyrus-sasl/cyrus-sasl-gcc4.patch:1.4
--- packages/cyrus-sasl/cyrus-sasl-gcc4.patch:1.3 Thu Jul 2 15:27:05 2009
+++ packages/cyrus-sasl/cyrus-sasl-gcc4.patch Sat Sep 17 10:54:30 2011
@@ -25,23 +25,3 @@
if (dump_stat_info == 0 && dump_user_info == 0)
dump_stat_info = 1;
---- cyrus-sasl-2.1.22/plugins/digestmd5.c.orig 2009-07-02 15:21:59.000000000
+0200
-+++ cyrus-sasl-2.1.22/plugins/digestmd5.c 2009-07-02 15:25:38.190152725
+0200
-@@ -2743,7 +2743,7 @@
- "DIGEST-MD5", /* mech_name */
- #ifdef WITH_RC4
- 128, /* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
-@@ -4071,7 +4071,7 @@
- "DIGEST-MD5",
- #ifdef WITH_RC4 /* mech_name */
- 128, /* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
================================================================
Index: packages/cyrus-sasl/cyrus-sasl-gssapi-detect.patch
diff -u packages/cyrus-sasl/cyrus-sasl-gssapi-detect.patch:1.2
packages/cyrus-sasl/cyrus-sasl-gssapi-detect.patch:1.3
--- packages/cyrus-sasl/cyrus-sasl-gssapi-detect.patch:1.2 Mon Oct 4
12:34:51 2010
+++ packages/cyrus-sasl/cyrus-sasl-gssapi-detect.patch Sat Sep 17 10:54:30 2011
@@ -1,58 +1,60 @@
---- cyrus-sasl-2.1.23/cmulocal/sasl2.m4.orig 2010-10-04 01:53:48.000000000
+0200
-+++ cyrus-sasl-2.1.23/cmulocal/sasl2.m4 2010-10-04 02:05:55.252144435
+0200
-@@ -217,11 +217,25 @@
+--- cyrus-sasl-2.1.25/cmulocal/sasl2.m4.orig 2011-09-17 07:31:51.000000000
+0200
++++ cyrus-sasl-2.1.25/cmulocal/sasl2.m4 2011-09-17 08:24:54.480760162
+0200
+@@ -221,11 +221,25 @@
elif test "$ac_cv_header_gssapi_h" = "yes"; then
AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
[AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-- [Define if your GSSAPI implimentation defines
GSS_C_NT_HOSTBASED_SERVICE])])
-+ [Define if your GSSAPI implimentation defines
GSS_C_NT_HOSTBASED_SERVICE])],
+- [Define if your GSSAPI implementation defines
GSS_C_NT_HOSTBASED_SERVICE])])
++ [Define if your GSSAPI implementation defines
GSS_C_NT_HOSTBASED_SERVICE])],
+ [AC_EGREP_CPP(hostbased_service_gss_nt_yes,
+ [#include <gssapi.h>
+ #ifdef GSS_C_NT_HOSTBASED_SERVICE
+ hostbased_service_gss_nt_yes
+ #endif],
+
[AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-+ [Define if your GSSAPI
implimentation defines GSS_C_NT_HOSTBASED_SERVICE])])])
++ [Define if your GSSAPI
implementation defines GSS_C_NT_HOSTBASED_SERVICE])])])
elif test "$ac_cv_header_gssapi_gssapi_h"; then
AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h,
[AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-- [Define if your GSSAPI implimentation defines
GSS_C_NT_HOSTBASED_SERVICE])])
-+ [Define if your GSSAPI implimentation defines
GSS_C_NT_HOSTBASED_SERVICE])],
+- [Define if your GSSAPI implementation defines
GSS_C_NT_HOSTBASED_SERVICE])])
++ [Define if your GSSAPI implementation defines
GSS_C_NT_HOSTBASED_SERVICE])],
+ [AC_EGREP_CPP(hostbased_service_gss_nt_yes,
+ [#include <gssapi/gssapi.h>
+ #ifdef GSS_C_NT_HOSTBASED_SERVICE
+ hostbased_service_gss_nt_yes
+ #endif],
+
[AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-+ [Define if your GSSAPI
implimentation defines GSS_C_NT_HOSTBASED_SERVICE])])])
++ [Define if your GSSAPI
implementation defines GSS_C_NT_HOSTBASED_SERVICE])])])
fi
if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
-@@ -236,11 +244,25 @@
+@@ -240,13 +254,27 @@
elif test "$ac_cv_header_gssapi_h" = "yes"; then
AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi.h,
[AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
-- [Define if your GSSAPI implimentation defines
GSS_C_NT_USER_NAME])])
-+ [Define if your GSSAPI implimentation defines
GSS_C_NT_USER_NAME])],
+- [Define if your GSSAPI implementation defines
GSS_C_NT_USER_NAME])])
++ [Define if your GSSAPI implementation defines
GSS_C_NT_USER_NAME])],
+ [AC_EGREP_CPP(user_name_yes_gss_nt,
+ [#include <gssapi.h>
+ #ifdef GSS_C_NT_USER_NAME
+ user_name_yes_gss_nt
+ #endif],
+ [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
-+ [Define if your GSSAPI
implimentation defines GSS_C_NT_USER_NAME])])])
++ [Define if your GSSAPI
implementation defines GSS_C_NT_USER_NAME])])])
+ AC_EGREP_HEADER(gss_inquire_attrs_for_mech, gssapi.h, rfc5587=yes)
+ AC_EGREP_HEADER(gss_inquire_mech_for_saslname, gssapi.h, rfc5801=yes)
elif test "$ac_cv_header_gssapi_gssapi_h"; then
AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi/gssapi.h,
[AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
-- [Define if your GSSAPI implimentation defines
GSS_C_NT_USER_NAME])])
-+ [Define if your GSSAPI implimentation defines
GSS_C_NT_USER_NAME])],
+- [Define if your GSSAPI implementation defines
GSS_C_NT_USER_NAME])])
++ [Define if your GSSAPI implementation defines
GSS_C_NT_USER_NAME])],
+ [AC_EGREP_CPP(user_name_yes_gss_nt,
+ [#include <gssapi/gssapi.h>
+ #ifdef GSS_C_NT_USER_NAME
+ user_name_yes_gss_nt
+ #endif],
+ [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
-+ [Define if your GSSAPI
implimentation defines GSS_C_NT_USER_NAME])])])
++ [Define if your GSSAPI
implementation defines GSS_C_NT_USER_NAME])])])
+ AC_EGREP_HEADER(gss_inquire_attrs_for_mech, gssapi/gssapi.h, rfc5587=yes)
+ AC_EGREP_HEADER(gss_inquire_mech_for_saslname, gssapi.h, rfc5801=yes)
fi
- fi
-
================================================================
Index: packages/cyrus-sasl/cyrus-sasl-keytab.patch
diff -u packages/cyrus-sasl/cyrus-sasl-keytab.patch:1.1
packages/cyrus-sasl/cyrus-sasl-keytab.patch:1.2
--- packages/cyrus-sasl/cyrus-sasl-keytab.patch:1.1 Fri Oct 26 03:21:18 2007
+++ packages/cyrus-sasl/cyrus-sasl-keytab.patch Sat Sep 17 10:54:30 2011
@@ -1,7 +1,6 @@
-diff -u -r cyrus-sasl-2.1.21-orig/cmulocal/sasl2.m4
cyrus-sasl-2.1.21/cmulocal/sasl2.m4
---- cyrus-sasl-2.1.21-orig/cmulocal/sasl2.m4 2006-08-01 08:29:59.000000000
+0200
-+++ cyrus-sasl-2.1.21/cmulocal/sasl2.m4 2006-08-01 08:31:32.000000000
+0200
-@@ -257,7 +257,21 @@
+--- cyrus-sasl-2.1.25/cmulocal/sasl2.m4.orig 2011-09-02 14:58:00.000000000
+0200
++++ cyrus-sasl-2.1.25/cmulocal/sasl2.m4 2011-09-16 21:53:44.032825454
+0200
+@@ -268,7 +268,21 @@
cmu_save_LIBS="$LIBS"
LIBS="$LIBS $GSSAPIBASE_LIBS"
@@ -21,9 +20,9 @@
+],[AC_DEFINE(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY,,
+ [Define if your GSSAPI implimentation defines
GSSKRB5_REGISTER_ACCEPTOR_IDENTITY])
+])
- LIBS="$cmu_save_LIBS"
- else
- AC_MSG_RESULT([disabled])
+ AC_CHECK_FUNCS(gss_decapsulate_token)
+ AC_CHECK_FUNCS(gss_encapsulate_token)
+ AC_CHECK_FUNCS(gss_oid_equal)
diff -u -r cyrus-sasl-2.1.21-orig/plugins/gssapi.c
cyrus-sasl-2.1.21/plugins/gssapi.c
--- cyrus-sasl-2.1.21-orig/plugins/gssapi.c 2004-07-21 16:39:06.000000000
+0200
+++ cyrus-sasl-2.1.21/plugins/gssapi.c 2006-08-01 08:30:26.000000000 +0200
================================================================
Index: packages/cyrus-sasl/cyrus-sasl-lt.patch
diff -u packages/cyrus-sasl/cyrus-sasl-lt.patch:1.3
packages/cyrus-sasl/cyrus-sasl-lt.patch:1.4
--- packages/cyrus-sasl/cyrus-sasl-lt.patch:1.3 Sat May 21 01:38:46 2005
+++ packages/cyrus-sasl/cyrus-sasl-lt.patch Sat Sep 17 10:54:30 2011
@@ -17,9 +17,9 @@
- $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
-
-
---- cyrus-sasl-2.1.21/lib/Makefile.am.orig 2005-05-07 06:54:18.000000000
+0200
-+++ cyrus-sasl-2.1.21/lib/Makefile.am 2005-05-21 01:12:10.739527352 +0200
-@@ -74,25 +74,6 @@
+--- cyrus-sasl-2.1.25/lib/Makefile.am.orig 2011-09-05 16:18:10.000000000
+0200
++++ cyrus-sasl-2.1.25/lib/Makefile.am 2011-09-16 18:57:36.749138290 +0200
+@@ -76,25 +76,6 @@
install-exec-hook:
endif
@@ -42,6 +42,6 @@
- rm -f $@
- ln -s .libs/$@ $@
-
- $(SASL_STATIC_OBJS): linksrcs
+ $(SASL_STATIC_SRCS): linksrcs
linksrcs:
================================================================
Index: packages/cyrus-sasl/cyrus-sasl-nolibs.patch
diff -u packages/cyrus-sasl/cyrus-sasl-nolibs.patch:1.2
packages/cyrus-sasl/cyrus-sasl-nolibs.patch:1.3
--- packages/cyrus-sasl/cyrus-sasl-nolibs.patch:1.2 Sat May 21 01:38:46 2005
+++ packages/cyrus-sasl/cyrus-sasl-nolibs.patch Sat Sep 17 10:54:30 2011
@@ -9,15 +9,15 @@
dnl Check for getaddrinfo
GETADDRINFOOBJS=""
---- cyrus-sasl-2.1.21/cmulocal/bsd_sockets.m4.orig 2005-04-26
21:14:07.000000000 +0200
-+++ cyrus-sasl-2.1.21/cmulocal/bsd_sockets.m4 2005-05-20 22:51:01.224089408
+0200
+--- cyrus-sasl-2.1.25/cmulocal/bsd_sockets.m4.orig 2010-02-18
17:19:17.000000000 +0100
++++ cyrus-sasl-2.1.25/cmulocal/bsd_sockets.m4 2011-09-16 18:55:17.595800296
+0200
@@ -30,7 +30,7 @@
u_char ans[1024];
res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
return 0;
-]], LIB_SOCKET="-lresolv $LIB_SOCKET")
-+]], LIB_SOCKET="$LIB_SOCKET") dnl res_* funcs aren't used anyway
- )
++]], LIB_SOCKET="$LIB_SOCKET")
+ ])
LIBS="$LIB_SOCKET $save_LIBS"
AC_CHECK_FUNCS(dn_expand dns_lookup)
--- cyrus-sasl-2.1.10/saslauthd/configure.in.orig Fri Dec 6 17:24:06 2002
================================================================
Index: packages/cyrus-sasl/cyrus-sasl-parallel-make.patch
diff -u packages/cyrus-sasl/cyrus-sasl-parallel-make.patch:1.1
packages/cyrus-sasl/cyrus-sasl-parallel-make.patch:1.2
--- packages/cyrus-sasl/cyrus-sasl-parallel-make.patch:1.1 Wed Dec 9
10:10:03 2009
+++ packages/cyrus-sasl/cyrus-sasl-parallel-make.patch Sat Sep 17 10:54:30 2011
@@ -12,36 +12,48 @@
# Compatibility function build rules (they build in lib/)
$(COMPAT_OBJS):
-diff -ur cyrus-sasl-2.1.23.orig/plugins/makeinit.sh
cyrus-sasl-2.1.23/plugins/makeinit.sh
---- cyrus-sasl-2.1.23.orig/plugins/makeinit.sh 2009-12-09 08:19:06.921144397
+0000
-+++ cyrus-sasl-2.1.23/plugins/makeinit.sh 2009-12-09 08:25:31.644442215
+0000
-@@ -1,5 +1,6 @@
--for mech in anonymous crammd5 digestmd5 gssapiv2 kerberos4 login ntlm otp
passdss plain srp; do
--
-+mech="${1%_init.c}"
-+case "$mech" in
-+
anonymous|crammd5|digestmd5|gssapiv2|kerberos4|login|ntlm|otp|passdss|plain|srp)
+--- cyrus-sasl-2.1.25/plugins/makeinit.sh.orig 2011-09-16 21:54:18.916159956
+0200
++++ cyrus-sasl-2.1.25/plugins/makeinit.sh 2011-09-17 07:31:12.530652281
+0200
+@@ -1,6 +1,9 @@
+-# mechanism plugins
+-for mech in anonymous crammd5 digestmd5 scram gssapiv2 kerberos4 login ntlm
otp passdss plain srp gs2; do
++plug="${1%_init.c}"
+
++# mechanism plugins
++case "$plug" in
++
anonymous|crammd5|digestmd5|scram|gssapiv2|kerberos4|login|ntlm|otp|passdss|plain|srp|gs2)
++mech="$plug"
echo "
#include <config.h>
-@@ -43,10 +44,9 @@
+@@ -44,11 +47,13 @@
SASL_CLIENT_PLUG_INIT( $mech )
SASL_SERVER_PLUG_INIT( $mech )
" > ${mech}_init.c
-done
--
--for mech in sasldb mysql pgsql sqlite ldapdb; do
+;;
++esac
-+ sasldb|mysql|pgsql|sqlite|ldapdb)
+ # auxprop plugins
+-for auxprop in sasldb mysql pgsql sqlite sqlite3 ldapdb; do
+-
++case "$plug" in
++ sasldb|mysql|pgsql|sqlite|sqlite3|ldapdb)
++auxprop=$plug
echo "
#include <config.h>
-@@ -85,5 +85,6 @@
+@@ -87,7 +92,12 @@
- SASL_AUXPROP_PLUG_INIT( $mech )
- " > ${mech}_init.c
+ SASL_AUXPROP_PLUG_INIT( $auxprop )
+ " > ${auxprop}_init.c
-done
+;;
+esac
+ # ldapdb is also a canon_user plugin
++case "$plug" in
++ ldapdb)
+ echo "SASL_CANONUSER_PLUG_INIT( ldapdb )" >> ldapdb_init.c
++;;
++esac
================================================================
Index: packages/cyrus-sasl/cyrus-sasl-split-sql.patch
diff -u packages/cyrus-sasl/cyrus-sasl-split-sql.patch:1.4
packages/cyrus-sasl/cyrus-sasl-split-sql.patch:1.5
--- packages/cyrus-sasl/cyrus-sasl-split-sql.patch:1.4 Sat May 21 01:38:46 2005
+++ packages/cyrus-sasl/cyrus-sasl-split-sql.patch Sat Sep 17 10:54:30 2011
@@ -1,78 +1,93 @@
---- cyrus-sasl-2.1.21/configure.in.orig 2005-05-20 23:27:03.114432120
+0200
-+++ cyrus-sasl-2.1.21/configure.in 2005-05-20 23:45:10.826074816 +0200
-@@ -633,10 +633,7 @@
+--- cyrus-sasl-2.1.25/configure.in.orig 2011-09-17 08:56:00.724155985
+0200
++++ cyrus-sasl-2.1.25/configure.in 2011-09-17 09:03:48.277504973 +0200
+@@ -691,10 +691,7 @@
AC_MSG_CHECKING(SQL)
if test "$sql" != no; then
AC_MSG_RESULT(enabled)
- SASL_MECHS="$SASL_MECHS libsql.la"
if test "$enable_static" = yes; then
-- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sql.c"
+- SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/sql.c"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS sql.o"
AC_DEFINE(STATIC_SQL,[],[Link SQL plugin staticly])
fi
else
-@@ -683,6 +680,8 @@
+@@ -741,6 +738,8 @@
CMU_ADD_LIBPATH_TO(${with_mysql}, LIB_MYSQL)
fi
+ SASL_MECHS="$SASL_MECHS libmysql.la"
-+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS"
++ SASL_STATIC_OBJS="$SASL_STATIC_OBJS mysql.o"
LIB_MYSQL_DIR=$LIB_MYSQL
LIB_MYSQL="$LIB_MYSQL -lmysqlclient"
-@@ -747,6 +746,8 @@
+@@ -805,6 +804,8 @@
CMU_ADD_LIBPATH_TO(${with_pgsql}, LIB_PGSQL)
fi
+ SASL_MECHS="$SASL_MECHS libpgsql.la"
-+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS"
++ SASL_STATIC_OBJS="$SASL_STATIC_OBJS pgsql.o"
LIB_PGSQL_DIR=$LIB_PGSQL
LIB_PGSQL="$LIB_PGSQL -lpq"
-@@ -808,6 +809,8 @@
+@@ -866,6 +867,8 @@
LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
fi
+ SASL_MECHS="$SASL_MECHS libsqlite.la"
-+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS"
++ SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite.o"
LIB_SQLITE_DIR=$LIB_SQLITE
LIB_SQLITE="$LIB_SQLITE -lsqlite"
---- cyrus-sasl-2.1.21/plugins/Makefile.am.orig 2005-05-07 06:54:18.000000000
+0200
-+++ cyrus-sasl-2.1.21/plugins/Makefile.am 2005-05-20 23:53:09.158357256
+0200
-@@ -79,7 +79,7 @@
+@@ -918,6 +921,8 @@
+ LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
+ fi
+
++ SASL_MECHS="$SASL_MECHS libsqlite3.la"
++ SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite3.o"
+ LIB_SQLITE3_DIR=$LIB_SQLITE3
+ LIB_SQLITE3="$LIB_SQLITE3 -lsqlite3"
+
+--- cyrus-sasl-2.1.25/plugins/Makefile.am.orig 2011-09-05 16:18:10.000000000
+0200
++++ cyrus-sasl-2.1.25/plugins/Makefile.am 2011-09-16 19:41:32.459226542
+0200
+@@ -66,7 +66,7 @@
sasl_LTLIBRARIES = @SASL_MECHS@
EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la
\
- libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
-- libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
-+ libntlm.la libpassdss.la libsasldb.la libmysql.la libpgsql.la
libsqlite.la libldapdb.la
+ libgs2.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la
libotp.la \
+- libscram.la libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
++ libscram.la libntlm.la libpassdss.la libsasldb.la libmysql.la
libpgsql.la libsqlite.la libsqlite3.la libldapdb.la
libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
- libplain_la_LDFLAGS = -version-info $(plain_version)
-@@ -147,17 +147,41 @@
+ libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
+@@ -129,18 +129,51 @@
libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libldapdb_la_LIBADD = $(COMPAT_OBJS)
+ libldapdb_la_LIBADD = $(LIB_LDAP) $(COMPAT_OBJS)
-libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
--libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info
$(sql_version)
+-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) $(LIB_SQLITE3) \
+- $(AM_LDFLAGS)
-libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
-libsql_la_LIBADD = $(COMPAT_OBJS)
-
+libmysql_la_SOURCES = mysql.c mysql_init.c $(common_sources)
-+libmysql_la_LDFLAGS = $(LIB_MYSQL) -version-info $(sql_version)
++libmysql_la_LDFLAGS = $(LIB_MYSQL) $(AM_LDFLAGS)
+libmysql_la_DEPENDENCIES = $(COMPAT_OBJS)
+libmysql_la_LIBADD = $(COMPAT_OBJS)
+
+libpgsql_la_SOURCES = pgsql.c pgsql_init.c $(common_sources)
-+libpgsql_la_LDFLAGS = $(LIB_PGSQL) -version-info $(sql_version)
++libpgsql_la_LDFLAGS = $(LIB_PGSQL) $(AM_LDFLAGS)
+libpgsql_la_DEPENDENCIES = $(COMPAT_OBJS)
+libpgsql_la_LIBADD = $(COMPAT_OBJS)
+
+libsqlite_la_SOURCES = sqlite.c sqlite_init.c $(common_sources)
-+libsqlite_la_LDFLAGS = $(LIB_SQLITE) -version-info $(sql_version)
++libsqlite_la_LDFLAGS = $(LIB_SQLITE) $(AM_LDFLAGS)
+libsqlite_la_DEPENDENCIES = $(COMPAT_OBJS)
+libsqlite_la_LIBADD = $(COMPAT_OBJS)
+
++libsqlite3_la_SOURCES = sqlite3.c sqlite3_init.c $(common_sources)
++libsqlite3_la_LDFLAGS = $(LIB_SQLITE3) $(AM_LDFLAGS)
++libsqlite3_la_DEPENDENCIES = $(COMPAT_OBJS)
++libsqlite3_la_LIBADD = $(COMPAT_OBJS)
++
+mysql.c:
+ sed -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g' -e
's#HAVE_SQLITE#HAVE_NO_SQLITE#g' \
+ -e 's#sql_auxprop_plug_init#mysql_auxprop_plug_init#g' \
@@ -84,27 +99,32 @@
+ sql.c > pgsql.c
+
+sqlite.c:
-+ sed -e 's#HAVE_MYSQL#HAVE_NO_MYSQL#g' -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g'
\
++ 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' \
+ -e 's#sql_auxprop_plug_init#sqlite_auxprop_plug_init#g' \
+ sql.c > sqlite.c
++
++sqlite3.c:
++ 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' \
++ -e 's#sql_auxprop_plug_init#sqlite3_auxprop_plug_init#g' \
++ sql.c > sqlite3.c
# Instructions for making the _init files
- init_src=anonymous_init.c crammd5_init.c digestmd5_init.c gssapiv2_init.c \
+ init_src=anonymous_init.c crammd5_init.c digestmd5_init.c scram_init.c
gs2_init.c gssapiv2_init.c \
kerberos4_init.c login_init.c plain_init.c srp_init.c otp_init.c ntlm_init.c \
-passdss_init.c sasldb_init.c sql_init.c ldapdb_init.c
-+passdss_init.c sasldb_init.c mysql_init.c pgsql_init.c sqlite_init.c
ldapdb_init.c
++passdss_init.c sasldb_init.c mysql_init.c pgsql_init.c sqlite_init.c
sqlite3_init.c ldapdb_init.c
CLEANFILES=$(init_src)
---- cyrus-sasl-2.1.21/plugins/makeinit.sh.orig 2005-02-16 21:49:49.000000000
+0100
-+++ cyrus-sasl-2.1.21/plugins/makeinit.sh 2005-05-20 23:53:28.019489928
+0200
-@@ -45,7 +45,7 @@
- " > ${mech}_init.c
+--- cyrus-sasl-2.1.25/plugins/makeinit.sh.orig 2011-05-11 21:25:55.000000000
+0200
++++ cyrus-sasl-2.1.25/plugins/makeinit.sh 2011-09-16 19:42:14.509227950
+0200
+@@ -47,7 +47,7 @@
done
--for mech in sasldb sql ldapdb; do
-+for mech in sasldb mysql pgsql sqlite ldapdb; do
+ # auxprop plugins
+-for auxprop in sasldb sql ldapdb; do
++for auxprop in sasldb mysql pgsql sqlite sqlite3 ldapdb; do
echo "
#include <config.h>
================================================================
Index: packages/cyrus-sasl/cyrus-sasl.spec
diff -u packages/cyrus-sasl/cyrus-sasl.spec:1.206
packages/cyrus-sasl/cyrus-sasl.spec:1.207
--- packages/cyrus-sasl/cyrus-sasl.spec:1.206 Fri Aug 12 19:16:51 2011
+++ packages/cyrus-sasl/cyrus-sasl.spec Sat Sep 17 10:54:30 2011
@@ -8,7 +8,8 @@
%bcond_without gssapi # do not enable GSSAPI support for saslauthd
and build gssapi plugin
%bcond_without mysql # don't build MySQL pluggin
%bcond_without pgsql # do not build PostgreSQL pluggin
-%bcond_without sqlite # do not enable sqlite plugin
+%bcond_without sqlite # do not enable sqlite 2 plugin
+%bcond_without sqlite3 # do not enable sqlite 3 plugin
%bcond_with authlib # enable courier-authlib (i wasn't able to test
it)
%bcond_with opie # enable opie plugin
%bcond_with srp # build srp pluggin
@@ -25,12 +26,12 @@
Summary(ru.UTF-8): Библиотека Cyrus SASL
Summary(uk.UTF-8): Бібліотека Cyrus SASL
Name: cyrus-sasl
-Version: 2.1.23
-Release: 15
+Version: 2.1.25
+Release: 1
License: distributable
Group: Libraries
-Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
-# Source0-md5: 2eb0e48106f0e9cd8001e654f267ecbc
+Source0: ftp://ftp.cyrusimap.org/cyrus-sasl/%{name}-%{version}.tar.gz
+# Source0-md5: 341cffe829a4d71f2a6503d669d5a946
Source1: saslauthd.init
Source2: saslauthd.sysconfig
Source3: %{name}.pam
@@ -44,17 +45,15 @@
Patch5: %{name}-cryptedpw.patch
Patch6: %{name}-md5sum-passwords.patch
Patch7: %{name}-db.patch
-Patch8: %{name}-automake_1_10.patch
-Patch9: %{name}-digest-commas.patch
-Patch10: %{name}-keytab.patch
-Patch11: %{name}-sizes.patch
-Patch12: %{name}-nagios-plugin.patch
-Patch13: %{name}-parallel-make.patch
-Patch14: %{name}-gssapi-detect.patch
-Patch15: %{name}-saslauthd-httpform-urlescape.patch
-Patch16: %{name}-ac-libs.patch
-Patch17: %{name}-pam.patch
-Patch18: %{name}-ac.patch
+Patch8: %{name}-keytab.patch
+Patch9: %{name}-sizes.patch
+Patch10: %{name}-nagios-plugin.patch
+Patch11: %{name}-parallel-make.patch
+Patch12: %{name}-gssapi-detect.patch
+Patch13: %{name}-saslauthd-httpform-urlescape.patch
+Patch14: %{name}-ac-libs.patch
+Patch15: %{name}-pam.patch
+Patch16: %{name}-gssapi_ext.patch
URL: http://asg.web.cmu.edu/sasl/
BuildRequires: autoconf >= 2.54
BuildRequires: automake >= 1:1.7
@@ -72,6 +71,7 @@
%{?with_pgsql:BuildRequires: postgresql-devel}
BuildRequires: rpmbuild(macros) >= 1.268
%{?with_sqlite:BuildRequires: sqlite-devel}
+%{?with_sqlite3:BuildRequires: sqlite3-devel >= 3}
Requires: pam >= 0.79.0
Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -178,6 +178,25 @@
Статичні бібліотеки, необхідні для розробки програм, що використовують
Cyrus SASL.
+%package anonymous
+Summary: Anonymous Cyrus SASL plugin
+Summary(pl.UTF-8): Wtyczka anonymous do Cyrus SASL
+Summary(pt_BR.UTF-8): Mecanismo SASL ANONYMOUS
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description anonymous
+This plugin implements the SASL ANONYMOUS mechanism, used for
+anonymous authentication.
+
+%description anonymous -l pl.UTF-8
+Wtyczka dodająca obsługę mechanizmu ANONYMOUS do Cyrus SASL. Służy do
+anonimowego uwierzytelniania.
+
+%description anonymous -l pt_BR.UTF-8
+Este plugin implementa o mecanismo SASL ANONYMOUS, usado para
+autenticação anônima.
+
%package cram-md5
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl-cryptedpw.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl-db.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl-gcc4.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl-gssapi-detect.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl-keytab.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl-lt.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl-nolibs.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl-parallel-make.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl-split-sql.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl.spec?r1=1.206&r2=1.207&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
