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 buytenh/ivykis@a5e9cad Submit pending patches upstream. Signed-off-by: Yi Fan Yu <[email protected]> Signed-off-by: Khem Raj <[email protected]>
YoeDistro · Apr 16, 2021 · f3d2000 · f3d2000
1 parent 107f5d6
commit f3d2000
Show file tree

Hide file tree

Showing 13 changed files with 214 additions and 218 deletions.
diff --git a/...cipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch b/...cipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch
diff --git a/...oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch b/...oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch
@@ -0,0 +1,30 @@
+From 7a8c458b7acf4732af74317f8a535077eb451b1e Mon Sep 17 00:00:00 2001
+From: Ming Liu <[email protected]>
+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 <[email protected]>
+
+Upstream-Status: Backport [9045908]
+
+Signed-off-by: Yi Fan Yu <[email protected]>
+---
+ 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:
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
@@ -0,0 +1,77 @@
+From 57b509adfb7c62bbf55ea1709aac3383cab660fa Mon Sep 17 00:00:00 2001
+From: Ming Liu <[email protected]>
+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 <[email protected]>
+Signed-off-by: Jackie Huang <[email protected]>
+
+Update for 3.24.1.
+Signed-off-by: Zheng Ruoqin <[email protected]>
+
+Set it to default yes
+
+Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/3650]
+
+Signed-off-by: Yi Fan Yu <[email protected]>
+---
+ 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
+
+
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
@@ -0,0 +1,53 @@
+From b64fcc414316592968f181c85447cfd01d1e461e Mon Sep 17 00:00:00 2001
+From: Yi Fan Yu <[email protected]>
+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 <[email protected]>
+(adding the rest)
+Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/3647]
+
+Signed-off-by: Yi Fan Yu <[email protected]>
+---
+ 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
+ #
diff --git a/...ecipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch b/...ecipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch
@@ -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 <[email protected]>
+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
 local storage, so we could explicitly disable it.
 
-Upstream-Status: Pending
-
 Signed-off-by: Hongxu Jia <[email protected]>
+
+change default to 'yes'
+Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/3649]
+
+Signed-off-by: Yi Fan Yu <[email protected]>
 ---
- configure.ac | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
+ configure.ac | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
 
-Index: syslog-ng-3.15.1/configure.ac
-===================================================================
---- syslog-ng-3.15.1.orig/configure.ac
-+++ syslog-ng-3.15.1/configure.ac
-@@ -190,6 +190,9 @@ AC_ARG_ENABLE(gprof,
- AC_ARG_ENABLE(memtrace,
-               [  --enable-memtrace   Enable alternative leak debugging code.])
-
+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,
-+              [  --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,
                [  --enable-dynamic-linking        Link everything dynamically.],,enable_dynamic_linking="auto")
-
-@@ -591,12 +594,14 @@ dnl ***************************************************************************
+@@ -628,12 +630,14 @@ dnl ***************************************************************************
  dnl Is the __thread keyword available?
  dnl ***************************************************************************
 
@@ -34,7 +50,7 @@ Index: syslog-ng-3.15.1/configure.ac
 -]],
 -[a=0;])],
 -[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(
 +    [[#include <pthread.h>
 +    __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