cups-filters: update, including security fixes

- NEWS claims to fix CVE-2015-{3258,3279}
- shell path is now directly configurable

/cc maintainer @ttuegel.

pkgs/development/libraries/poppler/default.nix

@@ -4,7 +4,7 @@
 , utils ? false, suffix ? "glib"
 }:
 
-let
+let # beware: updates often break cups_filters build
   version = "0.32.0"; # even major numbers are stable
   sha256 = "162vfbvbz0frvqyk00ldsbl49h4bj8i8wn0ngfl30xg1lldy6qs9";
 in

pkgs/misc/cups/filters.nix

@@ -1,35 +1,32 @@
-{ stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig
+{ stdenv, fetchurl, fetchpatch, pkgconfig, cups, poppler, poppler_utils, fontconfig
 , libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi }:
 
 stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.0.61";
+  version = "1.0.71";
 
   src = fetchurl {
     url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "1bq48nnrarlbf6qc93bz1n5wlh6j420gppbck3r45sinwhz5wa7m";
+    sha256 = "07wwlqcykfjfqcwj1bxk60ggahyaw7wcx32n5s104d1qkhham01i";
   };
 
-  patches = [
-    (substituteAll {
-      src = ./longer-shell-path.patch;
-      bash = "${bash}/bin/bash";
-    })
-
-    # Fix build with poppler-0.31.0
-    (fetchurl {
-      url = "https://bugs.linuxfoundation.org/attachment.cgi?id=476";
-      name = "cups-filters-poppler-0.31.0.patch";
-      sha256 = "016pzksz4nl1sv3p5ahlnbmb7c899yrvlzq8jxic0gvdrzwd5bl4";
-    })
-  ];
+  patches = [(fetchpatch { # drop on update
+    name = "poppler-0.34.patch";
+    url = "https://bugs.linuxfoundation.org/attachment.cgi?id=493";
+    sha256 = "18za83q0b0n4hpvvw76jsv0hm89zmijvps2z5kg1srickqlxj891";
+  })];
 
   buildInputs = [
     pkgconfig cups poppler poppler_utils fontconfig libjpeg libpng perl
     ijs qpdf dbus avahi
   ];
 
-  configureFlags = "--with-pdftops=pdftops --enable-imagefilters --with-rcdir=no";
+  configureFlags = [
+    "--with-pdftops=pdftops"
+    "--enable-imagefilters"
+    "--with-rcdir=no"
+    "--with-shell=${stdenv.shell}"
+  ];
 
   makeFlags = "CUPS_SERVERBIN=$(out)/lib/cups CUPS_DATADIR=$(out)/share/cups CUPS_SERVERROOT=$(out)/etc/cups";
 

pkgs/misc/cups/longer-shell-path.patch

@@ -1,13 +0,0 @@
-diff --git a/filter/foomatic-rip/foomaticrip.c b/filter/foomatic-rip/foomaticrip.c
-index 1c019aa..431d2f9 100644
---- a/filter/foomatic-rip/foomaticrip.c
-+++ b/filter/foomatic-rip/foomaticrip.c
-@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/filter:"
-                                 "/opt/cups/filter:"
-                                 "/usr/lib/cups/filter";
- 
--char modern_shell[64] = "/bin/bash";
-+char modern_shell[128] = "@bash@";
- 
- void config_set_option(const char *key, const char *value)
- {