mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-02 13:59:59 +00:00
Code Issues Projects Releases Wiki Activity

syslog-ng: update from 3.31.2 to 3.26.1

Browse Source 
Drop two patches that are upstream now:
   90459087f scl: fix wrong ownership during installation
   c1054d3f6 python: s/python/python3/ shebang (exclude tests)

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Randy MacLeod
2022-03-20 18:21:36 -07:00
committed by Khem Raj
parent 04e87edf6d
commit 11fa965565
3 changed files with 1 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch
-30
View File
@@ -1,30 +0,0 @@
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:
meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch
-53
View File
@@ -1,53 +0,0 @@
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
#
meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb → meta-oe/recipes-support/syslog-ng/syslog-ng_3.36.1.bb
+1 -4
View File
@@ -22,12 +22,9 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta
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://0005-.py-s-python-python3-exclude-tests.patch \
"
SRC_URI[md5sum] = "69ef4dc5628d5e603e9e4a1b937592f8"
SRC_URI[sha256sum] = "2eeb8e0dbbcb556fdd4e50bc9f29bc8c66c9b153026f87caa7567bd3139c186a"
SRC_URI[sha256sum] = "90a25c9767fe749db50f118ddfc92ec71399763d2ecd5ad4f11ff5eea049e60b"
UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases"