Commit cdcdce41 authored by Eric Vidal's avatar Eric Vidal 💬
Browse files

Merge branch 'upgpkg-3.31.2' into 'master'

upgpkg: 3.31.2

See merge request !1
parents a8ff2b30 9a44bc82
Pipeline #410021 passed with stages
in 4 minutes and 18 seconds
# Obarun : 66 init/supervisor
# Maintainer : Eric Vidal <eric@obarun.org>
# Maintainer : Jean-Michel T.Dydak <jean-michel@obarun.org>
# Maintainer : YianIris <yianiris At disroot Dot org>
# PkgSource : url="https://framagit.org/pkg/obextra/syslog-ng"
#-----------------------------------------------------------------------------------------------
......@@ -10,7 +11,7 @@ pkgname=syslog-ng
pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
pkgver=3.30.1
pkgver=3.31.2
pkgrel=2
url="https://www.syslog-ng.com/products/open-source-log-management/"
......@@ -118,6 +119,6 @@ replaces=('eventlog')
license=('GPL2' 'LGPL2.1')
sha1sums=('b083081bca113c1779ef8c5ef4eef20a3690be2a'
'a9b54de3e91921966562bd458db26dea135888ba'
'949128fe3d7f77a7aab99048061f885bc758000c')
sha512sums=('22a647c37f87fb1a45c8c69c2b0a022d1886cde5b0d585c3384b606d967c3f320a18e34810655174e82c797c0dc23c481732ecefd5be16da8fba4983b2ed0385'
'29beb12baa60b959d7cbc105545a5334bcee200e49f2b5d12ce51139a7e916fe2afcd505a265ce402e7f88b8cbb42e98a6b06cff1b641368dd9ee459177bf9cc'
'cd39f545a6a855c866a466bf846e33940b2c2dd1fc2eaf50cce29c68e1a5753c7c4b56411e4f01c152f32e155104a98dd755a96319767f47c73a8853f720b2cc')
From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Mon, 11 Dec 2017 15:46:06 +0100
Subject: [PATCH] modules/json: Adaptions for json-c v0.13
---
modules/json/json-parser.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c
index 0368ed8f7f..356df48b9f 100644
--- a/modules/json/json-parser.c
+++ b/modules/json/json-parser.c
@@ -20,6 +20,8 @@
* COPYING for details.
*/
+#define JSON_C_VER_013 (13 << 8)
+
#include "json-parser.h"
#include "dot-notation.h"
#include "scratch-buffers.h"
@@ -28,7 +30,10 @@
#include <ctype.h>
#include <json.h>
+
+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
#include <json_object_private.h>
+#endif
typedef struct _JSONParser
{
# Obarun : 66 init/supervisor
# Maintainer : Eric Vidal <eric@obarun.org>
# Maintainer : Jean-Michel T.Dydak <jean-michel@obarun.org>
# Maintainer : YianIris <yianiris At disroot Dot org>
# PkgSource : url="https://framagit.org/pkg/obextra/syslog-ng"
#-----------------------------------------------------------------------------------------------
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=syslog-ng
pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
pkgver=3.31.2
pkgrel=2
url="https://www.syslog-ng.com/products/open-source-log-management/"
track=
target="$pkgname-$pkgver.tar.gz"
source=(https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver/${target}
syslog-ng.conf syslog-ng.logrotate)
#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
makedepends=(
'libxslt'
'mongo-c-driver'
'librabbitmq-c'
'python'
'libesmtp'
'hiredis'
'libdbi'
'libmaxminddb'
'net-snmp'
'librdkafka'
'libcap')
checkdepends=(
'python-nose'
'python-ply')
#--------------------------------------------| BUILD |------------------------------------------
build() {
cd ${pkgname}-$pkgver
./autogen.sh
./configure --prefix=/usr \
--sysconfdir=/etc/syslog-ng \
--libexecdir=/usr/lib \
--sbindir=/usr/bin \
--localstatedir=/var/lib/syslog-ng \
--datadir=/usr/share/ \
--with-pidfile-dir=/run \
--disable-spoof-source \
--enable-ipv6 \
--enable-systemd=no \
--with-systemdsystemunitdir=no \
--enable-manpages \
--enable-all-modules \
--disable-java \
--disable-java-modules \
--disable-riemann \
--with-python=3 \
--with-jsonc=system
make
}
#--------------------------------------------| CHECK |------------------------------------------
check() {
cd ${pkgname}-$pkgver
make check || /bin/true # unit test requires criterion
}
#-------------------------------------------| PACKAGE |-----------------------------------------
package() {
make -C ${pkgname}-$pkgver DESTDIR="$pkgdir" install
install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d"
install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf"
install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng"
# this is not specific to systemd, the file can be sourced by any service file as classic bash operation
install -Dm644 "$srcdir"/$pkgname-$pkgver/contrib/systemd/syslog-ng@default -t "$pkgdir"/etc/default
}
#------------------------------------| INSTALL CONFIGURATION |----------------------------------
arch=(x86_64)
backup=('etc/syslog-ng/scl.conf'
'etc/syslog-ng/syslog-ng.conf'
'etc/logrotate.d/syslog-ng')
depends=(
'awk'
'glib2'
'glib2'
'libnsl'
'json-c'
'curl'
'libnet')
optdepends=('logrotate: for rotating log files'
'libdbi: for the SQL plugin'
'librabbitmq-c: for the AMQP plugin'
'mongo-c-driver: for the MongoDB plugin'
'libesmtp: for the SMTP plugin'
'hiredis: for the Redis plugin'
'libmaxminddb: for the GeoIP2 plugin'
'net-snmp: for the SNMP plugin'
'python: for Python-based plugins')
conflicts=('eventlog')
replaces=('eventlog')
#-------------------------------------| SECURITY AND LICENCE |----------------------------------
license=('GPL2' 'LGPL2.1')
sha512sums=('22a647c37f87fb1a45c8c69c2b0a022d1886cde5b0d585c3384b606d967c3f320a18e34810655174e82c797c0dc23c481732ecefd5be16da8fba4983b2ed0385'
'29beb12baa60b959d7cbc105545a5334bcee200e49f2b5d12ce51139a7e916fe2afcd505a265ce402e7f88b8cbb42e98a6b06cff1b641368dd9ee459177bf9cc'
'cd39f545a6a855c866a466bf846e33940b2c2dd1fc2eaf50cce29c68e1a5753c7c4b56411e4f01c152f32e155104a98dd755a96319767f47c73a8853f720b2cc')
@version: 3.30
@include "scl.conf"
#
# /etc/syslog-ng/syslog-ng.conf
#
options {
stats_freq (0);
flush_lines (0);
time_reopen (10);
log_fifo_size (10000);
chain_hostnames (off);
dns_cache (no);
use_dns (no);
use_fqdn (no);
create_dirs (no);
keep_hostname (yes);
perm(0640);
group("log");
};
source src {
system();
internal();
};
destination d_authlog { file("/var/log/auth.log"); };
destination d_syslog { file("/var/log/syslog.log"); };
destination d_cron { file("/var/log/crond.log"); };
destination d_daemon { file("/var/log/daemon.log"); };
destination d_kernel { file("/var/log/kernel.log"); };
destination d_lpr { file("/var/log/lpr.log"); };
destination d_user { file("/var/log/user.log"); };
destination d_uucp { file("/var/log/uucp.log"); };
destination d_mail { file("/var/log/mail.log"); };
destination d_news { file("/var/log/news.log"); };
destination d_ppp { file("/var/log/ppp.log"); };
destination d_debug { file("/var/log/debug.log"); };
destination d_messages { file("/var/log/messages.log"); };
destination d_errors { file("/var/log/errors.log"); };
destination d_everything { file("/var/log/everything.log"); };
destination d_iptables { file("/var/log/iptables.log"); };
destination d_acpid { file("/var/log/acpid.log"); };
destination d_console { usertty("root"); };
# Log everything to tty12
destination console_all { file("/dev/tty12"); };
filter f_auth { facility(auth); };
filter f_authpriv { facility(auth, authpriv); };
filter f_syslog { program(syslog-ng); };
filter f_cron { facility(cron); };
filter f_daemon { facility(daemon); };
filter f_kernel { facility(kern) and not filter(f_iptables); };
filter f_lpr { facility(lpr); };
filter f_mail { facility(mail); };
filter f_news { facility(news); };
filter f_user { facility(user); };
filter f_uucp { facility(uucp); };
filter f_ppp { facility(local2); };
filter f_debug { not facility(auth, authpriv, news, mail); };
filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); };
filter f_everything { level(debug..emerg) and not facility(auth, authpriv); };
filter f_emergency { level(emerg); };
filter f_info { level(info); };
filter f_notice { level(notice); };
filter f_warn { level(warn); };
filter f_crit { level(crit); };
filter f_err { level(err); };
filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); };
filter f_acpid { program("acpid"); };
log { source(src); filter(f_acpid); destination(d_acpid); };
log { source(src); filter(f_authpriv); destination(d_authlog); };
log { source(src); filter(f_syslog); destination(d_syslog); };
log { source(src); filter(f_cron); destination(d_cron); };
log { source(src); filter(f_daemon); destination(d_daemon); };
log { source(src); filter(f_kernel); destination(d_kernel); };
log { source(src); filter(f_lpr); destination(d_lpr); };
log { source(src); filter(f_mail); destination(d_mail); };
log { source(src); filter(f_news); destination(d_news); };
log { source(src); filter(f_ppp); destination(d_ppp); };
log { source(src); filter(f_user); destination(d_user); };
log { source(src); filter(f_uucp); destination(d_uucp); };
#log { source(src); filter(f_debug); destination(d_debug); };
log { source(src); filter(f_messages); destination(d_messages); };
log { source(src); filter(f_err); destination(d_errors); };
log { source(src); filter(f_emergency); destination(d_console); };
log { source(src); filter(f_everything); destination(d_everything); };
log { source(src); filter(f_iptables); destination(d_iptables); };
# Log everything to tty12
#log { source(src); destination(console_all); };
/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log {
missingok
sharedscripts
postrotate
/bin/kill -HUP $(cat /run/syslog-ng.pid 2>/dev/null) 2>/dev/null || true
endscript
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment