Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=abeb838165ad7a0e894e5a84441ca27ab7c6f357
commit abeb838165ad7a0e894e5a84441ca27ab7c6f357 Author: James Buren <[email protected]> Date: Tue Jun 24 13:50:33 2014 -0500 syslog-ng-3.5.4.1-2-x86_64 * rebuild with json-c diff --git a/source/apps-extra/syslog-ng/FrugalBuild b/source/apps-extra/syslog-ng/FrugalBuild index ef3392d..bb95389 100644 --- a/source/apps-extra/syslog-ng/FrugalBuild +++ b/source/apps-extra/syslog-ng/FrugalBuild @@ -6,7 +6,7 @@ options+=('asneeded') pkgname=syslog-ng pkgver=3.5.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="A flexible system logging tool" url="http://www.balabit.com/products/syslog_ng/"; depends=('glib2' 'eventlog>=0.2.7' 'libnet>=1.1.2.1-4' 'systemd>=38') @@ -19,12 +19,13 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://www.balabit.com/downloads/files/syslog-ng/sources/ | grep 'http:.*[0-9]\.[0-9]\{1,2\}\.[0-9]\{1,2\}' | \ egrep -v 'alpha|beta' | tail -n 1 | sed 's|.*/\(.*\)$|\1|'" source=(http://www.balabit.com/downloads/files/$pkgname/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz \ - syslog-ng.conf syslog-ng syslog-ng.service) + syslog-ng.conf syslog-ng syslog-ng.service jsonc.patch) backup=(etc/syslog-ng.conf) sha1sums=('be5e28a0495e291045a00380d722161b8cb06d5e' \ '859175df338e8d67e624b0fc48cbe8077f9c7771' \ '2876e61d5e04f6117967da728bcb1d3b6785532f' \ - '3f8bd9c46c930e5d0c2c3fd06e7a81f0cdc244f0') + '3f8bd9c46c930e5d0c2c3fd06e7a81f0cdc244f0' \ + 'f0c86d5035580e7d4a5cc2f6abc185a2c8e8d7f5') _F_systemd_units=(syslog-ng=e) Finclude systemd @@ -34,7 +35,7 @@ Fconfopts="--disable-tcp-wrapper --disable-spoof-source --enable-systemd --with- subpkgs=('syslog-ng-json' 'syslog-ng-pacct' 'syslog-ng-smtp') subdescs=('JSON Module for Syslog-NG' 'PACCT Module for Syslog-NG' 'SMTP Module for Syslog-NG') -subdepends=('json-c' '' 'libesmtp') +subdepends=('json-c>=0.12' '' 'libesmtp') subrodepends=("syslog-ng=$pkgver" "syslog-ng=$pkgver" "syslog-ng=$pkgver") subgroups=('lib-extra' 'lib-extra' 'lib-extra') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') diff --git a/source/apps-extra/syslog-ng/jsonc.patch b/source/apps-extra/syslog-ng/jsonc.patch new file mode 100644 index 0000000..26ce69a --- /dev/null +++ b/source/apps-extra/syslog-ng/jsonc.patch @@ -0,0 +1,12 @@ +diff -ur a/modules/json/jsonparser.c b/modules/json/jsonparser.c +--- a/modules/json/jsonparser.c 2014-03-12 08:12:11.000000000 -0500 ++++ b/modules/json/jsonparser.c 2014-06-24 13:47:46.971821023 -0500 +@@ -187,7 +187,7 @@ + if (tok->err != json_tokener_success) + { + msg_error ("Unparsable JSON stream encountered", +- evt_tag_str ("error", json_tokener_errors[tok->err]), NULL); ++ evt_tag_str ("error", json_tokener_error_desc(tok->err)), NULL); + json_tokener_free (tok); + return FALSE; + } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
