From 020fb2cce1684e84da2b584374a85e4d5f36fae1 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 13 Feb 2017 17:46:05 +0100 Subject: [PATCH 1/4] syslog-ng: 3.6.2 -> 3.9.1 This should fix: https://github.com/NixOS/nixpkgs/issues/20153 --- pkgs/tools/system/syslog-ng/default.nix | 39 ++++++++++++++++++++----- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 7c7d5df4df8..01aa0d1b01b 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,17 +1,40 @@ -{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl -, riemann_c_client, protobufc, pcre, yacc }: +{ stdenv, fetchgit, autoconf, autoconf-archive, automake, libtool, flex, openssl +, eventlog, pkgconfig, glib, python, systemd, perl +, riemann_c_client, protobufc, pcre, yacc, which }: stdenv.mkDerivation rec { name = "syslog-ng-${version}"; + version = "3.9.1"; - version = "3.6.2"; - - src = fetchurl { - url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz"; - sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg"; + src = fetchgit { + url = "https://github.com/balabit/syslog-ng.git"; + rev = "59aa4e5d9396d293aae021746214b97d7fe0a8ee"; # tag: syslog-ng-3.9.1 + sha256 = "15lalqf6dmpm4nr1pp0f2p0a6wbckkrh1k83vhp9ws0by5m8m66r"; }; - buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc pcre ]; + buildInputs = [ + autoconf + autoconf-archive + automake + libtool + which + flex + openssl + eventlog + pkgconfig + glib + python + systemd + perl + riemann_c_client + protobufc + yacc + pcre + ]; + + preConfigure = '' + ./autogen.sh + ''; configureFlags = [ "--enable-dynamic-linking" From e38f7c625e58a05f0c461599183da6511e7613cd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 15 Feb 2017 01:49:51 +0100 Subject: [PATCH 2/4] syslog-ng: refactor --- pkgs/tools/system/syslog-ng/default.nix | 52 +++++++++++++++---------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 01aa0d1b01b..4e1fb671957 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,52 +1,62 @@ -{ stdenv, fetchgit, autoconf, autoconf-archive, automake, libtool, flex, openssl +{ stdenv, fetchurl, openssl, libcap, curl, which , eventlog, pkgconfig, glib, python, systemd, perl -, riemann_c_client, protobufc, pcre, yacc, which }: +, riemann_c_client, protobufc, pcre, libnet +, json_c, libuuid, libivykis, mongoc, rabbitmq-c }: + +let + pname = "syslog-ng"; +in stdenv.mkDerivation rec { - name = "syslog-ng-${version}"; + name = "${pname}-${version}"; version = "3.9.1"; - src = fetchgit { - url = "https://github.com/balabit/syslog-ng.git"; - rev = "59aa4e5d9396d293aae021746214b97d7fe0a8ee"; # tag: syslog-ng-3.9.1 - sha256 = "15lalqf6dmpm4nr1pp0f2p0a6wbckkrh1k83vhp9ws0by5m8m66r"; + src = fetchurl { + url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; + sha256 = "05qaqw115py5iz55vmc0j1xcwcpr8wa9vpmbixhr1rqaamm8ay2n"; }; + nativeBuildInputs = [ pkgconfig which ]; + buildInputs = [ - autoconf - autoconf-archive - automake - libtool - which - flex + libcap + curl openssl eventlog - pkgconfig glib + perl python systemd - perl riemann_c_client protobufc - yacc pcre + libnet + json_c + libuuid + libivykis + mongoc + rabbitmq-c ]; - preConfigure = '' - ./autogen.sh - ''; - 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; }; } From ea309fcf4893d50f8dc1b2db05bac6fadc261444 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 15 Feb 2017 01:55:51 +0100 Subject: [PATCH 3/4] syslogng_incubator: 141106 -> 0.5.0, mark as broken This is the current release but neither this nor the current master is compatible with syslog-ng 3.8+. Committed work on update and refactor of expression to make it easier in the future to bump. --- pkgs/tools/system/syslog-ng-incubator/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 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 }; } From bf565a4635e51240f33d339a2c8a7214e893a62f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 15 Feb 2017 01:29:28 +0100 Subject: [PATCH 4/4] libivykis: 0.40 -> 0.41 --- pkgs/development/libraries/libivykis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index d9e438da131..dbc5c1e2ae9 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libivykis-${version}"; - version = "0.40"; + version = "0.41"; src = fetchurl { url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz"; - sha256 = "1rn32dijv0pn9y2mbdg1n7al4h4i5pwwhhihr9pyakwyb6qgmqxj"; + sha256 = "1igk3svf36i5xgb6ipc507xpj6zjm4xi9j1j2cdqaachllwlb4rc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ];