diff options
author | Yi Fan Yu <yifan.yu@windriver.com> | 2021-04-16 11:36:47 -0400 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-04-17 07:43:10 -0700 |
commit | 01d3f9daa0c320070269e9a27a5c88ba11b08aa7 (patch) | |
tree | cde63eb24102dddcd6334db1c5d43eb9ca531b1c /meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch | |
parent | 5178615b4356c0043309b3f9e37d16396451a67b (diff) | |
download | meta-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 (limited to 'meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch')
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch | 53 |
1 files changed, 53 insertions, 0 deletions
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 @@ | |||
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 | # | ||