cyrus-sasl: Updated to latest stable 2.1.25

Fixes #290

diff --git a/cyrus-sasl/cyrus-sasl.nm b/cyrus-sasl/cyrus-sasl.nm
index beab6159ecc23365da1a7c826206bff6e2b317de..b28d4020893487ec4da8ae363648492f76175292 100644 (file)
--- a/cyrus-sasl/cyrus-sasl.nm
+++ b/cyrus-sasl/cyrus-sasl.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = cyrus-sasl
-version    = 2.1.23
-release    = 0
+version    = 2.1.25
+release    = 1
 
 groups     = System/Libraries
 url        = http://asg.web.cmu.edu/sasl/sasl-library.html
@@ -18,7 +18,7 @@ description
        adding authentication support to connection-based protocols.
 end
 
-source_dl  =
+source_dl  = ftp://ftp.cyrusimap.org/cyrus-sasl/
 
 build
        requires

diff --git a/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch b/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch
deleted file mode 100644 (file)
index 33550c4..0000000
--- a/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up cyrus-sasl-2.1.22/plugins/digestmd5.c.elif cyrus-sasl-2.1.22/plugins/digestmd5.c
---- cyrus-sasl-2.1.22/plugins/digestmd5.c.elif 2009-01-23 09:40:31.000000000 +0100
-+++ cyrus-sasl-2.1.22/plugins/digestmd5.c      2009-02-06 15:20:15.000000000 +0100
-@@ -2743,7 +2743,7 @@ static sasl_server_plug_t digestmd5_serv
-       "DIGEST-MD5",                   /* mech_name */
- #ifdef WITH_RC4
-       128,                            /* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
-       112,
- #else 
-       1,
-@@ -4071,7 +4071,7 @@ static sasl_client_plug_t digestmd5_clie
-       "DIGEST-MD5",
- #ifdef WITH_RC4                               /* mech_name */
-       128,                            /* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
-       112,
- #else
-       1,