diff options
| author |   Jate Sujjavanich <jatedev@gmail.com> | 2021-07-23 04:17:24 +0000 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2021-07-24 10:48:10 -0700 |
| commit | da09c4c74344a339dfda670650381e6cf219bed7 (patch) | |
| tree | d87e9dbe9c3162a836f2e03fd346e6fbfeb8402e /meta-networking/recipes-connectivity/ufw/ufw/0008-support-.-setup.py-build-LP-819600.patch | |
| parent | 5eff5262e3890ccef11f9fa4bbc81963c0889da2 (diff) | |
| download | meta-openembedded-da09c4c74344a339dfda670650381e6cf219bed7.tar.gz | |
ufw: backport patches, update RRECOMMENDS, python3 support, tests
Backport patches:
using conntrack instead of state eliminating warning
support setup.py build (python 3)
adjust runtime tests to use daytime port (netbase changes)
empty out IPT_MODULES (nf conntrack warning)
check-requirements patch for python 3.8
Update, add patches for python 3 interpreter
Add ufw-test package. Backport fixes for check-requirements script
Update kernel RRECOMMENDS for linux-yocto 5.4 in dunfell
For dunfell
Signed-off-by: Jate Sujjavanich <jatedev@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/ufw/ufw/0008-support-.-setup.py-build-LP-819600.patch')
| -rw-r--r-- | meta-networking/recipes-connectivity/ufw/ufw/0008-support-.-setup.py-build-LP-819600.patch | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/ufw/ufw/0008-support-.-setup.py-build-LP-819600.patch b/meta-networking/recipes-connectivity/ufw/ufw/0008-support-.-setup.py-build-LP-819600.patch new file mode 100644 index 0000000000..4184e33f41 --- /dev/null +++ b/meta-networking/recipes-connectivity/ufw/ufw/0008-support-.-setup.py-build-LP-819600.patch @@ -0,0 +1,93 @@ +support ./setup.py build (LP: #819600) + +Written by Jamie Strandboge <jamie@canonical.com> + +The patch was imported from git://git.launchpad.net/ufw +commit id 10dc74cdc0948e4038d2921e7428cbf2896df98c + +Removed ChangeLog patch due to backport status of this patch. +Modified for statement to match the one in 0.33 setup.py + +Upstream-Status: Backport +Signed-off-by: Jate Sujjavanich <jatedev@gmail.com> + +diff --git a/setup.py b/setup.py +index 730c568..4e1ec9a 100644 +--- a/setup.py ++++ b/setup.py +@@ -64,37 +64,44 @@ class Install(_install, object): + real_sharedir = os.path.join(real_prefix, 'share', 'ufw') + + # Update the modules' paths +- for file in [ 'common.py', 'util.py' ]: +- print("Updating " + file) +- subprocess.call(["sed", +- "-i", +- "s%#CONFIG_PREFIX#%" + real_confdir + "%g", +- os.path.join('staging', file)]) +- +- subprocess.call(["sed", +- "-i", +- "s%#STATE_PREFIX#%" + real_statedir + "%g", +- os.path.join('staging', file)]) +- +- subprocess.call(["sed", +- "-i", +- "s%#PREFIX#%" + real_prefix + "%g", +- os.path.join('staging', file)]) +- +- subprocess.call(["sed", +- "-i", +- "s%#IPTABLES_DIR#%" + iptables_dir + "%g", +- os.path.join('staging', file)]) +- +- subprocess.call(["sed", +- "-i", +- "s%#SHARE_DIR#%" + real_sharedir + "%g", +- os.path.join('staging', file)]) +- +- subprocess.call(["sed", +- "-i.jjm", +- "s%/sbin/iptables%" + iptables_exe + "%g", +- os.path.join('staging', file)]) ++ for fn in [ 'common.py', 'util.py' ]: ++ # 'staging' is used with just 'install' but build_lib is used when ++ # using 'build'. We could probably override 'def build()' but this ++ # at least works ++ for d in [os.path.join(self.build_lib, "ufw"), 'staging']: ++ f = os.path.join(d, fn) ++ if not os.path.exists(f): ++ continue ++ print("Updating " + f) ++ subprocess.call(["sed", ++ "-i", ++ "s%#CONFIG_PREFIX#%" + real_confdir + "%g", ++ f]) ++ ++ subprocess.call(["sed", ++ "-i", ++ "s%#STATE_PREFIX#%" + real_statedir + "%g", ++ f]) ++ ++ subprocess.call(["sed", ++ "-i", ++ "s%#PREFIX#%" + real_prefix + "%g", ++ f]) ++ ++ subprocess.call(["sed", ++ "-i", ++ "s%#IPTABLES_DIR#%" + iptables_dir + "%g", ++ f]) ++ ++ subprocess.call(["sed", ++ "-i", ++ "s%#SHARE_DIR#%" + real_sharedir + "%g", ++ f]) ++ ++ subprocess.call(["sed", ++ "-i.jjm", ++ "s%/sbin/iptables%" + iptables_exe + "%g", ++ f]) + + # Now byte-compile everything + super(Install, self).run() |