From 74eee1f306358780dd8f3050a5ebfbc172fed525 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim.steinbach@exinda.com>
Date: Mon, 4 Apr 2016 14:24:44 -0400
Subject: [PATCH 1/3] libfastjson: init at v0.99.2

---
 .../libraries/fastjson/default.nix            | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 12 +++++----
 2 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/fastjson/default.nix

diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix
new file mode 100644
index 00000000000..4c325198547
--- /dev/null
+++ b/pkgs/development/libraries/fastjson/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, libtool, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+  version = "v0.99.2";
+  name = "fastjson-${version}";
+  src = fetchFromGitHub {
+    repo = "libfastjson";
+    owner = "rsyslog";
+    rev = "eabae907c9d991143e17da278a239819f2e8ae1c";
+    sha256 = "17fhaqdn0spc4p0848ahcy68swm6l5yd3bx6bdzxmmwj1jdrmvzk";
+  };
+
+  buildInputs = [ autoconf automake libtool ];
+
+  preConfigure = ''
+    sh autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A fast json library for C";
+    homepage = "https://github.com/rsyslog/libfastjson";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nequissimus ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae800662444..01b76785acb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -755,6 +755,8 @@ in
 
   fasd = callPackage ../tools/misc/fasd { };
 
+  fastJson = callPackage ../development/libraries/fastjson { };
+
   fop = callPackage ../tools/typesetting/fop { };
 
   fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; };
@@ -1590,11 +1592,11 @@ in
     gazebo6-headless = callPackage ../applications/science/robotics/gazebo/6.nix { withHeadless = true;  };
 
     gazebo7 = callPackage ../applications/science/robotics/gazebo { };
-  
+
     gazebo7-headless = callPackage ../applications/science/robotics/gazebo { withHeadless = true; };
 
   };
-  
+
   # at present, Gazebo 7.0.0 does not match Gazebo 6.5.1 for compatibility
   gazebo = gazeboSimulator.gazebo6;
 
@@ -1936,12 +1938,12 @@ in
 
   ifuse = callPackage ../tools/filesystems/ifuse/default.nix { };
 
-  ignition = recurseIntoAttrs { 
+  ignition = recurseIntoAttrs {
 
     math = callPackage ../development/libraries/ignition-math { };
-  
+
     math2 = ignition.math;
-  
+
     transport0 = callPackage ../development/libraries/ignition-transport/0.9.0.nix { };
 
     transport1 = callPackage ../development/libraries/ignition-transport/1.0.1.nix { };

From 925d546d49a26780e41eaaa953c6b4da43a57a04 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim.steinbach@exinda.com>
Date: Mon, 4 Apr 2016 14:30:31 -0400
Subject: [PATCH 2/3] libksi: 3.2.2.0 -> 3.4.0.5

---
 pkgs/development/libraries/libksi/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix
index 1f6bd05b5b3..1dd71024681 100644
--- a/pkgs/development/libraries/libksi/default.nix
+++ b/pkgs/development/libraries/libksi/default.nix
@@ -4,12 +4,12 @@ stdenv.mkDerivation rec {
   name = "libksi-2015-07-03";
 
   src = fetchFromGitHub {
-    owner = "rgerhards";
+    owner = "Guardtime";
     repo = "libksi";
-    rev = "b1ac0346395b4f52ec42a050bf33ac223f194443";
-    sha256 = "0gg0fl56flwqmsph7j92lgybaa39i715w0nwgkcr58njm0c02wlw";
+    rev = "b82dd65bd693722db92397cbe0920170e0d2ae1c";
+    sha256 = "1sqd31l55kx6knl0sg26ail1k5rgmamq8760p6aj7bpb4jwb8r1n";
   };
-  
+
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ openssl curl ];
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/rgerhards/libksi";
+    homepage = "https://github.com/GuardTime/libksi";
     description = "Keyless Signature Infrastructure API library";
     license = licenses.asl20;
     platforms = platforms.all;

From 158558e09170d66fd05b0615a310d5d5ac94028f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim.steinbach@exinda.com>
Date: Mon, 4 Apr 2016 14:31:01 -0400
Subject: [PATCH 3/3] rsyslog: 8.14.0 -> 8.17.0

---
 pkgs/tools/system/rsyslog/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 5d3dbd861aa..2f38c9b374a 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
 , libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null
 , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
 , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
@@ -11,18 +11,18 @@ let
   mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
 in
 stdenv.mkDerivation rec {
-  name = "rsyslog-8.14.0";
+  name = "rsyslog-8.17.0";
 
   src = fetchurl {
     url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
-    sha256 = "1hp7ga543m6vhijcnjb4z8v26ddjgypk1lh6km1cvxc45cfmnfs4";
+    sha256 = "1fazpbllr3wk8aw41zk7b6iirds4h8j3im080nf8my2cjssij7pc";
   };
 
   #patches = [ ./fix-gnutls-detection.patch ];
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [
-    libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql
+    fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql
     postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl
     librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq
     rabbitmq-c hiredis