jshon: 20140712 -> 20140712-nix1 #23727
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@dbrock, thanks for your PR! By analyzing the history of the files in this pull request, we identified @rushmorem and @pSub to be potential reviewers. |
|
Hmm... any idea what causes that kind of error? |
|
@dbrock are you referring to the travis error? It's unrelated, please ignore :) |
|
Would it be sufficient to just apply the fix as a patch? I.e. something like the following diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix
index 4b35ba0cce..823aa499d4 100644
--- a/pkgs/development/tools/parsing/jshon/default.nix
+++ b/pkgs/development/tools/parsing/jshon/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, lib, fetchFromGitHub, jansson }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, jansson }:
stdenv.mkDerivation rec {
- name = "jshon-20140712";
+ name = "jshon-20140712-nix1";
rev = "a61d7f2f85f4627bc3facdf951746f0fd62334b7";
sha256 = "b0365e58553b9613a5636545c5bfd4ad05ab5024f192e1cb1d1824bae4e1a380";
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
repo = "jshon";
};
+ patches = [
+ # Fix null termination in read_stream.
+ (fetchpatch {
+ url = https://github.com/mbrock/jshon/commit/32288dd186573ceb58164f30be1782d4580466d8.patch;
+ sha256 = "04rss2nprl9nqblc7smq0477n54hm801xgnnmvyzni313i1n6vhl";
+ })
+ ];
+
buildInputs = [ jansson ];
patchPhase = |
This fixes a somewhat critical (security?) bug. We are trying to get it merged upstream but have had no response from the ordinary maintainer in over a week. (See <keenerd/jshon#53>.)
|
Thanks @rycee, that's better. Fixed. |
Mic92
pushed a commit
that referenced
this pull request
Mar 16, 2017
This fixes a somewhat critical (security?) bug. We are trying to get it merged upstream but have had no response from the ordinary maintainer in over a week. (See <keenerd/jshon#53>.) fixes #23727 (cherry picked from commit 5d6ea2d)
Mic92
pushed a commit
that referenced
this pull request
Mar 16, 2017
This fixes a somewhat critical (security?) bug. We are trying to get it merged upstream but have had no response from the ordinary maintainer in over a week. (See <keenerd/jshon#53>.) fixes #23727 (cherry picked from commit 5d6ea2d)
|
Back ported to 16.09 and 17.03 as well. |
|
Nice, thanks guys! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
This fixes a somewhat critical (security?) bug.
We are trying to get it merged upstream but have had no response from
the ordinary maintainer in over a week.
(See keenerd/jshon#53.)
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)