diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-07-21 20:53:55 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-07-21 20:57:49 +0200 |
| commit | 9147dee57fe1e1deb52398fc6ddd8dac9dab87e6 (patch) | |
| tree | ead39e83bc49159264f5b7c2b9c51fe140933b40 /pkgs/misc/cups | |
| parent | 1bcf33a7fa32672de20020da587465b4d5830f33 (diff) | |
| download | nixlib-9147dee57fe1e1deb52398fc6ddd8dac9dab87e6.tar nixlib-9147dee57fe1e1deb52398fc6ddd8dac9dab87e6.tar.gz nixlib-9147dee57fe1e1deb52398fc6ddd8dac9dab87e6.tar.bz2 nixlib-9147dee57fe1e1deb52398fc6ddd8dac9dab87e6.tar.lz nixlib-9147dee57fe1e1deb52398fc6ddd8dac9dab87e6.tar.xz nixlib-9147dee57fe1e1deb52398fc6ddd8dac9dab87e6.tar.zst nixlib-9147dee57fe1e1deb52398fc6ddd8dac9dab87e6.zip | |
cups-filters: update, including security fixes
- NEWS claims to fix CVE-2015-{3258,3279}
- shell path is now directly configurable
/cc maintainer @ttuegel.
Diffstat (limited to 'pkgs/misc/cups')
| -rw-r--r-- | pkgs/misc/cups/filters.nix | 31 | ||||
| -rw-r--r-- | pkgs/misc/cups/longer-shell-path.patch | 13 |
2 files changed, 14 insertions, 30 deletions
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 8043cbb1506e..a860273e9eb5 100644 --- a/pkgs/misc/cups/filters.nix +++ b/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"; diff --git a/pkgs/misc/cups/longer-shell-path.patch b/pkgs/misc/cups/longer-shell-path.patch deleted file mode 100644 index a15fd4832258..000000000000 --- a/pkgs/misc/cups/longer-shell-path.patch +++ /dev/null @@ -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) - { |