summary refs log tree commit diff
path: root/pkgs/development/libraries/cyrus-sasl
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/cyrus-sasl')
-rw-r--r--pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch21
-rw-r--r--pkgs/development/libraries/cyrus-sasl/default.nix1
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch
new file mode 100644
index 00000000000..33550c428d2
--- /dev/null
+++ b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-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,
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 2c96068c067..57bf30c6649 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -9,4 +9,5 @@ stdenv.mkDerivation {
   };
   configureFlags="--with-openssl=${openssl} --with-plugindir=\${out}/lib/sasl2 --with-configdir=\${out}/lib/sasl2";
   buildInputs = [ openssl db4 gettext ];
+  patches = [ ./cyrus-sasl-2.1.22-bad-elif.patch ];
 }