From 5194af1afd6b1e834af52e9b38d5ae6e19c637b0 Mon Sep 17 00:00:00 2001
From: Silcet <camorga1@gmail.com>
Date: Fri, 23 Apr 2021 16:28:02 +0200
Subject: [PATCH] ufw: fix python shebang

[meta-openembedded ticket #327] --
https://github.com/openembedded/meta-openembedded/issues/327

The python version in the shebang at the begining of the ufw script
should be the same one as the version the setup.py script was called
with.

The fix in patch "setup-only-make-one-reference-to-env.patch"
depends on sys.executable returning "/usr/bin/env pythonX". However,
it returns "/usr/bin/pythonX". Using sys.version_info we can get the
major version of the python used to called the script and append
that to the shebang line so it works as intended.

Signed-off-by: Silcet <camorga1@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...fix-dynamic-update-of-python-shebang.patch | 57 +++++++++++++++++++
 .../recipes-connectivity/ufw/ufw_0.33.bb      |  1 +
 2 files changed, 58 insertions(+)
 create mode 100644 meta-networking/recipes-connectivity/ufw/ufw/fix-dynamic-update-of-python-shebang.patch

diff --git a/meta-networking/recipes-connectivity/ufw/ufw/fix-dynamic-update-of-python-shebang.patch b/meta-networking/recipes-connectivity/ufw/ufw/fix-dynamic-update-of-python-shebang.patch
new file mode 100644
index 00000000000..0bb0315ccdf
--- /dev/null
+++ b/meta-networking/recipes-connectivity/ufw/ufw/fix-dynamic-update-of-python-shebang.patch
@@ -0,0 +1,57 @@
+From b961a7fceb5654c283c3f987bee593d52abaf1f5 Mon Sep 17 00:00:00 2001
+From: Silcet <camorga1@gmail.com>
+Date: Mon, 26 Apr 2021 07:47:02 +0000
+Subject: [PATCH] ufw: Fix dynamic update of python shebang
+
+[meta-openembedded ticket #327] -- https://github.com/openembedded/meta-openembedded/issues/327
+
+The python version in the shebang at the begining of the ufw script
+should be the same one as the version the setup.py script was called
+with.
+
+The fix in patch "setup-only-make-one-reference-to-env.patch"
+depends on sys.executable returning "/usr/bin/env pythonX". However,
+it returns "/usr/bin/pythonX". Using sys.version_info we can get the
+major version of the python used to called the script and append
+that to the shebang line so it works as intended.
+
+Upstream-status: Pending
+
+Signed-off-by: Silcet <camorga1@gmail.com>
+---
+ setup.py | 21 ++++++---------------
+ 1 file changed, 6 insertions(+), 15 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index ca730b7..941bbf6 100644
+--- a/setup.py
++++ b/setup.py
+@@ -112,22 +112,13 @@ class Install(_install, object):
+         for f in [ script, manpage, manpage_f ]:
+             self.mkpath(os.path.dirname(f))
+ 
+-        # if sys.executable == /usr/bin/env python* the result will be the top
+-        # of ufw getting:
+-        #
+-        #  #! /usr/bin/env /usr/bin/env python
+-        #
+-        # which is not ideal
+-        #
+         # update the interpreter to that of the one the user specified for setup
+-        print("Updating staging/ufw to use (%s)" % (sys.executable))
+-
+-        if re.search("(/usr/bin/env)", sys.executable):
+-            print("found 'env' in sys.executable (%s)" % (sys.executable))
+-            subprocess.call(["sed",
+-                             "-i.jjm",
+-                             "1s%^#.*python.*%#! " + sys.executable + "%g",
+-                             'staging/ufw'])
++        python_major = sys.version_info.major
++        print("Updating staging/ufw to use (python%s)" % (python_major))
++        subprocess.call(["sed",
++                         "-i.jjm",
++                         "1s%^#.*python.*%#! " + sys.executable + "%g",
++                         'staging/ufw'])
+ 
+         self.copy_file('staging/ufw', script)
+         self.copy_file('doc/ufw.8', manpage)
diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb
index 42fc262589e..ee366aa6650 100644
--- a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb
+++ b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb
@@ -16,6 +16,7 @@ SRC_URI = " \
            file://0003-fix-typeerror-on-error.patch \
            file://0004-lp1039729.patch \
            file://0005-lp1191197.patch \
+           file://fix-dynamic-update-of-python-shebang.patch \
 "
 
 UPSTREAM_CHECK_URI = "https://launchpad.net/ufw"