* [gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/, app-admin/syslog-ng/files/patches/
@ 2017-12-20 20:44 Thomas Deutschmann
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2017-12-20 20:44 UTC (permalink / raw
To: gentoo-commits
commit: d03a886fc569f7025ff7d97b7975c5af817ad963
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Dec 19 15:30:41 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 20:44:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d03a886f
app-admin/syslog-ng: fix building with dev-libs/json-c-0.13
Closes: https://bugs.gentoo.org/641688
Package-Manager: Portage-2.3.18, Repoman-2.3.6
.../patches/syslog-ng-3.12.1-json-c-0.13+.patch | 33 ++++++++++++++++++++++
...ng-3.12.1-r1.ebuild => syslog-ng-3.12.1.ebuild} | 7 ++++-
...ng-3.13.2-r1.ebuild => syslog-ng-3.13.2.ebuild} | 7 ++++-
3 files changed, 45 insertions(+), 2 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
new file mode 100644
index 00000000000..3703bec22ba
--- /dev/null
+++ b/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch
@@ -0,0 +1,33 @@
+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 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 <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
+ {
diff --git a/app-admin/syslog-ng/syslog-ng-3.12.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
similarity index 98%
rename from app-admin/syslog-ng/syslog-ng-3.12.1-r1.ebuild
rename to app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
index 55136f58ec4..b608df78696 100644
--- a/app-admin/syslog-ng/syslog-ng-3.12.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
@@ -43,6 +43,10 @@ DEPEND="${RDEPEND}
sys-devel/flex
virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/patches/${PN}-3.12.1-json-c-0.13+.patch
+)
+
S=${WORKDIR}/${PN}-${MY_PV}
pkg_setup() {
@@ -59,7 +63,6 @@ src_prepare() {
if use !json ; then
sed -i -e '/cim/d' scl/Makefile.am || die
- eautoreconf
fi
for f in "${FILESDIR}"/*logrotate*.in ; do
@@ -73,6 +76,8 @@ src_prepare() {
done
default
+
+ eautoreconf
}
src_configure() {
diff --git a/app-admin/syslog-ng/syslog-ng-3.13.2-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
similarity index 98%
rename from app-admin/syslog-ng/syslog-ng-3.13.2-r1.ebuild
rename to app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
index 2f5ba1e3a39..ddb99e5c2c8 100644
--- a/app-admin/syslog-ng/syslog-ng-3.13.2-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
@@ -43,6 +43,10 @@ DEPEND="${RDEPEND}
sys-devel/flex
virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/patches/${PN}-3.12.1-json-c-0.13+.patch
+)
+
S=${WORKDIR}/${PN}-${MY_PV}
pkg_setup() {
@@ -60,7 +64,6 @@ src_prepare() {
# drop scl modules requiring json
if use !json; then
sed -i -r '/cim|ewmm|graylog2/d' scl/Makefile.am || die
- eautoreconf
fi
# use gentoo default path
@@ -80,6 +83,8 @@ src_prepare() {
done
default
+
+ eautoreconf
}
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/, app-admin/syslog-ng/files/patches/
@ 2018-04-05 15:30 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2018-04-05 15:30 UTC (permalink / raw
To: gentoo-commits
commit: 76d838e3390e16b369c4638d5c3828b559a34ec5
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Apr 3 11:54:31 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Apr 5 15:30:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76d838e3
app-admin/syslog-ng: fix building with automake 1.16.
Closes: https://bugs.gentoo.org/650172
Package-Manager: Portage-2.3.26, Repoman-2.3.7
Closes: https://github.com/gentoo/gentoo/pull/7789
.../syslog-ng-3.14.1-fix-automake-1.16-build.patch | 23 ++++++++++++++++++++++
app-admin/syslog-ng/syslog-ng-3.14.1.ebuild | 1 +
2 files changed, 24 insertions(+)
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
new file mode 100644
index 00000000000..4339612f58c
--- /dev/null
+++ b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch
@@ -0,0 +1,23 @@
+From 41dd64e7b11d527f8f3cc6ae13067d0225191538 Mon Sep 17 00:00:00 2001
+From: kokan <peter.kokai@balabit.com>
+Date: Sat, 31 Mar 2018 15:36:08 +0200
+Subject: [PATCH] libsyslog-ng: missing dependency libsecret-storage
+
+Signed-off-by: kokan <peter.kokai@balabit.com>
+---
+ 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/syslog-ng-3.14.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
index 72d1d861d3a..cde6394672d 100644
--- a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
@@ -45,6 +45,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/patches/${PN}-3.14.1-fix-tls-client.patch"
+ "${FILESDIR}/patches/${PN}-3.14.1-fix-automake-1.16-build.patch"
)
DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/, app-admin/syslog-ng/files/patches/
@ 2019-09-20 16:18 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2019-09-20 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 1096ec7003531d803fc88fe60abc4f6e6368dffa
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Sep 20 13:10:20 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 15:42:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1096ec70
app-admin/syslog-ng: fix daemon crashes on x86
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://bugs.gentoo.org/695176
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../patches/syslog-ng-3.23.1-fix-sigabrt.patch | 72 ++++++++++++++++++++++
...ng-3.23.1.ebuild => syslog-ng-3.23.1-r1.ebuild} | 3 +
2 files changed, 75 insertions(+)
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
new file mode 100644
index 00000000000..6d27e88abf7
--- /dev/null
+++ b/app-admin/syslog-ng/files/patches/syslog-ng-3.23.1-fix-sigabrt.patch
@@ -0,0 +1,72 @@
+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(&self->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(&self->window_size, NULL) == -1)
+- {
+- window_size_counter_set(&self->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(&self->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(&self->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.ebuild b/app-admin/syslog-ng/syslog-ng-3.23.1-r1.ebuild
similarity index 98%
rename from app-admin/syslog-ng/syslog-ng-3.23.1.ebuild
rename to app-admin/syslog-ng/syslog-ng-3.23.1-r1.ebuild
index 3cb8ad6b096..bc13ee0fdc7 100644
--- a/app-admin/syslog-ng/syslog-ng-3.23.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.23.1-r1.ebuild
@@ -51,6 +51,9 @@ DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunO
contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+# bug #695176
+PATCHES=( "${FILESDIR}/patches/${PN}-3.23.1-fix-sigabrt.patch" )
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-09-20 16:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-20 20:44 [gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-ng/, app-admin/syslog-ng/files/patches/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2018-04-05 15:30 Patrice Clement
2019-09-20 16:18 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox