summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Fan Yu <yifan.yu@windriver.com>2021-04-16 11:36:47 -0400
committerKhem Raj <raj.khem@gmail.com>2021-04-17 07:43:10 -0700
commit01d3f9daa0c320070269e9a27a5c88ba11b08aa7 (patch)
treecde63eb24102dddcd6334db1c5d43eb9ca531b1c
parent5178615b4356c0043309b3f9e37d16396451a67b (diff)
downloadmeta-openembedded-01d3f9daa0c320070269e9a27a5c88ba11b08aa7.tar.gz
syslog-ng: upgrade 3.24.1 -> 3.31.2
License-Update: Reword and clarify which subdir is LGPLv.1 and GPLv2. Patch-Removal: * 0001-syslog-ng-fix-segment-fault-during-service-start.patch https://github.com/buytenh/ivykis/commit/a5e9caddbdb4d9d85133a440edec6aa7c1f018ac Submit pending patches upstream. Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch74
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch30
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/0004-configure.ac-add-libnet-enable-option.patch77
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch53
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch52
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch65
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch25
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/shebang.patch18
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd2
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit2
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng.inc2
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb15
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb17
13 files changed, 214 insertions, 218 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch b/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch
deleted file mode 100644
index b5bfcd025a..0000000000
--- a/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch
+++ /dev/null
@@ -1,74 +0,0 @@
1Subject: [PATCH] syslog-ng: fix segment fault during service start on arm64
2
3service start failed since segment fault on arch arm64,
4syslog-ng have a submodule ivykis, from ivykis V0.42,
5it use pthread_atfork, but for arm64, this symbol is
6not included by libpthread, so cause segment fault.
7
8refer systemd, replace pthread_atfork with __register_atfork
9to fix this problem.
10
11I have create an issue, and this proposal to upstream.
12https://github.com/buytenh/ivykis/issues/15
13
14Upstream-Status: Pending
15
16Signed-off-by: Changqing Li <changqing.li@windriver.com>
17
18Update for 3.24.1.
19Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
20---
21 lib/ivykis/src/pthr.h | 23 ++++++++++++-----------
22 1 file changed, 12 insertions(+), 11 deletions(-)
23
24diff --git a/lib/ivykis/src/pthr.h b/lib/ivykis/src/pthr.h
25index 29e4be7..5d29096 100644
26--- a/lib/ivykis/src/pthr.h
27+++ b/lib/ivykis/src/pthr.h
28@@ -24,6 +24,16 @@
29 #include <pthread.h>
30 #include <signal.h>
31
32+#ifdef __GLIBC__
33+/* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
34+ * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
35+ * libpthread, as it is part of glibc anyway. */
36+extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle);
37+extern void* __dso_handle __attribute__ ((__weak__));
38+#else
39+#define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child)
40+#endif
41+
42 #ifdef HAVE_PRAGMA_WEAK
43 #pragma weak pthread_create
44 #endif
45@@ -36,16 +46,7 @@ static inline int pthreads_available(void)
46
47 #ifdef HAVE_PRAGMA_WEAK
48
49-/*
50- * On Linux, pthread_atfork() is defined in libc_nonshared.a (for
51- * glibc >= 2.28) or libpthread_nonshared.a (for glibc <= 2.27), and
52- * we want to avoid "#pragma weak" for that symbol because that causes
53- * it to be undefined even if you link lib*_nonshared.a in explicitly.
54- */
55-#if !defined(HAVE_LIBC_NONSHARED) && !defined(HAVE_LIBPTHREAD_NONSHARED)
56-#pragma weak pthread_atfork
57-#endif
58-
59+#pragma weak __register_atfork
60 #pragma weak pthread_create
61 #pragma weak pthread_detach
62 #pragma weak pthread_getspecific
63@@ -73,7 +74,7 @@ static inline int
64 pthr_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void))
65 {
66 if (pthreads_available())
67- return pthread_atfork(prepare, parent, child);
68+ return __register_atfork(prepare, parent, child, __dso_handle);
69
70 return ENOSYS;
71 }
72--
732.7.4
74
diff --git a/meta-oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch b/meta-oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch
new file mode 100644
index 0000000000..b2683350bb
--- /dev/null
+++ b/meta-oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch
@@ -0,0 +1,30 @@
1From 7a8c458b7acf4732af74317f8a535077eb451b1e Mon Sep 17 00:00:00 2001
2From: Ming Liu <ming.liu@windriver.com>
3Date: Thu, 17 Jul 2014 05:37:08 -0400
4Subject: [PATCH] scl: fix wrong ownership during installation
5
6The ownership of build user is preserved for some target files, fixed it by
7adding --no-same-owner option to tar when extracting files.
8
9Signed-off-by: Ming Liu <ming.liu@windriver.com>
10
11Upstream-Status: Backport [9045908]
12
13Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
14---
15 scl/Makefile.am | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/scl/Makefile.am b/scl/Makefile.am
19index 940a467..3c19e50 100644
20--- a/scl/Makefile.am
21+++ b/scl/Makefile.am
22@@ -51,7 +51,7 @@ scl-install-data-local:
23 fi; \
24 done
25 $(mkinstalldirs) $(DESTDIR)/$(scldir)
26- (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf -)
27+ (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf - --no-same-owner)
28 chmod -R u+rwX $(DESTDIR)/$(scldir)
29
30 scl-uninstall-local:
diff --git a/meta-oe/recipes-support/syslog-ng/files/0004-configure.ac-add-libnet-enable-option.patch b/meta-oe/recipes-support/syslog-ng/files/0004-configure.ac-add-libnet-enable-option.patch
new file mode 100644
index 0000000000..c9eec65e87
--- /dev/null
+++ b/meta-oe/recipes-support/syslog-ng/files/0004-configure.ac-add-libnet-enable-option.patch
@@ -0,0 +1,77 @@
1From 57b509adfb7c62bbf55ea1709aac3383cab660fa Mon Sep 17 00:00:00 2001
2From: Ming Liu <ming.liu@windriver.com>
3Date: Thu, 17 Jul 2014 05:37:08 -0400
4Subject: [PATCH] configure.ac: add libnet enable option
5
6This would avoid a implicit auto-detecting result
7
8Signed-off-by: Ming Liu <ming.liu@windriver.com>
9Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
10
11Update for 3.24.1.
12Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
13
14Set it to default yes
15
16Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/3650]
17
18Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
19---
20 configure.ac | 35 ++++++++++++++++++++---------------
21 1 file changed, 20 insertions(+), 15 deletions(-)
22
23diff --git a/configure.ac b/configure.ac
24index 7aad75f..d575cba 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -144,6 +144,9 @@ AC_CONFIG_HEADERS(config.h)
28 dnl ***************************************************************************
29 dnl Arguments
30
31+AC_ARG_ENABLE(libnet,
32+ [ --enable-libnet Enable libnet support (default: yes)],, enable_libnet="yes")
33+
34 AC_ARG_WITH(libnet,
35 [ --with-libnet=path use path to libnet-config script],
36 ,
37@@ -1073,23 +1076,25 @@ dnl ***************************************************************************
38 dnl libnet headers/libraries
39 dnl ***************************************************************************
40 AC_MSG_CHECKING(for LIBNET)
41-if test "x$with_libnet" = "x"; then
42- LIBNET_CONFIG="`which libnet-config`"
43-else
44- LIBNET_CONFIG="$with_libnet/libnet-config"
45-fi
46+if test "x$enable_libnet" = xyes; then
47+ if test "x$with_libnet" = "x"; then
48+ LIBNET_CONFIG="`which libnet-config`"
49+ else
50+ LIBNET_CONFIG="$with_libnet/libnet-config"
51+ fi
52
53-if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then
54- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`"
55- LIBNET_LIBS="`$LIBNET_CONFIG --libs`"
56- AC_MSG_RESULT(yes)
57-dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build
58-dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till
59- LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE"
60+ if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then
61+ LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`"
62+ LIBNET_LIBS="`$LIBNET_CONFIG --libs`"
63+ AC_MSG_RESULT(yes)
64+ dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build
65+ dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till
66+ LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE"
67
68-else
69- LIBNET_LIBS=
70- AC_MSG_RESULT(no)
71+ else
72+ LIBNET_LIBS=
73+ AC_MSG_RESULT(no)
74+ fi
75 fi
76
77
diff --git a/meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch b/meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch
new file mode 100644
index 0000000000..a8be7d81d6
--- /dev/null
+++ b/meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch
@@ -0,0 +1,53 @@
1From b64fcc414316592968f181c85447cfd01d1e461e Mon Sep 17 00:00:00 2001
2From: Yi Fan Yu <yifan.yu@windriver.com>
3Date: Thu, 15 Apr 2021 13:48:19 -0400
4Subject: [PATCH] *.py: s/python/python3/ (exclude tests)
5
6As stated by https://github.com/syslog-ng/syslog-ng/pull/3603
7python2 is EOL.
8
9Fix all shebangs calling python instead of python3
10except the tests.
11
12(correcting lib/merge-grammar.py)
13Signed-off-by: Joe Slater <joe.slater@windriver.com>
14(adding the rest)
15Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/3647]
16
17Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
18---
19 contrib/scripts/config-graph-json-to-dot.py | 2 +-
20 lib/merge-grammar.py | 2 +-
21 modules/python/pylib/setup.py | 2 +-
22 3 files changed, 3 insertions(+), 3 deletions(-)
23
24diff --git a/contrib/scripts/config-graph-json-to-dot.py b/contrib/scripts/config-graph-json-to-dot.py
25index 4955c81..0351a9a 100755
26--- a/contrib/scripts/config-graph-json-to-dot.py
27+++ b/contrib/scripts/config-graph-json-to-dot.py
28@@ -1,4 +1,4 @@
29-#!/usr/bin/env python
30+#!/usr/bin/env python3
31 import json, sys
32
33 j = None
34diff --git a/lib/merge-grammar.py b/lib/merge-grammar.py
35index 7313ff5..459712d 100755
36--- a/lib/merge-grammar.py
37+++ b/lib/merge-grammar.py
38@@ -1,4 +1,4 @@
39-#!/usr/bin/env python
40+#!/usr/bin/env python3
41 #############################################################################
42 # Copyright (c) 2010-2017 Balabit
43 #
44diff --git a/modules/python/pylib/setup.py b/modules/python/pylib/setup.py
45index 23bb5cc..a2fa05e 100755
46--- a/modules/python/pylib/setup.py
47+++ b/modules/python/pylib/setup.py
48@@ -1,4 +1,4 @@
49-#!/usr/bin/env python
50+#!/usr/bin/env python3
51 #############################################################################
52 # Copyright (c) 2015-2016 Balabit
53 #
diff --git a/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch b/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch
index 4f8a3d0775..ff35fb157c 100644
--- a/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch
+++ b/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch
@@ -1,30 +1,46 @@
1configure.ac: add option --enable-thread-tls to manage thread ssl support 1From 15a90fd9ac1396015340e599e26d7cd193898fb8 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 12 Aug 2014 14:26:13 +0800
4Subject: [PATCH] configure.ac: add option --enable-thread-tls to manage thread
5 ssl support
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
2 9
10The thread local storage caused arm-gcc broken while compiling │
11syslog-ng with option '-g -O'. │
12... │
13dnscache.s: Assembler messages: │
14dnscache.s:100: Error: invalid operands (.text and *UND* sections) for `-' │
15... │
16 │
3Add option --enable-thread-tls to manage the including of thread 17Add option --enable-thread-tls to manage the including of thread
4local storage, so we could explicitly disable it. 18local storage, so we could explicitly disable it.
5 19
6Upstream-Status: Pending
7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 20Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
21
22change default to 'yes'
23Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/3649]
24
25Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
9--- 26---
10 configure.ac | 17 +++++++++++------ 27 configure.ac | 16 ++++++++++------
11 1 file changed, 11 insertions(+), 6 deletions(-) 28 1 file changed, 10 insertions(+), 6 deletions(-)
12 29
13Index: syslog-ng-3.15.1/configure.ac 30diff --git a/configure.ac b/configure.ac
14=================================================================== 31index 1d67e81..7aad75f 100644
15--- syslog-ng-3.15.1.orig/configure.ac 32--- a/configure.ac
16+++ syslog-ng-3.15.1/configure.ac 33+++ b/configure.ac
17@@ -190,6 +190,9 @@ AC_ARG_ENABLE(gprof, 34@@ -210,6 +210,8 @@ AC_ARG_WITH(sanitizer,
18 AC_ARG_ENABLE(memtrace, 35 [ --with-sanitizer=[address/undefined/etc...]
19 [ --enable-memtrace Enable alternative leak debugging code.]) 36 Enables compiler sanitizer supports (default: no)]
20 37 ,,with_sanitizer="no")
21+AC_ARG_ENABLE(thread-tls, 38+AC_ARG_ENABLE(thread-tls,
22+ [ --enable-thread-tls Enable Thread Local Storage support.],,enable_thread_tls="no") 39+ [ --enable-thread-tls Enable Thread Local Storage support (default: yes)],,enable_thread_tls="yes")
23+ 40
24 AC_ARG_ENABLE(dynamic-linking, 41 AC_ARG_ENABLE(dynamic-linking,
25 [ --enable-dynamic-linking Link everything dynamically.],,enable_dynamic_linking="auto") 42 [ --enable-dynamic-linking Link everything dynamically.],,enable_dynamic_linking="auto")
26 43@@ -628,12 +630,14 @@ dnl ***************************************************************************
27@@ -591,12 +594,14 @@ dnl ***************************************************************************
28 dnl Is the __thread keyword available? 44 dnl Is the __thread keyword available?
29 dnl *************************************************************************** 45 dnl ***************************************************************************
30 46
@@ -34,7 +50,7 @@ Index: syslog-ng-3.15.1/configure.ac
34-]], 50-]],
35-[a=0;])], 51-[a=0;])],
36-[ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Thread Local Storage is supported by the system")]) 52-[ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Thread Local Storage is supported by the system")])
37+if test "x$enable_thread_tls" != "xno"; then 53+if test "x$enable_thread_tls" = "xyes"; then
38+ AC_LINK_IFELSE([AC_LANG_PROGRAM( 54+ AC_LINK_IFELSE([AC_LANG_PROGRAM(
39+ [[#include <pthread.h> 55+ [[#include <pthread.h>
40+ __thread int a; 56+ __thread int a;
diff --git a/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch b/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch
deleted file mode 100644
index 4ad0afa954..0000000000
--- a/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1Subject: [PATCH] add libnet enable option
2
3Upstream-Status: Pending
4
5This would avoid a implicit auto-detecting result.
6
7Signed-off-by: Ming Liu <ming.liu@windriver.com>
8Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
9
10Update for 3.24.1.
11Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
12---
13 configure.ac | 28 ++++++++++++++++------------
14 1 file changed, 16 insertions(+), 12 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 00eb566..e7d5ac1 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -143,6 +143,9 @@ AC_CONFIG_HEADERS(config.h)
21 dnl ***************************************************************************
22 dnl Arguments
23
24+AC_ARG_ENABLE(libnet,
25+ [ --enable-libnet Enable libnet support.],, enable_libnet="no")
26+
27 AC_ARG_WITH(libnet,
28 [ --with-libnet=path use path to libnet-config script],
29 ,
30@@ -1047,19 +1050,20 @@ dnl ***************************************************************************
31 dnl libnet headers/libraries
32 dnl ***************************************************************************
33 AC_MSG_CHECKING(for LIBNET)
34-if test "x$with_libnet" = "x"; then
35- LIBNET_CONFIG="`which libnet-config`"
36-else
37- LIBNET_CONFIG="$with_libnet/libnet-config"
38-fi
39+if test "x$enable_libnet" = xyes; then
40+ if test "x$with_libnet" = "x"; then
41+ LIBNET_CONFIG="`which libnet-config`"
42+ else
43+ LIBNET_CONFIG="$with_libnet/libnet-config"
44+ fi
45
46-if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then
47- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`"
48- LIBNET_LIBS="`$LIBNET_CONFIG --libs`"
49- AC_MSG_RESULT(yes)
50-dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build
51-dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till
52- LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE"
53+ if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then
54+ LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`"
55+ LIBNET_LIBS="`$LIBNET_CONFIG --libs`"
56+ AC_MSG_RESULT(yes)
57+ else
58+ AC_MSG_ERROR([Could not find libnet, and libnet support was explicitly enabled.])
59+ fi
60
61 else
62 LIBNET_LIBS=
63--
642.7.4
65
diff --git a/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch b/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch
deleted file mode 100644
index 54ecce57e3..0000000000
--- a/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1syslog-ng: fix wrong ownership issue
2
3Upstream-Status: Pending
4
5The ownership of build user is preserved for some target files, fixed it by
6adding --no-same-owner option to tar when extracting files.
7
8Signed-off-by: Ming Liu <ming.liu@windriver.com>
9---
10 scl/Makefile.am | 2 +-
11 1 files changed, 1 insertions(+), 1 deletions(-)
12
13Index: syslog-ng-3.8.1/scl/Makefile.am
14===================================================================
15--- syslog-ng-3.8.1.orig/scl/Makefile.am
16+++ syslog-ng-3.8.1/scl/Makefile.am
17@@ -27,7 +27,7 @@ scl-install-data-local:
18 fi; \
19 done
20 $(mkinstalldirs) $(DESTDIR)/$(scldir)
21- (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf -)
22+ (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf - --no-same-owner)
23 chmod -R u+rwX $(DESTDIR)/$(scldir)
24
25 scl-uninstall-local:
diff --git a/meta-oe/recipes-support/syslog-ng/files/shebang.patch b/meta-oe/recipes-support/syslog-ng/files/shebang.patch
deleted file mode 100644
index 35d967753e..0000000000
--- a/meta-oe/recipes-support/syslog-ng/files/shebang.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1syslog-ng: change shebang to use python3
2
3Correct shebang for python3. This is far from the only python file with an out of date shebang,
4but it is the only one that winds up on a target.
5
6Upstream-Status: Pending
7
8Signed-off-by: Joe Slater <joe.slater@windriver.com>
9
10
11--- a/lib/merge-grammar.py
12+++ b/lib/merge-grammar.py
13@@ -1,4 +1,4 @@
14-#!/usr/bin/env python
15+#!/usr/bin/env python3
16 #############################################################################
17 # Copyright (c) 2010-2017 Balabit
18 #
diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd
index 6a86276724..b63f46ddc3 100644
--- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd
+++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd
@@ -1,4 +1,4 @@
1@version: 3.24 1@version: 3.31
2# 2#
3# Syslog-ng configuration file, compatible with default Debian syslogd 3# Syslog-ng configuration file, compatible with default Debian syslogd
4# installation. Originally written by anonymous (I can't find his name) 4# installation. Originally written by anonymous (I can't find his name)
diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit
index 32b98610dc..07cd3b0868 100644
--- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit
+++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit
@@ -1,4 +1,4 @@
1@version: 3.24 1@version: 3.31
2# 2#
3# Syslog-ng configuration file, compatible with default Debian syslogd 3# Syslog-ng configuration file, compatible with default Debian syslogd
4# installation. Originally written by anonymous (I can't find his name) 4# installation. Originally written by anonymous (I can't find his name)
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 818cad5bcd..ebb3eaf0fc 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -10,7 +10,7 @@ ideal for firewalled environments. \
10HOMEPAGE = "http://www.balabit.com/network-security/syslog-ng/opensource-logging-system" 10HOMEPAGE = "http://www.balabit.com/network-security/syslog-ng/opensource-logging-system"
11 11
12LICENSE = "GPLv2 & LGPLv2.1" 12LICENSE = "GPLv2 & LGPLv2.1"
13LIC_FILES_CHKSUM = "file://COPYING;md5=24c0c5cb2c83d9f2ab725481e4df5240" 13LIC_FILES_CHKSUM = "file://COPYING;md5=189c3826d32deaf83ad8d0d538a10023"
14 14
15# util-linux added to get libuuid 15# util-linux added to get libuuid
16DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native" 16DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native"
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb
deleted file mode 100644
index 10bf00fdce..0000000000
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1require syslog-ng.inc
2
3# We only want to add stuff we need to the defaults provided in syslog-ng.inc.
4#
5SRC_URI += " \
6 file://fix-config-libnet.patch \
7 file://fix-invalid-ownership.patch \
8 file://syslog-ng.service-the-syslog-ng-service.patch \
9 file://0001-syslog-ng-fix-segment-fault-during-service-start.patch \
10 file://shebang.patch \
11 file://syslog-ng-tmp.conf \
12 "
13
14SRC_URI[md5sum] = "ef9de066793f7358af7312b964ac0450"
15SRC_URI[sha256sum] = "d4d0a0357b452be96b69d6f741129275530d8f0451e35adc408ad5635059fa3d"
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb
new file mode 100644
index 0000000000..cbd218c95b
--- /dev/null
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb
@@ -0,0 +1,17 @@
1require syslog-ng.inc
2
3# We only want to add stuff we need to the defaults provided in syslog-ng.inc.
4#
5SRC_URI += "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \
6 file://syslog-ng.conf.systemd \
7 file://syslog-ng.conf.sysvinit \
8 file://initscript \
9 file://volatiles.03_syslog-ng \
10 file://syslog-ng-tmp.conf \
11 file://syslog-ng.service-the-syslog-ng-service.patch \
12 file://0002-scl-fix-wrong-ownership-during-installation.patch \
13 file://0004-configure.ac-add-libnet-enable-option.patch \
14 file://0005-.py-s-python-python3-exclude-tests.patch \
15 "
16SRC_URI[md5sum] = "69ef4dc5628d5e603e9e4a1b937592f8"
17SRC_URI[sha256sum] = "2eeb8e0dbbcb556fdd4e50bc9f29bc8c66c9b153026f87caa7567bd3139c186a"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-04 09:16:49 +0000