public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cyrus-sasl: 2.1.26 -> 2.1.27 w/ cross-compiling support 

Fixes #50539
This commit is contained in:
eburimu 2018-11-20 21:41:16 -06:00 committed by Matthew Bauer
parent d492f53faf
commit b13af1e87b
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch Normal file
View File

@ -0,0 +1,12 @@
--- a/m4/sasl2.m4 2018-11-18 22:33:29.902625600 +0300
+++ b/m4/sasl2.m4 2018-11-18 22:33:59.828746176 +0300
@@ -339,7 +339,8 @@
],
[ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
AC_MSG_RESULT(yes) ],
- AC_MSG_RESULT(no))
+ AC_MSG_RESULT(no),
+ AC_MSG_RESULT(no))
LIBS="$cmu_save_LIBS"
else

25
pkgs/development/libraries/cyrus-sasl/default.nix
View File

@ -1,32 +1,29 @@
{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext, { lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext
pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false }: , pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false
, buildPackages }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cyrus-sasl-${version}${optionalString (kerberos == null) "-without-kerberos"}"; name = "cyrus-sasl-${version}${optionalString (kerberos == null) "-without-kerberos"}";
version = "2.1.26"; version = "2.1.27";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz"; url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz";
sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g"; sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6";
}; };
outputs = [ "bin" "dev" "out" "man" "devdoc" ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames ];
buildInputs = buildInputs =
[ openssl db gettext kerberos ] [ openssl db gettext kerberos ]
++ lib.optional enableLdap openldap ++ lib.optional enableLdap openldap
++ lib.optional stdenv.isFreeBSD autoreconfHook ++ lib.optional stdenv.isLinux pam;
++ lib.optional stdenv.isLinux pam
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
patches = [ patches = [
./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519 ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
(fetchpatch { ./cyrus-sasl-ac-try-run-fix.patch
name = "CVE-2013-4122.patch";
url = "http://sourceforge.net/projects/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff";
sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2";
})
] ++ lib.optional stdenv.isFreeBSD ( ] ++ lib.optional stdenv.isFreeBSD (
fetchurl { fetchurl {
url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch"; url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch";
@ -42,10 +39,6 @@ stdenv.mkDerivation rec {
"--enable-shared" "--enable-shared"
] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}"; ] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}";
# Avoid triggering regenerating using broken autoconf/libtool bits.
# (many distributions carry patches to remove/replace, but this works for now)
dontUpdateAutotoolsGnuConfigScripts = if stdenv.hostPlatform.isMusl then true else null;
installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ];
postInstall = '' postInstall = ''