BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cyrus-sasl: update to version 2.1.25

Browse source
This commit is contained in:
Peter Simons 2012-07-07 13:00:53 +02:00
parent a59ed42a8b
commit af61749b18
2 changed files with 21 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch
View file

@ -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,

31
pkgs/development/libraries/cyrus-sasl/default.nix
View file

@ -1,16 +1,27 @@
{ stdenv, fetchurl, openssl, db4, gettext, automake} :
{ stdenv, fetchurl, openssl, db4, gettext }:
stdenv.mkDerivation {
name = "cyrus-sasl-2.1.23";
stdenv.mkDerivation rec {
name = "cyrus-sasl-2.1.25";
src = fetchurl {
url = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.23.tar.gz;
sha256 = "0dmi41hfy015pzks8n93qsshgvi0az7pv81nls4nxayb810crvr0";
url = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${name}.tar.gz";
sha256 = "418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe";
};
preConfigure=''
configureFlags="--with-openssl=${openssl} --with-plugindir=$out/lib/sasl2 --with-configdir=$out/lib/sasl2 --enable-login"
cp ${automake}/share/automake*/config.{sub,guess} config
'';
buildInputs = [ openssl db4 gettext ];
patches = [ ./cyrus-sasl-2.1.22-bad-elif.patch ];
# Set this variable at build-time to make sure $out can be evaluated.
preConfigure = ''
configureFlagsArray=( --with-plugindir=$out/lib/sasl2
--with-configdir=$out/lib/sasl2
--enable-login
)
'';
meta = {
homepage = "http://cyrusimap.web.cmu.edu/";
description = "library for adding authentication support to connection-based protocols";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}