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