From 83e1ff846c9e0383ca41aa35376dc484a05ff08a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 7 Jul 2014 16:23:54 +0200
Subject: [PATCH] Upgrade rsyslog to latest (v7) stable release. Added
 liblogging (new dependency of rsyslog).

---
 .../libraries/liblogging/default.nix           | 18 ++++++++++++++++++
 pkgs/tools/system/rsyslog/default.nix          | 10 +++++-----
 pkgs/top-level/all-packages.nix                |  2 ++
 3 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/liblogging/default.nix

diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix
new file mode 100644
index 000000000000..7a754a28e3d1
--- /dev/null
+++ b/pkgs/development/libraries/liblogging/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, systemd }:
+
+stdenv.mkDerivation rec {
+  name = "liblogging-1.0.4";
+
+  src = fetchurl {
+    url = "http://download.rsyslog.com/liblogging/${name}.tar.gz";
+    sha256 = "075q6zjqpdlmaxhahd1ynr6nasqpyjnzj1zlcvzp3ixxm0m5vsxc";
+  };
+
+  buildInputs = [ pkgconfig systemd ];
+
+  meta = {
+    description = "Lightweight signal-safe logging library";
+    license = stdenv.lib.licenses.bsd2;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 97020ce2e42f..3fe05e941b6c 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd}:
+{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd, liblogging}:
 
 stdenv.mkDerivation {
-  name = "rsyslog-7.4.7";
+  name = "rsyslog-7.6.3";
 
   src = fetchurl {
-    url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.4.7.tar.gz;
-    sha256 = "5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21";
+    url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.6.3.tar.gz;
+    sha256 = "1v7mi2jjyn3awrfxqvd3mg64m5r027dgpbzd511mlvlbbw1mjcq1";
   };
 
-  buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd];
+  buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd liblogging];
 
   preConfigure = ''
      export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f017c39bb75f..2331dc647785 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5207,6 +5207,8 @@ let
 
   liblockfile = callPackage ../development/libraries/liblockfile { };
 
+  liblogging = callPackage ../development/libraries/liblogging { };
+
   libmcrypt = callPackage ../development/libraries/libmcrypt {};
 
   libmhash = callPackage ../development/libraries/libmhash {};