Merge pull request #22752 from LumiGuide/syslog-ng-3.9.1

syslog-ng: 3.6.2 -> 3.9.1

2 files changed, 50 insertions, 16 deletions

diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix
index 004b2b58fa3..b72673167bc 100644
--- a/pkgs/tools/system/syslog-ng-incubator/default.nix
+++ b/pkgs/tools/system/syslog-ng-incubator/default.nix
@@ -1,25 +1,25 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng
-, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc
+, eventlog, perl, python, yacc, protobufc, libivykis
 }:
 
 stdenv.mkDerivation rec {
   name = "syslog-ng-incubator-${version}";
-  version = "141106-54179c5";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "balabit";
     repo = "syslog-ng-incubator";
-    rev = "54179c5f733487fe97ee856bc27130d0b09f3d5a";
-    sha256 = "1y099f7pdan1441ycycd67igcwbla2m2cgnxjfvdw76llvi35sam";
+    rev = name;
+    sha256 = "00j123ya0xfj1jicaqnk1liffx07mhhf0r406pabxjjj97gy8nlk";
   };
 
+  nativeBuildInputs = [ pkgconfig autoreconfHook yacc ];
+
   buildInputs = [
-    autoreconfHook pkgconfig glib syslogng eventlog perl python
-    yacc riemann_c_client libivykis protobufc
+    glib syslogng eventlog perl python protobufc libivykis
   ];
 
   configureFlags = [
-    "--without-ivykis"
     "--with-module-dir=$(out)/lib/syslog-ng"
   ];
 
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.rickynils ];
     platforms = platforms.linux;
+    broken = true; # does not work with our new syslog-ng version yet
   };
 }
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 7c7d5df4df8..4e1fb671957 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -1,29 +1,62 @@
-{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl
-, riemann_c_client, protobufc, pcre, yacc }:
+{ stdenv, fetchurl, openssl, libcap, curl, which
+, eventlog, pkgconfig, glib, python, systemd, perl
+, riemann_c_client, protobufc, pcre, libnet
+, json_c, libuuid, libivykis, mongoc, rabbitmq-c }:
 
-stdenv.mkDerivation rec {
-  name = "syslog-ng-${version}";
+let
+  pname = "syslog-ng";
+in
 
-  version = "3.6.2";
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "3.9.1";
 
   src = fetchurl {
-    url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz";
-    sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg";
+    url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
+    sha256 = "05qaqw115py5iz55vmc0j1xcwcpr8wa9vpmbixhr1rqaamm8ay2n";
   };
 
-  buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc pcre ];
+  nativeBuildInputs = [ pkgconfig which ];
+
+  buildInputs = [
+    libcap
+    curl
+    openssl
+    eventlog
+    glib
+    perl
+    python
+    systemd
+    riemann_c_client
+    protobufc
+    pcre
+    libnet
+    json_c
+    libuuid
+    libivykis
+    mongoc
+    rabbitmq-c
+  ];
 
   configureFlags = [
+    "--enable-manpages"
     "--enable-dynamic-linking"
     "--enable-systemd"
+    "--with-ivykis=system"
+    "--with-librabbitmq-client=system"
+    "--with-mongoc=system"
+    "--with-jsonc=system"
+    "--with-systemd-journal=system"
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
   ];
 
+  outputs = [ "out" "man" ];
+
   meta = with stdenv.lib; {
     homepage = "http://www.balabit.com/network-security/syslog-ng/";
     description = "Next-generation syslogd with advanced networking and filtering capabilities";
     license = licenses.gpl2;
-    maintainers = [ maintainers.rickynils ];
+    maintainers = with maintainers; [ rickynils  fpletz ];
     platforms = platforms.linux;
   };
 }