diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
| commit | 5185bc177309c62e53dad1ad346d1220f0e77bd4 (patch) | |
| tree | 52f5878b394abf2ef326765d46880ccbabd84903 /pkgs/tools/networking/mailutils | |
| parent | 07615735077db344539eb9131823600593f0eddf (diff) | |
| parent | f402c6321aa3c6e56f5e1f1e36c4ad459c881309 (diff) | |
| download | nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.gz nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.bz2 nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.lz nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.xz nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.zst nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/networking/mailutils')
| -rw-r--r-- | pkgs/tools/networking/mailutils/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/tools/networking/mailutils/scm_c_string.patch | 15 |
2 files changed, 25 insertions, 9 deletions
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 140d58e3163..0ae993db332 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,7 +1,6 @@ { fetchurl, stdenv, gettext, gdbm, libtool, pam, readline -, ncurses, gnutls, mysql, guile, texinfo, gnum4, dejagnu, sendmailPath ? "/var/setuid-wrappers/sendmail" }: - -/* TODO: Add GNU SASL, GNU GSSAPI, and FreeBidi. */ +, ncurses, gnutls, sasl, fribidi, gss , mysql, guile, texinfo, + gnum4, dejagnu, nettools }: stdenv.mkDerivation rec { name = "mailutils-2.2"; @@ -13,17 +12,19 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - patches = [ ./path-to-cat.patch ./no-gets.patch ]; + patches = [ ./path-to-cat.patch ./no-gets.patch ./scm_c_string.patch ]; - configureFlags = "--with-path-sendmail=${sendmailPath}"; + configureFlags = [ + "--with-gsasl" + "--with-gssapi=${gss}" + ]; buildInputs = [ gettext gdbm libtool pam readline ncurses - gnutls mysql.lib guile texinfo gnum4 ] + gnutls mysql.lib guile texinfo gnum4 sasl fribidi gss nettools ] ++ stdenv.lib.optional doCheck dejagnu; - # Tests fail since gcc 4.8 - doCheck = false; + doCheck = true; meta = with stdenv.lib; { description = "Rich and powerful protocol-independent mail framework"; @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { gpl3Plus /* tools */ ]; - maintainers = [ ]; + maintainers = with maintainers; [ vrthra ]; homepage = http://www.gnu.org/software/mailutils/; diff --git a/pkgs/tools/networking/mailutils/scm_c_string.patch b/pkgs/tools/networking/mailutils/scm_c_string.patch new file mode 100644 index 00000000000..367dd2d6406 --- /dev/null +++ b/pkgs/tools/networking/mailutils/scm_c_string.patch @@ -0,0 +1,15 @@ +See https://lists.gnu.org/archive/html/bug-mailutils/2010-10/msg00005.html + +diff -u mailutils-2.2/libmu_scm/mu_message.c mailutils-2.2.new/libmu_scm/mu_message.c +--- mailutils-2.2/libmu_scm/mu_message.c 2010-04-18 10:29:07.000000000 -0700 ++++ mailutils-2.2.new/libmu_scm/mu_message.c 2016-07-03 21:18:53.746185547 -0700 +@@ -510,8 +510,8 @@ + { + SCM car = SCM_CAR (lst); + if (scm_is_string (car) + && mu_c_strncasecmp (scm_i_string_chars (car), name, +- scm_i_string_length (car)) == 0) ++ scm_c_string_length (car)) == 0) + return 1; + } + return 0; |