From 6ce000f6671779b475262b56baf3f22907d6fdc9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 28 Feb 2022 13:50:59 -0800 Subject: ufw: Upgrade to 0.36.1 bugfix release Forward port 0002-add-an-option-to-specify-iptables-location.patch Use distutils3, since it still needs it [1] [1] https://git.launchpad.net/ufw/tree/setup.py#n28 Signed-off-by: Khem Raj --- ...dd-an-option-to-specify-iptables-location.patch | 30 +++++----- .../recipes-connectivity/ufw/ufw_0.36.1.bb | 66 +++++++++++++++++++++ .../recipes-connectivity/ufw/ufw_0.36.bb | 68 ---------------------- 3 files changed, 83 insertions(+), 81 deletions(-) create mode 100644 meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb delete mode 100644 meta-networking/recipes-connectivity/ufw/ufw_0.36.bb diff --git a/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch b/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch index 884fa1647e..ee935eb615 100644 --- a/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch +++ b/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch @@ -23,11 +23,9 @@ Signed-off-by: Silcet setup.py | 65 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 28 deletions(-) -diff --git a/setup.py b/setup.py -index 09204d3..2343bc9 100644 --- a/setup.py +++ b/setup.py -@@ -246,41 +246,50 @@ shutil.copytree('src', 'staging') +@@ -245,45 +245,50 @@ shutil.copytree('src', 'staging') os.unlink(os.path.join('staging', 'ufw-init')) os.unlink(os.path.join('staging', 'ufw-init-functions')) @@ -36,7 +34,11 @@ index 09204d3..2343bc9 100644 iptables_dir = '' -for e in ['iptables']: -- for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \ +- # Historically iptables was in /sbin, then later also symlinked from +- # /usr/sbin/iptables to /sbin/iptables. Debian bullseye moves iptables +- # to /usr/sbin with no symlink in /sbin except on upgrades. To accomodate +- # buildds that may still have the old iptables, search /usr/sbin first +- for dir in ['/usr/sbin', '/sbin', '/usr/bin', '/bin', '/usr/local/sbin', \ - '/usr/local/bin']: - if e == "iptables": - if os.path.exists(os.path.join(dir, e)): @@ -49,6 +51,14 @@ index 09204d3..2343bc9 100644 - if iptables_exe != "": - break - +- +-if iptables_exe == '': +- print("ERROR: could not find required binary 'iptables'", file=sys.stderr) +- sys.exit(1) +- +-for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']: +- if not os.path.exists(os.path.join(iptables_dir, e)): +- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr) +if "--iptables-dir" in sys.argv: + iptables_dir = sys.argv[sys.argv.index("--iptables-dir") + 1] + iptables_exe = os.path.join(iptables_dir, "iptables") @@ -59,7 +69,7 @@ index 09204d3..2343bc9 100644 + +if not iptables_set: + for e in ['iptables']: -+ for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \ ++ for dir in ['/usr/sbin', '/sbin', '/usr/bin', '/bin', '/usr/local/sbin', \ + '/usr/local/bin']: + if e == "iptables": + if os.path.exists(os.path.join(dir, e)): @@ -68,16 +78,10 @@ index 09204d3..2343bc9 100644 + print("Found '%s'" % iptables_exe) + else: + continue - --if iptables_exe == '': -- print("ERROR: could not find required binary 'iptables'", file=sys.stderr) -- sys.exit(1) ++ + if iptables_exe != "": + break - --for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']: -- if not os.path.exists(os.path.join(iptables_dir, e)): -- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr) ++ + if iptables_exe == '': + print("ERROR: could not find required binary 'iptables'", file=sys.stderr) sys.exit(1) diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb new file mode 100644 index 0000000000..c6beedf02c --- /dev/null +++ b/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb @@ -0,0 +1,66 @@ + +SUMMARY = "Uncomplicated Firewall" +DESCRIPTION = "UFW stands for Uncomplicated Firewall, and is program for \ +managing a netfilter firewall. It provides a command line interface and aims \ +to be uncomplicated and easy to use." +HOMEPAGE = "https://launchpad.net/ufw" +SECTION = "net" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + +SRC_URI = "https://launchpad.net/ufw/0.36/0.36.1/+download/ufw-0.36.1.tar.gz \ + file://0001-optimize-boot.patch \ + file://0002-add-an-option-to-specify-iptables-location.patch \ + file://0003-only-make-one-reference-to-env.patch \ + " +SRC_URI[sha256sum] = "1c57e78fbf2970f0cc9c56ea87a231e6d83d825e55b9e31e2c88b91b0ea03c8c" + +UPSTREAM_CHECK_URI = "https://launchpad.net/ufw" + +inherit distutils3 features_check systemd update-rc.d + +RDEPENDS:${PN} = " \ + iptables \ + python3 \ + python3-modules \ + " + +RRECOMMENDS:${PN} = " \ + kernel-module-ipv6 \ + kernel-module-nf-conntrack-ipv6 \ + kernel-module-nf-log-common \ + kernel-module-nf-log-ipv4 \ + kernel-module-nf-log-ipv6 \ + kernel-module-nf-addrtype \ + kernel-module-nf-limit \ + kernel-module-nf-log \ + kernel-module-nf-recent \ +" + +do_install:append() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${S}/doc/systemd.example ${D}${systemd_unitdir}/system/ufw.service + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${S}/doc/initscript.example ${D}${sysconfdir}/init.d/ufw +} + +SYSTEMD_SERVICE:${PN} = "ufw.service" + +INITSCRIPT_NAME = "ufw" +INITSCRIPT_PARAMS = "defaults" + +# Certain items are explicitly put under /lib, not base_libdir when installed. +# +FILES:${PN} += " \ + ${sbindir}/* \ + ${datadir}/ufw/* \ + /lib/ufw/* \ + ${sysconfdir}/ufw/* \ + ${sysconfdir}/default/ufw \ +" + +REQUIRED_DISTRO_FEATURES = "ipv6" + +DISTUTILS_BUILD_ARGS:append = " --iptables-dir /usr/sbin" +DISTUTILS_INSTALL_ARGS:append = " --iptables-dir /usr/sbin" diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb deleted file mode 100644 index 40188cea21..0000000000 --- a/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb +++ /dev/null @@ -1,68 +0,0 @@ - -SUMMARY = "Uncomplicated Firewall" -DESCRIPTION = "UFW stands for Uncomplicated Firewall, and is program for \ -managing a netfilter firewall. It provides a command line interface and aims \ -to be uncomplicated and easy to use." -HOMEPAGE = "https://launchpad.net/ufw" -SECTION = "net" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -SRC_URI = "https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz \ - file://0001-optimize-boot.patch \ - file://0002-add-an-option-to-specify-iptables-location.patch \ - file://0003-only-make-one-reference-to-env.patch \ - " - -UPSTREAM_CHECK_URI = "https://launchpad.net/ufw" - -SRC_URI[md5sum] = "6d8ab1506da21ae003f4628f93d05781" -SRC_URI[sha256sum] = "754b22ae5edff0273460ac9f57509c3938187e0cf4fb9692c6a02833fff33cfc" - -inherit setuptools3 features_check systemd update-rc.d - -RDEPENDS:${PN} = " \ - iptables \ - python3 \ - python3-modules \ - " - -RRECOMMENDS:${PN} = " \ - kernel-module-ipv6 \ - kernel-module-nf-conntrack-ipv6 \ - kernel-module-nf-log-common \ - kernel-module-nf-log-ipv4 \ - kernel-module-nf-log-ipv6 \ - kernel-module-nf-addrtype \ - kernel-module-nf-limit \ - kernel-module-nf-log \ - kernel-module-nf-recent \ -" - -do_install:append() { - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${S}/doc/systemd.example ${D}${systemd_unitdir}/system/ufw.service - - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${S}/doc/initscript.example ${D}${sysconfdir}/init.d/ufw -} - -SYSTEMD_SERVICE:${PN} = "ufw.service" - -INITSCRIPT_NAME = "ufw" -INITSCRIPT_PARAMS = "defaults" - -# Certain items are explicitly put under /lib, not base_libdir when installed. -# -FILES:${PN} += " \ - ${sbindir}/* \ - ${datadir}/ufw/* \ - /lib/ufw/* \ - ${sysconfdir}/ufw/* \ - ${sysconfdir}/default/ufw \ -" - -REQUIRED_DISTRO_FEATURES = "ipv6" - -DISTUTILS_BUILD_ARGS:append = " --iptables-dir /usr/sbin" -DISTUTILS_INSTALL_ARGS:append = " --iptables-dir /usr/sbin" -- cgit v1.2.3-54-g00ecf