[Buildroot] [git commit] package/firewalld: bump to v2.4.3

Thomas Petazzoni via buildroot <[email protected]>
Newsgroups net.busybox.buildroot
Message-ID <[email protected]>
commit: https://gitlab.com/buildroot.org/buildroot/-/commit/380dd8a348dc7c5edf2b187245b8d4e70a3d96c2
branch: https://gitlab.com/buildroot.org/buildroot/-/tree/master

- Switch to release tarball using GitHub generated checksum
- Drop backported patch

Signed-off-by: Joachim Wiberg <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
---
 ...-functions-don-t-use-deprecated-pipes.quo.patch | 42 ----------------------
 package/firewalld/firewalld.hash                   |  3 +-
 package/firewalld/firewalld.mk                     |  6 ++--
 3 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/package/firewalld/0001-improvement-functions-don-t-use-deprecated-pipes.quo.patch b/package/firewalld/0001-improvement-functions-don-t-use-deprecated-pipes.quo.patch
deleted file mode 100644
index 0deacbcca0..0000000000
--- a/package/firewalld/0001-improvement-functions-don-t-use-deprecated-pipes.quo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0bfa4eb3e15d8df8a68a8c3429505905afae112e Mon Sep 17 00:00:00 2001
-From: Thomas Haller <[email protected]>
-Date: Fri, 7 Jul 2023 18:13:10 +0200
-Subject: [PATCH] improvement(functions): don't use deprecated pipes.quote()
-
-Since Python 3.3, shlex.quote() replaces it. This avoids a deprecation
-warning.
-
-Upstream: f7f5613b76c044c62c876ae87c6b85f5a41acb2a
-[Romain: backport to 2.0.2]
-Signed-off-by: Romain Naour <[email protected]>
----
- src/firewall/functions.py | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/firewall/functions.py b/src/firewall/functions.py
-index f7133d71..6213e778 100644
---- a/src/firewall/functions.py
-+++ b/src/firewall/functions.py
-@@ -34,7 +34,6 @@ import socket
- import os
- import os.path
- import shlex
--import pipes
- import string
- import tempfile
- from firewall.core.logger import log
-@@ -607,10 +606,7 @@ def checkContext(context):
-     return True
- 
- def joinArgs(args):
--    if "quote" in dir(shlex):
--        return " ".join(shlex.quote(a) for a in args)
--    else:
--        return " ".join(pipes.quote(a) for a in args)
-+    return " ".join(shlex.quote(a) for a in args)
- 
- def splitArgs(_string):
-     return shlex.split(_string)
--- 
-2.51.0
-
diff --git a/package/firewalld/firewalld.hash b/package/firewalld/firewalld.hash
index cbd4c7685b..48d80b1b87 100644
--- a/package/firewalld/firewalld.hash
+++ b/package/firewalld/firewalld.hash
@@ -1,3 +1,4 @@
+# Hash generated by GitHub https://github.com/firewalld/firewalld/releases
+sha256  d441705746cf3d0a5efaad58b1b1193a23c58114162d81a9a0f4fe0c58ee43cf  firewalld-2.4.3.tar.bz2
 # Locally computed
-sha256  1433247299367f707279d50e0759ed27fbcc9bb973b7b2131e8cee96e006d96e  firewalld-2.0.2.tar.gz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/package/firewalld/firewalld.mk b/package/firewalld/firewalld.mk
index eae8afc27f..c443ab3db4 100644
--- a/package/firewalld/firewalld.mk
+++ b/package/firewalld/firewalld.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-FIREWALLD_VERSION = 2.0.2
-FIREWALLD_SITE = $(call github,firewalld,firewalld,v$(FIREWALLD_VERSION))
+FIREWALLD_VERSION = 2.4.3
+FIREWALLD_SITE = https://github.com/firewalld/firewalld/releases/download/v$(FIREWALLD_VERSION)
+FIREWALLD_SOURCE = firewalld-$(FIREWALLD_VERSION).tar.bz2
 FIREWALLD_LICENSE = GPL-2.0
 FIREWALLD_LICENSE_FILES = COPYING
 FIREWALLD_CPE_ID_VENDOR = firewalld
-FIREWALLD_AUTORECONF = YES
 
 FIREWALLD_DEPENDENCIES = \
 	host-intltool \
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.