diff options
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch | 53 | ||||
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng_3.36.1.bb (renamed from meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb) | 5 |
3 files changed, 1 insertions, 87 deletions
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 deleted file mode 100644 index b2683350b..000000000 --- a/meta-oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 7a8c458b7acf4732af74317f8a535077eb451b1e Mon Sep 17 00:00:00 2001 | ||
2 | From: Ming Liu <ming.liu@windriver.com> | ||
3 | Date: Thu, 17 Jul 2014 05:37:08 -0400 | ||
4 | Subject: [PATCH] scl: fix wrong ownership during installation | ||
5 | |||
6 | The ownership of build user is preserved for some target files, fixed it by | ||
7 | adding --no-same-owner option to tar when extracting files. | ||
8 | |||
9 | Signed-off-by: Ming Liu <ming.liu@windriver.com> | ||
10 | |||
11 | Upstream-Status: Backport [9045908] | ||
12 | |||
13 | Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | ||
14 | --- | ||
15 | scl/Makefile.am | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/scl/Makefile.am b/scl/Makefile.am | ||
19 | index 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/0005-.py-s-python-python3-exclude-tests.patch b/meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch deleted file mode 100644 index a8be7d81d..000000000 --- a/meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | From b64fcc414316592968f181c85447cfd01d1e461e Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Fan Yu <yifan.yu@windriver.com> | ||
3 | Date: Thu, 15 Apr 2021 13:48:19 -0400 | ||
4 | Subject: [PATCH] *.py: s/python/python3/ (exclude tests) | ||
5 | |||
6 | As stated by https://github.com/syslog-ng/syslog-ng/pull/3603 | ||
7 | python2 is EOL. | ||
8 | |||
9 | Fix all shebangs calling python instead of python3 | ||
10 | except the tests. | ||
11 | |||
12 | (correcting lib/merge-grammar.py) | ||
13 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
14 | (adding the rest) | ||
15 | Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/3647] | ||
16 | |||
17 | Signed-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 | |||
24 | diff --git a/contrib/scripts/config-graph-json-to-dot.py b/contrib/scripts/config-graph-json-to-dot.py | ||
25 | index 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 | ||
34 | diff --git a/lib/merge-grammar.py b/lib/merge-grammar.py | ||
35 | index 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 | # | ||
44 | diff --git a/modules/python/pylib/setup.py b/modules/python/pylib/setup.py | ||
45 | index 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/syslog-ng_3.31.2.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.36.1.bb index 92b66e9ce..40bbfe495 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.36.1.bb | |||
@@ -22,12 +22,9 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta | |||
22 | file://volatiles.03_syslog-ng \ | 22 | file://volatiles.03_syslog-ng \ |
23 | file://syslog-ng-tmp.conf \ | 23 | file://syslog-ng-tmp.conf \ |
24 | file://syslog-ng.service-the-syslog-ng-service.patch \ | 24 | file://syslog-ng.service-the-syslog-ng-service.patch \ |
25 | file://0002-scl-fix-wrong-ownership-during-installation.patch \ | ||
26 | file://0005-.py-s-python-python3-exclude-tests.patch \ | ||
27 | " | 25 | " |
28 | 26 | ||
29 | SRC_URI[md5sum] = "69ef4dc5628d5e603e9e4a1b937592f8" | 27 | SRC_URI[sha256sum] = "90a25c9767fe749db50f118ddfc92ec71399763d2ecd5ad4f11ff5eea049e60b" |
30 | SRC_URI[sha256sum] = "2eeb8e0dbbcb556fdd4e50bc9f29bc8c66c9b153026f87caa7567bd3139c186a" | ||
31 | 28 | ||
32 | UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" | 29 | UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" |
33 | 30 | ||