diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:51:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:51:31 +0200 |
| commit | 209730208a2ec0e3158303271d058dc851f83b99 (patch) | |
| tree | 286b2abfb02d711233ae9b4f7f7b755de27843ac /pkgs/tools/text | |
| parent | aa5a93e21d77e2c2464b39a5f4dabbfebfb225b4 (diff) | |
| parent | cbabebcc2e3b884296fedf8591e04f59240b3939 (diff) | |
| download | nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.gz nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.bz2 nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.lz nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.xz nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.zst nixlib-209730208a2ec0e3158303271d058dc851f83b99.zip | |
Merge branch 'staging-next'
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/catdoc/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/gnupatch/default.nix | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index 2a06b25b11da..8a8eb3117f03 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = "--disable-wordview"; + configureFlags = [ "--disable-wordview" ]; meta = with stdenv.lib; { description = "MS-Word/Excel/PowerPoint to text converter"; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index c83eab2e2ef6..0ad2a18236f6 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, ed +, ed, autoreconfHook , buildPlatform, hostPlatform }: @@ -14,9 +14,18 @@ stdenv.mkDerivation rec { patches = [ # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=f290f48a621867084884bfff87f8093c15195e6a ./CVE-2018-6951.patch + (fetchurl { + url = https://sources.debian.org/data/main/p/patch/2.7.6-2/debian/patches/Allow_input_files_to_be_missing_for_ed-style_patches.patch; + sha256 = "0iw0lk0yhnhvfjzal48ij6zdr92mgb84jq7fwryy1hdhi47hhq64"; + }) + (fetchurl { # CVE-2018-1000156 + url = https://sources.debian.org/data/main/p/patch/2.7.6-2/debian/patches/Fix_arbitrary_command_execution_in_ed-style_patches.patch; + sha256 = "1bpy16n3hm5nv9xkrn6c4wglzsdzj3ss1biq16w9kfv48p4hx2vg"; + }) ]; buildInputs = stdenv.lib.optional doCheck ed; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = stdenv.lib.optionals (hostPlatform != buildPlatform) [ "ac_cv_func_strnlen_working=yes" |