[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/, app-admin/syslog-ng/
commit: 0c544ba3ea49cdb14ca5ce07eebc39c75758a1cf
Author: Tomáš Mózes gmail com>
AuthorDate: Fri Apr 21 09:59:03 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Apr 21 10:21:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c544ba3
app-admin/syslog-ng: replace obsolete stats_freq with stats(freq())
Closes: https://bugs.gentoo.org/904562
Signed-off-by: Tomáš Mózes gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30675
Signed-off-by: Florian Schmaus gentoo.org>
.../files/syslog-ng.conf.gentoo.hardened.in-r1 | 115 +
.../syslog-ng/files/syslog-ng.conf.gentoo.in-r1| 36
app-admin/syslog-ng/syslog-ng-4.1.1-r2.ebuild | 183 +
3 files changed, 334 insertions(+)
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in-r1
b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in-r1
new file mode 100644
index ..fe3b6ee99a99
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in-r1
@@ -0,0 +1,115 @@
+@version: @SYSLOGNG_VERSION@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+#
+# Syslog-ng configuration file, compatible with default hardened installations.
+#
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+ stats(freq(43200));
+};
+
+source src {
+system();
+internal();
+};
+
+source kernsrc {
+file("/proc/kmsg");
+};
+
+#source net { udp(); };
+#log { source(net); destination(net_logs); };
+#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination _syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+#destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination avc { file("/var/log/avc.log"); };
+destination audit { file("/var/log/audit.log"); };
+destination pax { file("/var/log/pax.log"); };
+destination grsec { file("/var/log/grsec.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+#filter f_ppp { facility(ppp); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn)
+ and not facility(auth, authpriv, mail, news); };
+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_avc { message(".*avc: .*"); };
+filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc:
.*"); };
+filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
+filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(_syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(kernsrc); filter(f_kern); destination(kern);
destination(console_all); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(kernsrc); filter(f_pax); destination(pax); };
+log { source(kernsrc); filter(f_grsec); destination(grsec); };
+log { source(kernsrc); filter(f_audit); destination(audit); };
+log { source(kernsrc); filter(f_avc); destination(avc); };
+log { source(src);
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/
commit: 3daa1de4626fc42656ae9a366581d191007185b6 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Dec 22 07:08:44 2021 + Commit: John Helmert III gentoo org> CommitDate: Wed Dec 22 07:54:36 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3daa1de4 app-admin/syslog-ng: remove unused patch Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23465 Signed-off-by: John Helmert III gentoo.org> .../files/syslog-ng-3.30.1-esmtp-pkgconfig.patch | 50 -- 1 file changed, 50 deletions(-) diff --git a/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch b/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch deleted file mode 100644 index a9c761af98c2.. --- a/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://bugs.gentoo.org/782643 -https://github.com/syslog-ng/syslog-ng/pull/3669/commits/b8284f8ecac588f6a321c779cce06cbe182611a5 - -From b8284f8ecac588f6a321c779cce06cbe182611a5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= - -Date: Sun, 9 May 2021 03:43:46 +0200 -Subject: [PATCH] configure: add pkg-config detection for libesmtp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: László Várady - configure.ac | 22 +- - 1 file changed, 13 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 86b67ba9a2..bd6efa8711 100644 a/configure.ac -+++ b/configure.ac -@@ -1278,15 +1278,19 @@ if test "x$enable_smtp" != "xno" && test "x$with_libesmtp" != "xno"; then - CPPFLAGS="$CPPFLAGS_SAVE" - LDFLAGS="$LDFLAGS_SAVE" - else -- AC_MSG_CHECKING(for libESMTP) -- if libesmtp-config --version >/dev/null 2>&1; then -- AC_MSG_RESULT(yes) -- LIBESMTP_CFLAGS="`libesmtp-config --cflags`" -- LIBESMTP_LIBS="`libesmtp-config --libs`" -- else -- AC_MSG_RESULT(no) -- libesmtp=no -- fi -+ PKG_CHECK_MODULES(LIBESMTP, libesmtp-1.0, libesmtp="yes", libesmtp="no") -+ if test "x$libesmtp" = "xno"; then -+ AC_MSG_CHECKING(for libESMTP with libesmtp-config) -+ if libesmtp-config --version >/dev/null 2>&1; then -+ AC_MSG_RESULT(yes) -+ LIBESMTP_CFLAGS="`libesmtp-config --cflags`" -+ LIBESMTP_LIBS="`libesmtp-config --libs`" -+ libesmtp="yes" -+ else -+ AC_MSG_RESULT(no) -+ libesmtp=no -+ fi -+fi - fi - if test "x$enable_smtp" = "xyes" && test "x$libesmtp" = "xno"; then - AC_MSG_ERROR(libESMTP not found)
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/, app-admin/syslog-ng/
commit: 998792c5836911dfcc891ec12bb250cf2a9c5550
Author: Sam James gentoo org>
AuthorDate: Mon Jul 5 23:34:03 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Jul 5 23:35:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998792c5
app-admin/syslog-ng: fix libesmtp pkg-config patch
Closes: https://bugs.gentoo.org/782643
Signed-off-by: Sam James gentoo.org>
.../files/syslog-ng-3.30.1-esmtp-pkgconfig.patch | 44 +-
...3.30.1-r1.ebuild => syslog-ng-3.30.1-r2.ebuild} | 2 +-
app-admin/syslog-ng/syslog-ng-3.30.1.ebuild| 2 +-
...ng-3.31.2.ebuild => syslog-ng-3.31.2-r1.ebuild} | 2 +-
...ng-3.32.1.ebuild => syslog-ng-3.32.1-r1.ebuild} | 2 +-
5 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
b/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
index ef4f72faa31..a9c761af98c 100644
--- a/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
+++ b/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
@@ -1,7 +1,25 @@
https://bugs.gentoo.org/782643
+https://github.com/syslog-ng/syslog-ng/pull/3669/commits/b8284f8ecac588f6a321c779cce06cbe182611a5
+
+From b8284f8ecac588f6a321c779cce06cbe182611a5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?=
+
+Date: Sun, 9 May 2021 03:43:46 +0200
+Subject: [PATCH] configure: add pkg-config detection for libesmtp
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: László Várady
+---
+ configure.ac | 22 +-
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 86b67ba9a2..bd6efa8711 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1270,20 +1270,9 @@ if test "x$enable_smtp" != "xno" && test
"x$with_libesmtp" != "xno"; then
+@@ -1278,15 +1278,19 @@ if test "x$enable_smtp" != "xno" && test
"x$with_libesmtp" != "xno"; then
CPPFLAGS="$CPPFLAGS_SAVE"
LDFLAGS="$LDFLAGS_SAVE"
else
@@ -14,13 +32,19 @@ https://bugs.gentoo.org/782643
- AC_MSG_RESULT(no)
- libesmtp=no
- fi
-- fi
-- if test "x$enable_smtp" = "xyes" && test "x$libesmtp" = "xno"; then
-- AC_MSG_ERROR(libESMTP not found)
-+ PKG_CHECK_MODULES(libesmtp, libesmtp-1.0)
++ PKG_CHECK_MODULES(LIBESMTP, libesmtp-1.0, libesmtp="yes",
libesmtp="no")
++ if test "x$libesmtp" = "xno"; then
++ AC_MSG_CHECKING(for libESMTP with libesmtp-config)
++ if libesmtp-config --version >/dev/null 2>&1; then
++ AC_MSG_RESULT(yes)
++ LIBESMTP_CFLAGS="`libesmtp-config --cflags`"
++ LIBESMTP_LIBS="`libesmtp-config --libs`"
++ libesmtp="yes"
++ else
++ AC_MSG_RESULT(no)
++ libesmtp=no
++ fi
++fi
fi
-- enable_smtp=$libesmtp
-+ enable_smtp="yes"
- fi
-
- dnl
***
+ if test "x$enable_smtp" = "xyes" && test "x$libesmtp" = "xno"; then
+ AC_MSG_ERROR(libESMTP not found)
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
b/app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild
similarity index 99%
rename from app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
rename to app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild
index cd6baea156d..ee66ff52830 100644
--- a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1-r2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
python? ( ${PYTHON_DEPS} )
redis? ( >=dev-libs/hiredis-0.11.0:= )
- smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= )
+ smtp? ( net-libs/libesmtp:= )
snmp? ( net-analyzer/net-snmp:0= )
spoof-source? ( net-libs/libnet:1.1= )
systemd? ( sys-apps/systemd:= )
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
index 32c3408b5c8..e4c316ec023 100644
--- a/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
python? ( ${PYTHON_DEPS} )
redis? ( >=dev-libs/hiredis-0.11.0:= )
- smtp? ( net-libs/libesmtp )
+ smtp? ( net-libs/libesmtp:= )
snmp? ( net-analyzer/net-snmp:0= )
spoof-source? ( net-libs/libnet:1.1= )
systemd? ( sys-apps/systemd:= )
diff --git a/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild
b/app-admin/syslog-ng/syslog-ng-3.31.2-r1.ebuild
similarity index 99%
rename
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/patches/, app-admin/syslog-ng/
commit: c489e5e43a50495061ffa8552b21d0cbdbacb078
Author: Tomáš Mózes gmail com>
AuthorDate: Fri May 7 13:13:14 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue May 11 15:47:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c489e5e4
app-admin/syslog-ng: drop old
Signed-off-by: Tomáš Mózes gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20718
Signed-off-by: Thomas Deutschmann gentoo.org>
app-admin/syslog-ng/Manifest | 3 -
.../files/patches/syslog-ng-fno-common.patch | 320 -
.../patches/syslog-ng-glib-2.64-support.patch | 63
app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild | 170 ---
app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild | 171 ---
app-admin/syslog-ng/syslog-ng-3.29.1.ebuild| 171 ---
6 files changed, 898 deletions(-)
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 7eadb4cb04b..0e30bc1283e 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,5 +1,2 @@
-DIST syslog-ng-3.26.1.tar.gz 5040993 BLAKE2B
235971547c8febe61191014d971b9e5d71560f51ebc3a74fbae1c95b86653f1de8d0b99788f5b00cc75926dc67e7a80f650e9d2d12f191a4400c5b8edbbd01b7
SHA512
2cf6a8bd70addec3bef0888539f4a4686c30655698835d0c211ea929a0cae91a6f3dc9903f29fe717fd9d48b5cdc9918796f196ca84af6f5733bedff09ffab5a
-DIST syslog-ng-3.28.1.tar.gz 5149671 BLAKE2B
bfc33f2a595cb4fbcc5a69b60d283673922873434b21ca8ce9685a0f54b355f162b11242704419349a561f412573c84df30a49a4dc0cc95699e98720e3e65247
SHA512
d70b435a6c9d1d0d22ecebc051dc294b6e7f841159edabf229c772c40342a28014ea1599b2277f0514236f545bac63c9879988fd85d634e9ab4fe4f079c984cb
-DIST syslog-ng-3.29.1.tar.gz 5111614 BLAKE2B
1dba62290d6354d0cda7d43783327a19f69e05963c6d2e75f42c61c30984d49d28f1c6474e68ccdd806f38022bf6799e69e12f2444da391b2bccb736ca597c72
SHA512
c8ec6527cab9e46effe23aaa1306b5bde1e13c3e62a092a62af630a744cc41e81d861e6e2ebfbaad8a9199d3b75ba4ac5fb4b4215d03f80a41f57a2e7a074a49
DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B
3e6ee58b3732ae4863de43c7d22799a74074e94dbbf735368c09c11382b641a5554a4a25ad836b4ac25c8a4f64781dbfb1d9ddd6961ba3aa70c4213cfec81bfd
SHA512
ac7ed4978c6db9464add30aa7aeb71a646f841593b02884c8d4ad34c0508c8d3243bcbe6ee98e81c04698895305334eadd9e624ba71e510c14d79155723efb52
DIST syslog-ng-3.31.2.tar.gz 5727835 BLAKE2B
a71190fe1580702a4d904c8a4d31a123d2aa0d01bb5a6e21f32f8502ec99f6109b45537c1a5022b0baeae89456b4b919bb8c88077d00aa9724398b7588254d89
SHA512
22a647c37f87fb1a45c8c69c2b0a022d1886cde5b0d585c3384b606d967c3f320a18e34810655174e82c797c0dc23c481732ecefd5be16da8fba4983b2ed0385
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch
b/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch
deleted file mode 100644
index abec9213cd1..000
--- a/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e9b4183fc..1f8f16c13 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -331,8 +331,7 @@ endif()
- add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -j $$(nproc)
--output-on-failure)
-
- set(IMPORTANT_WARNINGS
-- -Wshadow
-- -fcommon)
-+ -Wshadow)
-
- set(ACCEPTABLE_WARNINGS
- -Wno-stack-protector
-diff --git a/Makefile.am b/Makefile.am
-index 8b24eeaed..86c090638 100644
a/Makefile.am
-+++ b/Makefile.am
-@@ -54,8 +54,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib
-I$(top_srcdir)/modules -I$(top_builddir)/lib
-
- # Important warnings
- AM_CFLAGS = \
-- -Wshadow \
-- -fcommon
-+ -Wshadow
-
- # Acceptable warnings
- AM_CFLAGS += \
-diff --git a/lib/logmsg/tests/test_log_message.c
b/lib/logmsg/tests/test_log_message.c
-index 245568ce5..e51d78b94 100644
a/lib/logmsg/tests/test_log_message.c
-+++ b/lib/logmsg/tests/test_log_message.c
-@@ -32,6 +32,8 @@
- #include
- #include
-
-+MsgFormatOptions parse_options;
-+
- typedef struct _LogMessageTestParams
- {
- LogMessage *message;
-@@ -151,7 +153,7 @@ void
- setup(void)
- {
- app_startup();
-- init_and_load_syslogformat_module();
-+ init_parse_options_and_load_syslogformat(_options);
- }
-
- void
-diff --git a/libtest/cr_template.c b/libtest/cr_template.c
-index 35e47aa3f..4f0913368 100644
a/libtest/cr_template.c
-+++ b/libtest/cr_template.c
-@@ -34,10 +34,12 @@
-
- #include "msg_parse_lib.h"
-
-+static MsgFormatOptions parse_options;
-+
- void
- init_template_tests(void)
- {
-- init_and_load_syslogformat_module();
-+ init_parse_options_and_load_syslogformat(_options);
- }
-
- void
-diff --git a/libtest/msg_parse_lib.c b/libtest/msg_parse_lib.c
-index ae0d1654b..b3c7cb652 100644
a/libtest/msg_parse_lib.c
-+++ b/libtest/msg_parse_lib.c
-@@ -27,15 +27,13 @@
-
- #include
-
--MsgFormatOptions parse_options;
--
- void
--init_and_load_syslogformat_module(void)
-+init_parse_options_and_load_syslogformat(MsgFormatOptions
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/, app-admin/syslog-ng/
commit: 28e5e044aa65c4e3c1748716e7f0224fbfd94676
Author: Sam James gentoo org>
AuthorDate: Tue Apr 13 20:47:10 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 13 22:37:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28e5e044
app-admin/syslog-ng: use pkgconfig to find libesmtp
The newer version of libesmtp (snapshot) drops autotools and dropped
its homebrew libesmtp-config utility too. We now have to use pkgconfig
to find it.
Bug: https://bugs.gentoo.org/782643
Signed-off-by: Sam James gentoo.org>
.../files/syslog-ng-3.30.1-esmtp-pkgconfig.patch | 26
app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild | 173 +
2 files changed, 199 insertions(+)
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
b/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
new file mode 100644
index 000..ef4f72faa31
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/782643
+--- a/configure.ac
b/configure.ac
+@@ -1270,20 +1270,9 @@ if test "x$enable_smtp" != "xno" && test
"x$with_libesmtp" != "xno"; then
+ CPPFLAGS="$CPPFLAGS_SAVE"
+ LDFLAGS="$LDFLAGS_SAVE"
+ else
+- AC_MSG_CHECKING(for libESMTP)
+- if libesmtp-config --version >/dev/null 2>&1; then
+- AC_MSG_RESULT(yes)
+- LIBESMTP_CFLAGS="`libesmtp-config --cflags`"
+- LIBESMTP_LIBS="`libesmtp-config --libs`"
+- else
+- AC_MSG_RESULT(no)
+- libesmtp=no
+- fi
+- fi
+- if test "x$enable_smtp" = "xyes" && test "x$libesmtp" = "xno"; then
+- AC_MSG_ERROR(libESMTP not found)
++ PKG_CHECK_MODULES(libesmtp, libesmtp-1.0)
+ fi
+- enable_smtp=$libesmtp
++ enable_smtp="yes"
+ fi
+
+ dnl
***
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
b/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
new file mode 100644
index 000..361c5df0c23
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit autotools python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management;
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz;
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390
~sparc ~x86"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python
redis smtp snmp test spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.10.1:2
+ >=dev-libs/ivykis-0.42.4
+ >=dev-libs/libpcre-6.1:=
+ !dev-libs/eventlog
+ amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
+ caps? ( sys-libs/libcap )
+ dbi? ( >=dev-db/libdbi-0.9.0 )
+ geoip2? ( dev-libs/libmaxminddb:= )
+ http? ( net-misc/curl )
+ json? ( >=dev-libs/json-c-0.9:= )
+ kafka? ( >=dev-libs/librdkafka-1.0.0:= )
+ mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+ python? ( ${PYTHON_DEPS} )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= )
+ snmp? ( net-analyzer/net-snmp:0= )
+ spoof-source? ( net-libs/libnet:1.1= )
+ systemd? ( sys-apps/systemd:= )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/criterion )"
+BDEPEND="
+ sys-devel/flex
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md
contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+ contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+ "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
+ "${FILESDIR}"/${PN}-3.30.1-esmtp-pkgconfig.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ local f
+
+ use python && python_fix_shebang .
+
+ # remove bundled libs
+ rm -r lib/ivykis || die
+
+ # drop scl modules requiring json
+ if use !json; then
+ sed -i -r
'/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d'
scl/Makefile.am || die
+ fi
+
+ # drop scl modules requiring http
+ if use !http; then
+ sed -i -r '/slack|telegram/d'
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/patches/, app-admin/syslog-ng/
commit: 754c5886ebc04dc73f689c5e0071c5fc95b5d41a
Author: Tomáš Mózes gmail com>
AuthorDate: Tue Jun 9 17:03:58 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Jun 10 01:21:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754c5886
app-admin/syslog-ng: add support for glib 2.64
Closes: https://bugs.gentoo.org/716006
Bug: https://bugs.gentoo.org/702032
Signed-off-by: Tomáš Mózes gmail.com>
Signed-off-by: Thomas Deutschmann gentoo.org>
.../patches/syslog-ng-glib-2.64-support.patch | 63
app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild | 171 +
2 files changed, 234 insertions(+)
diff --git
a/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch
b/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch
new file mode 100644
index 000..fdd98624a6e
--- /dev/null
+++ b/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch
@@ -0,0 +1,63 @@
+diff --git a/lib/compat/glib.c b/lib/compat/glib.c
+index 8b6e52447..5b8ed8891 100644
+--- a/lib/compat/glib.c
b/lib/compat/glib.c
+@@ -315,3 +315,18 @@ slng_g_hash_table_insert(GHashTable *hash_table, gpointer
key, gpointer value)
+ return exists;
+ }
+ #endif
++
++
++#if !GLIB_CHECK_VERSION(2, 64, 0)
++gunichar
++g_utf8_get_char_validated_fixed(const gchar *p, gssize max_len)
++{
++ //
https://github.com/GNOME/glib/commit/1963821a57584b4674c20895e8a5adccd2d9effd
++
++#undef g_utf8_get_char_validated
++ if (*p == '\0' && max_len > 0)
++return (gunichar)-2;
++
++ return g_utf8_get_char_validated(p, max_len);
++}
++#endif
+diff --git a/lib/compat/glib.h b/lib/compat/glib.h
+index a9782ed2d..0fbdbd12d 100644
+--- a/lib/compat/glib.h
b/lib/compat/glib.h
+@@ -109,4 +109,9 @@ gchar *g_base64_encode_fixed(const guchar *data, gsize
len);
+ gboolean slng_g_hash_table_insert (GHashTable *hash_table, gpointer key,
gpointer value);
+ #endif
+
++#if !GLIB_CHECK_VERSION(2, 64, 0)
++#define g_utf8_get_char_validated g_utf8_get_char_validated_fixed
++gunichar g_utf8_get_char_validated_fixed (const gchar *p, gssize max_len);
++#endif
++
+ #endif
+diff --git a/modules/cef/tests/test-format-cef-extension.c
b/modules/cef/tests/test-format-cef-extension.c
+index d7f6ee3c1..f4233f96f 100644
+--- a/modules/cef/tests/test-format-cef-extension.c
b/modules/cef/tests/test-format-cef-extension.c
+@@ -104,7 +104,7 @@ Test(format_cef, test_null_in_value)
+
+ configuration->template_options.on_error = ON_ERROR_DROP_MESSAGE |
ON_ERROR_SILENT;
+ log_msg_set_value_by_name(msg, ".cef.k", "a\0b", 3);
+- assert_template_format_msg("$(format-cef-extension --subkeys .cef.)",
"k=a\\ub", msg);
++ assert_template_format_msg("$(format-cef-extension --subkeys .cef.)",
"k=a\\x00b", msg);
+ log_msg_unref(msg);
+ }
+
+diff --git a/modules/json/tests/test_format_json.c
b/modules/json/tests/test_format_json.c
+index 92c61e9f1..1224ddb33 100644
+--- a/modules/json/tests/test_format_json.c
b/modules/json/tests/test_format_json.c
+@@ -55,7 +55,7 @@ Test(format_json, test_format_json)
+ assert_template_format("$(format-json MSG=$escaping)",
+ "{\"MSG\":\"binary stuff follows \\\"xad
árvíztűrőtükörfúrógép\"}");
+ assert_template_format("$(format-json MSG=$escaping2)",
"{\"MSG\":\"xc3\"}");
+- assert_template_format("$(format-json MSG=$null)",
"{\"MSG\":\"binary\\ustuff\"}");
++ assert_template_format("$(format-json MSG=$null)",
"{\"MSG\":\"binaryx00stuff\"}");
+ assert_template_format_with_context("$(format-json MSG=$MSG)",
+
"{\"MSG\":\"árvíztűrőtükörfúrógép\"}{\"MSG\":\"árvíztűrőtükörfúrógép\"}");
+ assert_template_format("$(format-json --scope rfc3164)",
diff --git a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
new file mode 100644
index 000..834c32ffc4a
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit autotools python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management;
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz;
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390
~sparc ~x86"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python
redis smtp snmp test spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.10.1:2
+ >=dev-libs/ivykis-0.42.4
+ >=dev-libs/libpcre-6.1:=
+ !dev-libs/eventlog
+ amqp? (
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/patches/, app-admin/syslog-ng/
commit: 21d50f7a6514f069f6de2204f5ecdf302c27ce6b
Author: Tomáš Mózes gmail com>
AuthorDate: Tue Feb 4 11:14:31 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Feb 20 13:17:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21d50f7a
app-admin/syslog-ng: fix building with CFLAGS=-fno-common
Closes: https://bugs.gentoo.org/707124
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Tomáš Mózes gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14516
Signed-off-by: Joonas Niilola gentoo.org>
.../files/patches/syslog-ng-fno-common.patch | 320 +
app-admin/syslog-ng/syslog-ng-3.25.1.ebuild| 4 +-
2 files changed, 323 insertions(+), 1 deletion(-)
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch
b/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch
new file mode 100644
index 000..abec9213cd1
--- /dev/null
+++ b/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch
@@ -0,0 +1,320 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e9b4183fc..1f8f16c13 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -331,8 +331,7 @@ endif()
+ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -j $$(nproc)
--output-on-failure)
+
+ set(IMPORTANT_WARNINGS
+- -Wshadow
+- -fcommon)
++ -Wshadow)
+
+ set(ACCEPTABLE_WARNINGS
+ -Wno-stack-protector
+diff --git a/Makefile.am b/Makefile.am
+index 8b24eeaed..86c090638 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -54,8 +54,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib
-I$(top_srcdir)/modules -I$(top_builddir)/lib
+
+ # Important warnings
+ AM_CFLAGS = \
+- -Wshadow \
+- -fcommon
++ -Wshadow
+
+ # Acceptable warnings
+ AM_CFLAGS += \
+diff --git a/lib/logmsg/tests/test_log_message.c
b/lib/logmsg/tests/test_log_message.c
+index 245568ce5..e51d78b94 100644
+--- a/lib/logmsg/tests/test_log_message.c
b/lib/logmsg/tests/test_log_message.c
+@@ -32,6 +32,8 @@
+ #include
+ #include
+
++MsgFormatOptions parse_options;
++
+ typedef struct _LogMessageTestParams
+ {
+ LogMessage *message;
+@@ -151,7 +153,7 @@ void
+ setup(void)
+ {
+ app_startup();
+- init_and_load_syslogformat_module();
++ init_parse_options_and_load_syslogformat(_options);
+ }
+
+ void
+diff --git a/libtest/cr_template.c b/libtest/cr_template.c
+index 35e47aa3f..4f0913368 100644
+--- a/libtest/cr_template.c
b/libtest/cr_template.c
+@@ -34,10 +34,12 @@
+
+ #include "msg_parse_lib.h"
+
++static MsgFormatOptions parse_options;
++
+ void
+ init_template_tests(void)
+ {
+- init_and_load_syslogformat_module();
++ init_parse_options_and_load_syslogformat(_options);
+ }
+
+ void
+diff --git a/libtest/msg_parse_lib.c b/libtest/msg_parse_lib.c
+index ae0d1654b..b3c7cb652 100644
+--- a/libtest/msg_parse_lib.c
b/libtest/msg_parse_lib.c
+@@ -27,15 +27,13 @@
+
+ #include
+
+-MsgFormatOptions parse_options;
+-
+ void
+-init_and_load_syslogformat_module(void)
++init_parse_options_and_load_syslogformat(MsgFormatOptions *parse_options)
+ {
+ configuration = cfg_new_snippet();
+ cfg_load_module(configuration, "syslogformat");
+- msg_format_options_defaults(_options);
+- msg_format_options_init(_options, configuration);
++ msg_format_options_defaults(parse_options);
++ msg_format_options_init(parse_options, configuration);
+ }
+
+ void
+diff --git a/libtest/msg_parse_lib.h b/libtest/msg_parse_lib.h
+index d86f178c2..5a9b4277b 100644
+--- a/libtest/msg_parse_lib.h
b/libtest/msg_parse_lib.h
+@@ -30,9 +30,7 @@
+ #include "cfg.h"
+ #include "logmsg/logmsg.h"
+
+-extern MsgFormatOptions parse_options;
+-
+-void init_and_load_syslogformat_module(void);
++void init_parse_options_and_load_syslogformat(MsgFormatOptions
*parse_options);
+ void deinit_syslogformat_module(void);
+
+ void assert_log_messages_equal(LogMessage *log_message_a, LogMessage
*log_message_b);
+diff --git a/libtest/proto_lib.c b/libtest/proto_lib.c
+index b69195865..105e390b9 100644
+--- a/libtest/proto_lib.c
b/libtest/proto_lib.c
+@@ -23,7 +23,7 @@
+ */
+
+ #include "proto_lib.h"
+-#include "msg_parse_lib.h"
++#include "cfg.h"
+
+ #include
+ #include
+@@ -164,7 +164,8 @@ assert_proto_server_fetch_ignored_eof(LogProtoServer
*proto)
+ void
+ init_proto_tests(void)
+ {
+- init_and_load_syslogformat_module();
++ configuration = cfg_new_snippet();
++ cfg_load_module(configuration, "syslogformat");
+ log_proto_server_options_defaults(_server_options);
+ }
+
+@@ -172,5 +173,7 @@ void
+ deinit_proto_tests(void)
+ {
+ log_proto_server_options_destroy(_server_options);
+- deinit_syslogformat_module();
++
++ if (configuration)
++cfg_free(configuration);
+ }
+diff --git a/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c
b/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c
+index 79a4b97ad..d4d0d45a9 100644
+--- a/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/patches/, app-admin/syslog-ng/
commit: 72d9f90c29493798c7b7cd90a62e84f7e18643cf
Author: Tomas Mozes gmail com>
AuthorDate: Thu Oct 17 12:26:50 2019 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Oct 22 04:43:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72d9f90c
app-admin/syslog-ng: drop old
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Tomáš Mózes gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13326
Signed-off-by: Joonas Niilola gentoo.org>
app-admin/syslog-ng/Manifest | 1 -
.../patches/syslog-ng-3.23.1-fix-sigabrt.patch | 72 -
app-admin/syslog-ng/syslog-ng-3.23.1-r1.ebuild | 174 -
3 files changed, 247 deletions(-)
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 940c725e707..82ae91362c8 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,3 +1,2 @@
DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B
e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223
SHA512
4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f
-DIST syslog-ng-3.23.1.tar.gz 5008517 BLAKE2B
a128707ed36ae3a236dbd3bffb080bd39187a77b3ed7fc0c8d6a2de65f6b761f3c7160a8fdc804c56e4ba673451779382a91c83c8d8cd15ec6fed2c799309adf
SHA512
d1ded084a9141637da44cb9c7d8c66585e498b16ff6717548e31ad61bbfe1e04de3554183c8a4de540d9280de1e6370303845010164b3b2ac53ecce1e7434a48
DIST syslog-ng-3.24.1.tar.gz 4909513 BLAKE2B
4b8d05899f9767784b6d24008d55808bee0af4a29883b2cb67031d23f4937632ba00f2ed7a9e969984ebec2785243a9e60811c4c2ccb3c6188c66a71af004f36
SHA512
b5326193e20db16763d3e187292bf683ebb77032b800a6e54a4ce2dd3864dda48b3d0ffc4d442eff0261117ac7a76d7927f4c8d0d96fc59ce29b46da6bd052d5
diff --git
a/app-admin/syslog-ng/files/patches/syslog-ng-3.23.1-fix-sigabrt.patch
b/app-admin/syslog-ng/files/patches/syslog-ng-3.23.1-fix-sigabrt.patch
deleted file mode 100644
index 6d27e88abf7..000
--- a/app-admin/syslog-ng/files/patches/syslog-ng-3.23.1-fix-sigabrt.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/lib/logsource.c b/lib/logsource.c
-index 3f38b66e8b..83c61a8e93 100644
a/lib/logsource.c
-+++ b/lib/logsource.c
-@@ -633,7 +633,20 @@ log_source_queue(LogPipe *s, LogMessage *msg, const
LogPathOptions *path_options
- evt_tag_printf("msg", "%p", msg));
-
- msg_set_context(NULL);
-+}
-+
-+static void
-+_initialize_window(LogSource *self, gint init_window_size)
-+{
-+ self->window_initialized = TRUE;
-+ window_size_counter_set(>window_size, init_window_size);
-+ self->full_window_size = init_window_size;
-+}
-
-+static gboolean
-+_is_window_initialized(LogSource *self)
-+{
-+ return self->window_initialized;
- }
-
- void
-@@ -645,11 +658,9 @@ log_source_set_options(LogSource *self, LogSourceOptions
*options,
-* configuration and we received a SIGHUP. This means that opened
-* connections will not have their window_size changed. */
-
-- if ((gint)window_size_counter_get(>window_size, NULL) == -1)
--{
-- window_size_counter_set(>window_size, options->init_window_size);
-- self->full_window_size = options->init_window_size;
--}
-+ if (!_is_window_initialized(self))
-+_initialize_window(self, options->init_window_size);
-+
- self->options = options;
- if (self->stats_id)
- g_free(self->stats_id);
-@@ -679,7 +690,7 @@ log_source_init_instance(LogSource *self, GlobalConfig
*cfg)
- self->super.free_fn = log_source_free;
- self->super.init = log_source_init;
- self->super.deinit = log_source_deinit;
-- window_size_counter_set(>window_size, (gsize)-1);
-+ self->window_initialized = FALSE;
- self->ack_tracker = NULL;
- }
-
-@@ -696,7 +707,9 @@ log_source_free(LogPipe *s)
-
- ack_tracker_free(self->ack_tracker);
- self->ack_tracker = NULL;
-- _release_dynamic_window(self);
-+
-+ if (G_UNLIKELY(dynamic_window_is_enabled(>dynamic_window)))
-+_release_dynamic_window(self);
- }
-
- void
-diff --git a/lib/logsource.h b/lib/logsource.h
-index 370842efc2..75d4926046 100644
a/lib/logsource.h
-+++ b/lib/logsource.h
-@@ -71,6 +71,7 @@ struct _LogSource
- gchar *stats_instance;
- WindowSizeCounter window_size;
- DynamicWindow dynamic_window;
-+ gboolean window_initialized;
- /* full_window_size = static + dynamic */
- gsize full_window_size;
- atomic_gssize window_size_to_be_reclaimed;
diff --git a/app-admin/syslog-ng/syslog-ng-3.23.1-r1.ebuild
b/app-admin/syslog-ng/syslog-ng-3.23.1-r1.ebuild
deleted file mode 100644
index bc13ee0fdc7..000
--- a/app-admin/syslog-ng/syslog-ng-3.23.1-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit autotools python-single-r1 systemd
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/patches/
commit: 337890cdefed9bd952c335f688efb731d38d681d
Author: Tomas Mozes gmail com>
AuthorDate: Fri Sep 20 13:11:21 2019 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Sep 20 15:42:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=337890cd
app-admin/syslog-ng: drop unused patches
Signed-off-by: Tomáš Mózes gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12978
Signed-off-by: Joonas Niilola gentoo.org>
.../patches/syslog-ng-3.12.1-json-c-0.13+.patch| 33
.../syslog-ng-3.14.1-fix-automake-1.16-build.patch | 23 ---
.../patches/syslog-ng-3.14.1-fix-tls-client.patch | 173 -
3 files changed, 229 deletions(-)
diff --git
a/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch
b/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch
deleted file mode 100644
index 3703bec22ba..000
--- a/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?=
-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 0368ed8f7..356df48b9 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
-
- #include
-+
-+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
- #include
-+#endif
-
- typedef struct _JSONParser
- {
diff --git
a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch
b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch
deleted file mode 100644
index 4339612f58c..000
---
a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 41dd64e7b11d527f8f3cc6ae13067d0225191538 Mon Sep 17 00:00:00 2001
-From: kokan
-Date: Sat, 31 Mar 2018 15:36:08 +0200
-Subject: [PATCH] libsyslog-ng: missing dependency libsecret-storage
-
-Signed-off-by: kokan
- lib/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index af2f44ece2..4a0b11c92f 100644
a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -47,7 +47,7 @@ lib_libsyslog_ng_la_LDFLAGS = -no-undefined
-release ${LSNG_RELEASE} \
-
- lib_test_subdirs = lib_filter lib_logproto lib_parser
lib_rewrite lib_template lib_stats lib_control
-
--lib_libsyslog_ng_la_DEPENDENCIES = lib/eventlog/src/libevtlog.la
-+lib_libsyslog_ng_la_DEPENDENCIES = lib/eventlog/src/libevtlog.la
lib/secret-storage/libsecret-storage.la
-
- if IVYKIS_INTERNAL
- lib_libsyslog_ng_la_DEPENDENCIES += lib/ivykis/src/libivykis.la
diff --git
a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch
b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch
deleted file mode 100644
index b4046bdbadb..000
--- a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From a4f7b9dc75c2b678466cc104d8ca111bd90fba11 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?=
-Date: Wed, 7 Mar 2018 18:35:09 +0100
-Subject: [PATCH 1/3] tls: fix tls_context_load_key_and_cert()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-key_file and cert_file are optional (the client cert is not mandatory).
-
-Signed-off-by: László Várady
- lib/tlscontext.c | 9 +
- modules/afsocket/transport-mapper-inet.c | 6 +++---
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/lib/tlscontext.c b/lib/tlscontext.c
-index 510ac2738d..b202c397f3 100644
a/lib/tlscontext.c
-+++ b/lib/tlscontext.c
-@@ -599,9 +599,18 @@ _are_key_and_cert_files_accessible(TLSContext *self)
- file_exists(self->cert_file);
- }
-
-+static gboolean
-+_client_key_and_cert_files_are_not_specified(TLSContext *self)
-+{
-+ return self->mode == TM_CLIENT && (!self->key_file && !self->cert_file);
-+}
-+
- static TLSContextLoadResult
- tls_context_load_key_and_cert(TLSContext *self)
- {
-+ if (_client_key_and_cert_files_are_not_specified(self))
-+return TLS_CONTEXT_OK;
-+
- if (!_are_key_and_cert_files_accessible(self))
- return TLS_CONTEXT_FILE_ACCES_ERROR;
- if (!SSL_CTX_use_PrivateKey_file(self->ssl_ctx, self->key_file,
SSL_FILETYPE_PEM))
-diff --git a/modules/afsocket/transport-mapper-inet.c
b/modules/afsocket/transport-mapper-inet.c
-index 80c0d21801..1afb34b33f
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/, app-admin/syslog-ng/files/3.13/, ...
commit: f6a6cf54eed97085e2a1f052c9f58e6d4530a535 Author: Tomas Mozes gmail com> AuthorDate: Thu Sep 19 09:51:59 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Sep 19 16:16:34 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6a6cf54 app-admin/syslog-ng: drop old Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Tomáš Mózes gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12968 Signed-off-by: Joonas Niilola gentoo.org> app-admin/syslog-ng/Manifest | 6 - .../syslog-ng/files/3.13/syslog-ng.conf.gentoo | 36 - .../files/3.13/syslog-ng.conf.gentoo.fbsd | 24 --- .../files/3.13/syslog-ng.conf.gentoo.hardened | 115 -- app-admin/syslog-ng/files/3.13/syslog-ng.confd | 42 - app-admin/syslog-ng/files/3.13/syslog-ng.rc| 58 --- .../syslog-ng/files/3.14/syslog-ng.conf.gentoo | 36 - .../files/3.14/syslog-ng.conf.gentoo.fbsd | 24 --- .../files/3.14/syslog-ng.conf.gentoo.hardened | 115 -- app-admin/syslog-ng/files/3.14/syslog-ng.confd | 43 -- app-admin/syslog-ng/files/3.14/syslog-ng.rc| 59 --- .../syslog-ng/files/3.7/syslog-ng.conf.gentoo | 36 - .../syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd | 24 --- .../files/3.7/syslog-ng.conf.gentoo.hardened | 114 -- app-admin/syslog-ng/files/3.7/syslog-ng.confd | 42 - app-admin/syslog-ng/files/3.7/syslog-ng.rc6| 58 --- .../syslog-ng/files/syslog-ng.conf.gentoo.fbsd.in | 24 --- .../files/syslog-ng.conf.gentoo.hardened.in| 2 +- app-admin/syslog-ng/files/syslog-ng.rc | 2 +- app-admin/syslog-ng/syslog-ng-3.13.2.ebuild| 169 app-admin/syslog-ng/syslog-ng-3.17.2.ebuild| 171 app-admin/syslog-ng/syslog-ng-3.18.1.ebuild| 171 app-admin/syslog-ng/syslog-ng-3.19.1.ebuild| 171 app-admin/syslog-ng/syslog-ng-3.20.1.ebuild| 172 - app-admin/syslog-ng/syslog-ng-3.7.3.ebuild | 138 - 25 files changed, 2 insertions(+), 1850 deletions(-) diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index 507fe11ea82..e170d1c763d 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -1,8 +1,2 @@ -DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe -DIST syslog-ng-3.17.2.tar.gz 9119227 BLAKE2B 3268a51c587e66579b30ee8d27397eeeb3ab52c7e1939ad26ad976be2670565a389fda9dbc3a25f80710f855788c85f58d47f6a3c297b8ff6efa01e0dca386fe SHA512 2b82ea047bab125d35ab0a90e933b8a282852c6b4a9a8adc3f2a0ddf392f24210ce1296d0cfb389f98e54e50090a3ded5a64c5a9529d2a90cbecbfafd620edd7 -DIST syslog-ng-3.18.1.tar.gz 4259746 BLAKE2B 3878a87bd195aadb0f9d024e1336e50268d69c00b438b5e3471f21bc4592ebd97980004c3624d9b92232b38068ebefa0c3317cb0d9b5dfeba37c479aeadc32e4 SHA512 2e6ea690f8762f3f37885118f023048c4cba59f58002c87fa1c469cb991b2ba707015b3e54c50f17c3d6e6251d798557406925a9159f4fa914331f281dc39e48 -DIST syslog-ng-3.19.1.tar.gz 4224779 BLAKE2B e938c91101c18951a5c921bea51631400bf579ebc840300c6d8411da9b8db69935d104bfe00525512ab0173b932a8e24e2fb102e17bc4ecf58b268e52ef5b41a SHA512 f625073bafa9378109d5be34591247766a62cb5a76e814f42bfbf03472e96ebe2833f19779812abfdd950a3498115f57b97c1427c280ee0dab21d3e2eb92ca57 -DIST syslog-ng-3.20.1.tar.gz 4312715 BLAKE2B df37ea15937d67823ddf25fb935be90fed2cb9b1a653d90bb447a3d674c250f6a7963a9bf4623685c5a19e11b928d02aec508d5f061135d67cd4b6d922795ed0 SHA512 19e3896a750ef68923950ca037846808f5d8bd24e64b41a024776a19654def83fce5d48b6e0805b1389494ad1435c5c7af9d79c1188454492f7228f5644ddc5c DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223 SHA512 4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f DIST syslog-ng-3.23.1.tar.gz 5008517 BLAKE2B a128707ed36ae3a236dbd3bffb080bd39187a77b3ed7fc0c8d6a2de65f6b761f3c7160a8fdc804c56e4ba673451779382a91c83c8d8cd15ec6fed2c799309adf SHA512 d1ded084a9141637da44cb9c7d8c66585e498b16ff6717548e31ad61bbfe1e04de3554183c8a4de540d9280de1e6370303845010164b3b2ac53ecce1e7434a48 -DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b diff --git
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/3.13/, app-admin/syslog-ng/
commit: 36c4716ec165d1565d72943504af8b4e386d99cd
Author: Tomas Mozes gmail com>
AuthorDate: Sun Dec 10 05:58:01 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Dec 12 20:09:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36c4716e
app-admin/syslog-ng: version bump to 3.13.2.
Closes: https://bugs.gentoo.org/557060
Closes: https://bugs.gentoo.org/640136
Closes: https://bugs.gentoo.org/640458
Closes: https://github.com/gentoo/gentoo/pull/6504
app-admin/syslog-ng/Manifest | 1 +
.../syslog-ng/files/3.13/syslog-ng.conf.gentoo | 36 +
.../files/3.13/syslog-ng.conf.gentoo.fbsd | 24 +++
.../files/3.13/syslog-ng.conf.gentoo.hardened | 115 ++
app-admin/syslog-ng/files/3.13/syslog-ng.confd | 42 ++
app-admin/syslog-ng/files/3.13/syslog-ng.rc| 58 +++
app-admin/syslog-ng/syslog-ng-3.13.2.ebuild| 167 +
7 files changed, 443 insertions(+)
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 282ffeb2b72..791460b56a6 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,2 +1,3 @@
DIST syslog-ng-3.12.1.tar.gz 8905646 BLAKE2B
abe273c561569047ef4ea0b21b08341d207ecc9a37ba88d1aa28f00de8a0c28cab2942b3d461b7b4fea940668b44ceda7f9c71b6f7c7583143f4bf65adb54036
SHA512
00370f8b090156c064d9fe932e2aafe3f78ffc01bc47b2bc2f0f3c6cbdf98ea8cc2084317b8c2b1a9755cce404646b20e131039ce55b87e24f4401a55b95ff7e
+DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B
a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f
SHA512
fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B
25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf
SHA512
e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo
b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo
new file mode 100644
index 000..ee8c76a7f53
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo
@@ -0,0 +1,36 @@
+@version: 3.13
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+
+ # The default action of syslog-ng is to log a STATS line
+ # to the file every 10 minutes. That's pretty ugly after a while.
+ # Change it to every 12 hours so you get a nice daily update of
+ # how many messages syslog-ng missed (0).
+ stats_freq(43200);
+ # The default action of syslog-ng is to log a MARK line
+ # to the file every 20 minutes. That's seems high for most
+ # people so turn it down to once an hour. Set it to zero
+ # if you don't want the functionality at all.
+ mark_freq(3600);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.fbsd
b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.fbsd
new file mode 100644
index 000..e9122a89061
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.fbsd
@@ -0,0 +1,24 @@
+@version: 3.13
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+
+ # The default action of syslog-ng is to log a STATS line
+ # to the file every 10 minutes. That's pretty ugly after a while.
+ # Change it to every 12 hours so you get a nice daily update of
+ # how many messages syslog-ng missed (0).
+ stats_freq(43200);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.hardened
b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.hardened
new file mode 100644
index 000..db6e7f0a1ce
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.hardened
@@ -0,0 +1,115 @@
+@version: 3.13
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/3.12/
commit: 73eb9782813b4e604f66d4334d1f73e97c0f9aa9
Author: Patrice Clement gentoo org>
AuthorDate: Mon Dec 4 08:34:47 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Dec 4 08:34:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73eb9782
app-admin/syslog-ng: remove bashism.
Bug: https://bugs.gentoo.org/639672
Package-Manager: Portage-2.3.13, Repoman-2.3.3
app-admin/syslog-ng/files/3.12/syslog-ng.rc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.rc
b/app-admin/syslog-ng/files/3.12/syslog-ng.rc
index 50add135378..abc652a4df6 100644
--- a/app-admin/syslog-ng/files/3.12/syslog-ng.rc
+++ b/app-admin/syslog-ng/files/3.12/syslog-ng.rc
@@ -46,7 +46,7 @@ start_pre() {
}
stop_pre() {
- [[ "$RC_CMD" == "restart" ]] && sleep 1
+ [ "$RC_CMD" = "restart" ] && sleep 1
return 0
}
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/3.12/
commit: dd18ea8355ebfd3a657958a3989587274ab6813c
Author: Patrice Clement gentoo org>
AuthorDate: Mon Dec 4 00:44:56 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Dec 4 00:44:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd18ea83
app-admin/syslog-ng: fix QA warning.
Closes: https://bugs.gentoo.org/639672
Package-Manager: Portage-2.3.13, Repoman-2.3.3
app-admin/syslog-ng/files/3.12/syslog-ng.rc | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.rc
b/app-admin/syslog-ng/files/3.12/syslog-ng.rc
index 09f969180b0..50add135378 100644
--- a/app-admin/syslog-ng/files/3.12/syslog-ng.rc
+++ b/app-admin/syslog-ng/files/3.12/syslog-ng.rc
@@ -2,14 +2,14 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-:
SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
-: SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
-:
SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
-: SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
-:
SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
-
-: SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
-: SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
+SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
+SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
+SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
+SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
+SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+
+SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
+SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
command="/usr/sbin/syslog-ng"
command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile
\"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\"
${SYSLOG_NG_OPTS}"
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/3.12/, app-admin/syslog-ng/
commit: 6224a15aebc6f09a22681a47e03d93114b9d910a
Author: Tomas Mozes gmail com>
AuthorDate: Fri Nov 24 07:17:15 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Dec 3 15:15:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6224a15a
app-admin/syslog-ng: version bump to 3.12.1.
Closes: https://bugs.gentoo.org/592920
Closes: https://github.com/gentoo/gentoo/pull/6275
Package-Manager: Portage-2.3.16, Repoman-2.3.6
app-admin/syslog-ng/Manifest | 3 +-
.../syslog-ng/files/3.12/syslog-ng.conf.gentoo | 36 +
.../files/3.12/syslog-ng.conf.gentoo.fbsd | 24
.../files/3.12/syslog-ng.conf.gentoo.hardened | 114
app-admin/syslog-ng/files/3.12/syslog-ng.confd | 42 ++
app-admin/syslog-ng/files/3.12/syslog-ng.rc| 58
app-admin/syslog-ng/metadata.xml | 5 +-
app-admin/syslog-ng/syslog-ng-3.12.1.ebuild| 149 +
8 files changed, 428 insertions(+), 3 deletions(-)
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index eb4f5c9341b..282ffeb2b72 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1 +1,2 @@
-DIST syslog-ng-3.7.3.tar.gz 3511155 SHA256
49201dcfd59c8992936aa16c694f5e6593d505b44895f6c66b7d7f7895ce2c62 SHA512
e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
WHIRLPOOL
ee434b8919183a70f484e6c96246b020a53a42e4306b2dea3b8ec15de71a1ad5be5185f0f3df5da76f0ca68618ff8391806748c6bea4a6844648e0939a57e97a
+DIST syslog-ng-3.12.1.tar.gz 8905646 BLAKE2B
abe273c561569047ef4ea0b21b08341d207ecc9a37ba88d1aa28f00de8a0c28cab2942b3d461b7b4fea940668b44ceda7f9c71b6f7c7583143f4bf65adb54036
SHA512
00370f8b090156c064d9fe932e2aafe3f78ffc01bc47b2bc2f0f3c6cbdf98ea8cc2084317b8c2b1a9755cce404646b20e131039ce55b87e24f4401a55b95ff7e
+DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B
25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf
SHA512
e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo
b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo
new file mode 100644
index 000..523a6804e14
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo
@@ -0,0 +1,36 @@
+@version: 3.12
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+
+ # The default action of syslog-ng is to log a STATS line
+ # to the file every 10 minutes. That's pretty ugly after a while.
+ # Change it to every 12 hours so you get a nice daily update of
+ # how many messages syslog-ng missed (0).
+ stats_freq(43200);
+ # The default action of syslog-ng is to log a MARK line
+ # to the file every 20 minutes. That's seems high for most
+ # people so turn it down to once an hour. Set it to zero
+ # if you don't want the functionality at all.
+ mark_freq(3600);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.fbsd
b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.fbsd
new file mode 100644
index 000..a0f516c7a58
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.fbsd
@@ -0,0 +1,24 @@
+@version: 3.12
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/426814
+@include "scl.conf"
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+
+ # The default action of syslog-ng is to log a STATS line
+ # to the file every 10 minutes. That's pretty ugly after a while.
+ # Change it to every 12 hours so you get a nice daily update of
+ # how many messages syslog-ng missed (0).
+ stats_freq(43200);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.hardened
b/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.hardened
new file mode 100644
index 000..8497ad8a321
--- /dev/null
+++
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/3.4/, app-admin/syslog-ng/, ...
commit: 30aa93f2be313e0c87153ad722a50e8a0d67af1c
Author: Jeroen Roovers gentoo org>
AuthorDate: Mon Nov 20 16:46:42 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Mon Nov 20 16:46:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30aa93f2
app-admin/syslog-ng: Old.
Package-Manager: Portage-2.3.14, Repoman-2.3.6
app-admin/syslog-ng/Manifest | 4 -
.../syslog-ng/files/3.4/syslog-ng.conf.gentoo | 36 --
.../syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd | 24
.../files/3.4/syslog-ng.conf.gentoo.hardened | 114
app-admin/syslog-ng/files/3.4/syslog-ng.confd | 42 --
app-admin/syslog-ng/files/3.4/syslog-ng.rc6| 58 -
.../files/3.6/syslog-ng-3.6.2-redis.patch | 29 -
.../syslog-ng/files/3.6/syslog-ng.conf.gentoo | 36 --
.../syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd | 24
.../files/3.6/syslog-ng.conf.gentoo.hardened | 114
app-admin/syslog-ng/files/3.6/syslog-ng.confd | 42 --
app-admin/syslog-ng/files/3.6/syslog-ng.rc6| 58 -
app-admin/syslog-ng/syslog-ng-3.4.8.ebuild | 119 -
app-admin/syslog-ng/syslog-ng-3.6.2.ebuild | 123 --
app-admin/syslog-ng/syslog-ng-3.6.4.ebuild | 123 --
app-admin/syslog-ng/syslog-ng-3.7.2.ebuild | 143 -
16 files changed, 1089 deletions(-)
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index ef3c871124c..eb4f5c9341b 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,5 +1 @@
-DIST syslog-ng-3.7.2.tar.gz 3558377 SHA256
b1b3ccc0ce7f0d8bf15b23e59f2f4f5ded70eed410dfd27105219bc8856388a5 SHA512
dbf58b51b68bc6616a136df5eb67a120718d8c83f785218d40f62e5f7b3691a3ad4d21db617551e4192e053dc9340440424e3d3b072b47ca590d4eac0dbf0e6f
WHIRLPOOL
3721841f6e5ea883cd5ee71bf1651fa0861904008eb1136127c36990e2fe8801deafdf31ce880677eff7739b0b07411eee4542d8d4a80b60819fa3bd9ab24b9e
DIST syslog-ng-3.7.3.tar.gz 3511155 SHA256
49201dcfd59c8992936aa16c694f5e6593d505b44895f6c66b7d7f7895ce2c62 SHA512
e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
WHIRLPOOL
ee434b8919183a70f484e6c96246b020a53a42e4306b2dea3b8ec15de71a1ad5be5185f0f3df5da76f0ca68618ff8391806748c6bea4a6844648e0939a57e97a
-DIST syslog-ng_3.4.8.tar.gz 3169372 SHA256
96c2f970fbba4fdd7659b1fee5e476d2858c911d4304d42099f495493762ff49 SHA512
23ba9908664e594c186cbe4bd5dcfb5d2ed3faf02ec45b931bb91b078660547989c2340a08b478a33adb530d39a6d6f39a2e7519107a3f6b923ac9f39529620e
WHIRLPOOL
1085fa2c90e0c85421c64ed50e8a357f29006afea2f3e329e42d1e27f4210a10fe0f05d4af95a11c245d68b43644a4a829a50c05b7d541f59a6f580b3643b434
-DIST syslog-ng_3.6.2.tar.gz 3207456 SHA256
ef47fada52981e09af570457a5af30f815f5d5b6c2e33754cedd4ca9780d8261 SHA512
15603b4df2001e1ce7e0019d0dd9a0f4295445e3fd19a527ebf3d49486da7da27fac6c465727ec0354f8f70ca0f671a285ec132f9aa0de62b40f18b44af2a226
WHIRLPOOL
7135db242374d6e5789c0820a06187b7e325054fd214e3aee75aac5b8dde56786b432cc4519c07ce0cd413c3a560e8e74ee6eca319c21eaa750ca8140ef1b63f
-DIST syslog-ng_3.6.4.tar.gz 3276432 SHA256
7be11df31ac7d716f1f952e22b5ae8e2049edd633a41b223776a853d9106f4e7 SHA512
9c648628b9bd3ebb25bc44fa6586e88a4b9ed7c24b1c337569d3cccb04bf2f427ba1218900f8dfd8f668f245d6ab44ad45b67da661b7c2af68c6c42101b722e1
WHIRLPOOL
496a9b2e06e33b0c42726f3b13f859f356f136367c48363cd22b086b72f4f54a32cc057235636f2d2ea3ad7bdd622354ea67df1cbc770be608a84bc861fce93d
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo
b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo
deleted file mode 100644
index 075d3435673..000
--- a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo
+++ /dev/null
@@ -1,36 +0,0 @@
-@version: 3.4
-#
-# Syslog-ng default configuration file for Gentoo Linux
-
-# https://bugs.gentoo.org/show_bug.cgi?id=426814
-@include "scl.conf"
-
-options {
- threaded(yes);
- chain_hostnames(no);
-
- # The default action of syslog-ng is to log a STATS line
- # to the file every 10 minutes. That's pretty ugly after a while.
- # Change it to every 12 hours so you get a nice daily update of
- # how many messages syslog-ng missed (0).
- stats_freq(43200);
- # The default action of syslog-ng is to log a MARK line
- # to the file every 20 minutes. That's seems high for most
- # people so turn it down to once an hour. Set it to zero
- # if you don't want the functionality at all.
- mark_freq(3600);
-};
-
-source src { system(); internal(); };
-
-destination messages { file("/var/log/messages"); };
-
-# By default messages are logged to tty12...
-destination console_all { file("/dev/tty12"); };
-# ...if you intend to use /dev/console for programs like xconsole
-# you can comment out the
[gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/files/3.7/, app-admin/syslog-ng/
commit: c83c00565d6af5a9a48cafd083345009c37b0e4a
Author: Michael Sterrett mr_bones_ AT gentoo DOT org
AuthorDate: Fri Aug 28 20:24:25 2015 +
Commit: Michael Sterrett mr_bones_ AT gentoo DOT org
CommitDate: Fri Aug 28 20:25:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c83c0056
version bump to 3.7 series
Package-Manager: portage-2.2.20.1
app-admin/syslog-ng/Manifest | 1 +
.../syslog-ng/files/3.7/syslog-ng.conf.gentoo | 37 ++
.../syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd | 25
.../files/3.7/syslog-ng.conf.gentoo.hardened | 115 ++
app-admin/syslog-ng/files/3.7/syslog-ng.confd | 42 +++
app-admin/syslog-ng/files/3.7/syslog-ng.rc6| 59 +
app-admin/syslog-ng/syslog-ng-3.7.1.ebuild | 134 +
7 files changed, 413 insertions(+)
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 36b48cc..e434787 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,3 +1,4 @@
+DIST syslog-ng-3.7.1.tar.gz 3509575 SHA256
4c19841b9079b377cd814b1e6ebbf273af41d04d51c648f4c31f19bfadc20220 SHA512
6f9a68aec2594d83c43cf40e12a3d56e65661929a47c2a053ae120e34ad358d4dfd0b5b0303a374a5557f2ac0670114037a339530b111b1078b56e5baf284ed4
WHIRLPOOL
247498f144aec419d1214378332bc286795fa8f59ba33ce75b3d000be6340758f00a694d76b5cbfdd6b68d138a6cd373c06bb52c70e6ed6de29189c03a56d16b
DIST syslog-ng_3.4.8.tar.gz 3169372 SHA256
96c2f970fbba4fdd7659b1fee5e476d2858c911d4304d42099f495493762ff49 SHA512
23ba9908664e594c186cbe4bd5dcfb5d2ed3faf02ec45b931bb91b078660547989c2340a08b478a33adb530d39a6d6f39a2e7519107a3f6b923ac9f39529620e
WHIRLPOOL
1085fa2c90e0c85421c64ed50e8a357f29006afea2f3e329e42d1e27f4210a10fe0f05d4af95a11c245d68b43644a4a829a50c05b7d541f59a6f580b3643b434
DIST syslog-ng_3.6.2.tar.gz 3207456 SHA256
ef47fada52981e09af570457a5af30f815f5d5b6c2e33754cedd4ca9780d8261 SHA512
15603b4df2001e1ce7e0019d0dd9a0f4295445e3fd19a527ebf3d49486da7da27fac6c465727ec0354f8f70ca0f671a285ec132f9aa0de62b40f18b44af2a226
WHIRLPOOL
7135db242374d6e5789c0820a06187b7e325054fd214e3aee75aac5b8dde56786b432cc4519c07ce0cd413c3a560e8e74ee6eca319c21eaa750ca8140ef1b63f
DIST syslog-ng_3.6.4.tar.gz 3276432 SHA256
7be11df31ac7d716f1f952e22b5ae8e2049edd633a41b223776a853d9106f4e7 SHA512
9c648628b9bd3ebb25bc44fa6586e88a4b9ed7c24b1c337569d3cccb04bf2f427ba1218900f8dfd8f668f245d6ab44ad45b67da661b7c2af68c6c42101b722e1
WHIRLPOOL
496a9b2e06e33b0c42726f3b13f859f356f136367c48363cd22b086b72f4f54a32cc057235636f2d2ea3ad7bdd622354ea67df1cbc770be608a84bc861fce93d
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo
b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo
new file mode 100644
index 000..d860127
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo
@@ -0,0 +1,37 @@
+@version: 3.7
+# $Id$
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include scl.conf
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+
+ # The default action of syslog-ng is to log a STATS line
+ # to the file every 10 minutes. That's pretty ugly after a while.
+ # Change it to every 12 hours so you get a nice daily update of
+ # how many messages syslog-ng missed (0).
+ stats_freq(43200);
+ # The default action of syslog-ng is to log a MARK line
+ # to the file every 20 minutes. That's seems high for most
+ # people so turn it down to once an hour. Set it to zero
+ # if you don't want the functionality at all.
+ mark_freq(3600);
+};
+
+source src { system(); internal(); };
+
+destination messages { file(/var/log/messages); };
+
+# By default messages are logged to tty12...
+destination console_all { file(/dev/tty12); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file(/dev/console); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd
b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd
new file mode 100644
index 000..755ced0
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd
@@ -0,0 +1,25 @@
+@version: 3.7
+# $Id$
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include scl.conf
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+
+ # The default action of syslog-ng is to log a STATS line
+ # to the file every 10 minutes. That's pretty ugly after a while.
+ # Change it to every 12 hours so you get a nice daily update of
+ # how many messages syslog-ng missed (0).
+ stats_freq(43200);
