- updated for 2.1.21

Changed files:
    cyrus-sasl-lt.patch -> 1.3
    cyrus-sasl-nolibs.patch -> 1.2
    cyrus-sasl-split-sql.patch -> 1.4

diff --git a/cyrus-sasl-lt.patch b/cyrus-sasl-lt.patch
index bd60a7b42fbcdfb032aef77d2dce0736dc67d45b..3bf1241efd90258d84d9f39d2c9d273b371ba11c 100644 (file)
--- a/cyrus-sasl-lt.patch
+++ b/cyrus-sasl-lt.patch
@@ -1,5 +1,5 @@
---- cyrus-sasl-2.1.18/sasldb/Makefile.am.wiget 2004-03-10 16:51:36.000000000 +0100
-+++ cyrus-sasl-2.1.18/sasldb/Makefile.am       2004-03-11 17:20:16.214506300 +0100
+--- cyrus-sasl-2.1.21/sasldb/Makefile.am.orig  2005-05-07 06:54:18.000000000 +0200
++++ cyrus-sasl-2.1.21/sasldb/Makefile.am       2005-05-20 22:52:50.027548768 +0200
 @@ -51,7 +51,6 @@
  EXTRA_DIST = NTMakefile
  
@@ -8,12 +8,40 @@
  
  libsasldb_la_SOURCES = allockey.c sasldb.h
  EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
-@@ -63,8 +62,3 @@
+@@ -61,8 +60,3 @@
  # Prevent make dist stupidity
  libsasldb_a_SOURCES =
  EXTRA_libsasldb_a_SOURCES =
 -
--libsasldb.a: libsasldb.la $(LOCAL_SASL_DB_BACKEND_STATIC)
--      $(AR) cru .libs/$@ $(LOCAL_SASL_DB_BACKEND_STATIC)
+-libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC)
+-      $(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 @@
+ install-exec-hook:
+ endif
+ 
+-libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
+-      @echo adding static plugins and dependencies
+-      $(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
+-      @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
+-      if test ! -f $$i; then continue; fi; . $$i; \
+-      for j in $$dependency_libs foo; do \
+-      case $$j in foo) ;; \
+-      -L*) for k in $$depdirs foo; do \
+-          if test $$k = $$j; then break; fi; done; \
+-        if test $$k = foo; then depdirs="$$depdirs $$j"; fi ;; \
+-      -l*) for k in $$deplibs foo; do \
+-          if test $$k = $$j; then break; fi; done; \
+-        if test $$k = foo; then deplibs="$$deplibs $$j"; fi ;; \
+-      esac; done; dependency_libs=""; done; \
+-      sed -e "/^dependency_libs=/s%=.*%='$${depdirs}$${deplibs}'%" \
+-      libsasl2.la >TMP.$$ && mv TMP.$$ libsasl2.la
+-      rm -f $@
+-      ln -s .libs/$@ $@
+-
+ $(SASL_STATIC_OBJS): linksrcs
+ 
+ linksrcs:

diff --git a/cyrus-sasl-nolibs.patch b/cyrus-sasl-nolibs.patch
index e3cd091259b36f036ef50a2965cc7e77cb694580..a999c978a630aa05faf2f8bca18af5a5ca3299ef 100644 (file)
--- a/cyrus-sasl-nolibs.patch
+++ b/cyrus-sasl-nolibs.patch
@@ -9,26 +9,17 @@
  
  dnl Check for getaddrinfo
  GETADDRINFOOBJS=""
---- cyrus-sasl-2.1.10/cmulocal/bsd_sockets.m4.orig     Tue May 28 21:06:56 2002
-+++ cyrus-sasl-2.1.10/cmulocal/bsd_sockets.m4  Thu Jan  9 21:07:50 2003
-@@ -16,11 +16,12 @@
-                            LIB_SOCKET="-lsocket $LIB_SOCKET")
-       )
+--- 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
+@@ -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
+         )
        LIBS="$LIB_SOCKET $save_LIBS"
--      AC_CHECK_FUNC(res_search, :,
--                AC_CHECK_LIB(resolv, res_search,
--                              LIB_SOCKET="-lresolv $LIB_SOCKET") 
--        )
--      LIBS="$LIB_SOCKET $save_LIBS"
-+dnl we don't need res_search if no kerberos support
-+dnl   AC_CHECK_FUNC(res_search, :,
-+dnl             AC_CHECK_LIB(resolv, res_search,
-+dnl                           LIB_SOCKET="-lresolv $LIB_SOCKET") 
-+dnl     )
-+dnl   LIBS="$LIB_SOCKET $save_LIBS"
        AC_CHECK_FUNCS(dn_expand dns_lookup)
-       LIBS="$save_LIBS"
-       AC_SUBST(LIB_SOCKET)
 --- cyrus-sasl-2.1.10/saslauthd/configure.in.orig      Fri Dec  6 17:24:06 2002
 +++ cyrus-sasl-2.1.10/saslauthd/configure.in   Thu Jan  9 21:22:46 2003
 @@ -106,7 +106,7 @@

diff --git a/cyrus-sasl-split-sql.patch b/cyrus-sasl-split-sql.patch
index 8428120707fa384acf6148b3e8bcac058888e33a..da75a1a719c85bfab24c4bd715e01fc3a2394833 100644 (file)
--- a/cyrus-sasl-split-sql.patch
+++ b/cyrus-sasl-split-sql.patch
@@ -1,17 +1,17 @@
-diff -urN cyrus-sasl-2.1.20.org/configure.in cyrus-sasl-2.1.20/configure.in
---- cyrus-sasl-2.1.20.org/configure.in 2004-10-24 22:05:13.000000000 +0200
-+++ cyrus-sasl-2.1.20/configure.in     2005-04-04 23:12:57.615789008 +0200
-@@ -584,9 +584,7 @@
+--- 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 @@
  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_OBJS="$SASL_STATIC_OBJS ../plugins/sql.o"
+-    SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sql.c"
+-    SASL_STATIC_OBJS="$SASL_STATIC_OBJS sql.o"
      AC_DEFINE(STATIC_SQL,[],[Link SQL plugin staticly])
    fi
  else
-@@ -633,6 +631,8 @@
+@@ -683,6 +680,8 @@
        CMU_ADD_LIBPATH_TO(${with_mysql}, LIB_MYSQL)
       fi
  
@@ -20,7 +20,7 @@ diff -urN cyrus-sasl-2.1.20.org/configure.in cyrus-sasl-2.1.20/configure.in
       LIB_MYSQL_DIR=$LIB_MYSQL
       LIB_MYSQL="$LIB_MYSQL -lmysqlclient"
  
-@@ -697,6 +697,8 @@
+@@ -747,6 +746,8 @@
        CMU_ADD_LIBPATH_TO(${with_pgsql}, LIB_PGSQL)
       fi
  
@@ -29,7 +29,7 @@ diff -urN cyrus-sasl-2.1.20.org/configure.in cyrus-sasl-2.1.20/configure.in
       LIB_PGSQL_DIR=$LIB_PGSQL
       LIB_PGSQL="$LIB_PGSQL -lpq"
  
-@@ -758,6 +760,8 @@
+@@ -808,6 +809,8 @@
           LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
       fi
  
@@ -38,21 +38,20 @@ diff -urN cyrus-sasl-2.1.20.org/configure.in cyrus-sasl-2.1.20/configure.in
       LIB_SQLITE_DIR=$LIB_SQLITE
       LIB_SQLITE="$LIB_SQLITE -lsqlite"
  
-diff -urN cyrus-sasl-2.1.20.org/plugins/Makefile.am cyrus-sasl-2.1.20/plugins/Makefile.am
---- cyrus-sasl-2.1.20.org/plugins/Makefile.am  2004-10-24 22:05:20.000000000 +0200
-+++ cyrus-sasl-2.1.20/plugins/Makefile.am      2005-04-04 23:22:49.454815800 +0200
-@@ -77,7 +77,7 @@
+--- 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 @@
  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 libsasldb.la libsql.la
-+      libntlm.la libsasldb.la libmysql.la libpgsql.la libsqlite.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
  
  libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
  libplain_la_LDFLAGS = -version-info $(plain_version)
-@@ -135,17 +135,41 @@
- libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
+@@ -147,17 +147,41 @@
+ libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libldapdb_la_LIBADD = $(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)
@@ -93,30 +92,19 @@ diff -urN cyrus-sasl-2.1.20.org/plugins/Makefile.am cyrus-sasl-2.1.20/plugins/Ma
  
  init_src=anonymous_init.c crammd5_init.c digestmd5_init.c gssapiv2_init.c \
  kerberos4_init.c login_init.c plain_init.c srp_init.c otp_init.c ntlm_init.c \
--sasldb_init.c sql_init.c
-+sasldb_init.c mysql_init.c pgsql_init.c sqlite_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
  
  
  CLEANFILES=$(init_src)
-diff -urN cyrus-sasl-2.1.20.org/plugins/makeinit.sh cyrus-sasl-2.1.20/plugins/makeinit.sh
---- cyrus-sasl-2.1.20.org/plugins/makeinit.sh  2003-07-15 19:38:59.000000000 +0200
-+++ cyrus-sasl-2.1.20/plugins/makeinit.sh      2005-04-04 23:00:03.871750928 +0200
+--- 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
  done
  
--for mech in sasldb sql ; do
-+for mech in sasldb mysql pgsql sqlite ; do
+-for mech in sasldb sql ldapdb; do
++for mech in sasldb mysql pgsql sqlite ldapdb; do
  
  echo "
  #include <config.h>
---- cyrus-sasl-2.1.20/lib/Makefile.am.orig     2004-10-24 22:05:19.000000000 +0200
-+++ cyrus-sasl-2.1.20/lib/Makefile.am  2005-05-14 10:44:12.000000000 +0200
-@@ -88,7 +88,5 @@
-           if test $$k = $$j; then break; fi; done; \
-         if test $$k = foo; then deplibs="$$deplibs $$j"; fi ;; \
-       esac; done; dependency_libs=""; done; \
--      sed -e "/^dependency_libs=/s%=.*%='$${depdirs}$${deplibs}'%" \
--      libsasl2.la >TMP.$$ && mv TMP.$$ libsasl2.la
-       rm -f $@
-       ln -s .libs/$@ $@