cyrus-sasl: Copy patch files into repository.

diff --git a/pkgs/core/cyrus-sasl/cyrus-sasl.nm b/pkgs/core/cyrus-sasl/cyrus-sasl.nm
index 56d92dfad8fe48f3c6643cb70e693cb97340bf2a..57a1475ed4f08999d2a10d687438de8dcc64cc4f 100644 (file)
--- a/pkgs/core/cyrus-sasl/cyrus-sasl.nm
+++ b/pkgs/core/cyrus-sasl/cyrus-sasl.nm
@@ -44,8 +44,6 @@ endef
 
 PKG_TARBALL    = $(THISAPP).tar.gz
 
-PKG_PATCHES   += $(THISAPP)-bad-elif.patch
-
 CONFIGURE_OPTIONS += --sysconfdir=/etc \
        --with-dbpath=/var/lib/sasl/sasldb2 \
        --with-saslauthd=/var/run/saslauthd \

diff --git a/pkgs/core/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch b/pkgs/core/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch
new file mode 100644 (file)
index 0000000..33550c4
--- /dev/null
+++ b/pkgs/core/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch
@@ -0,0 +1,21 @@
+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,