diff mbox series

ifupdown: bump to 0.8.41

Message ID 20230223104048.333575-1-martin@geanix.com
State Changes Requested
Headers show
Series ifupdown: bump to 0.8.41 | expand

Commit Message

Martin Hundebøll Feb. 23, 2023, 10:40 a.m. UTC 
From: Martin Hundeboll <martin@geanix.com>

Musl is not supported since June 2017, where use of fnmatch() was
introduced to support wildcard matching on interfaces.

Signed-off-by: Martin Hundebøll <martin@geanix.com>
---
 package/ifupdown/Config.in     | 1 +
 package/ifupdown/ifupdown.hash | 4 ++--
 package/ifupdown/ifupdown.mk   | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

Comments

Thomas Petazzoni March 12, 2023, 9:43 p.m. UTC | #1 
Hello Martin,

Thanks for this contribution!

On Thu, 23 Feb 2023 11:40:48 +0100
Martin Hundebøll <martin@geanix.com> wrote:

> From: Martin Hundeboll <martin@geanix.com>
> 
> Musl is not supported since June 2017, where use of fnmatch() was
> introduced to support wildcard matching on interfaces.
> 
> Signed-off-by: Martin Hundebøll <martin@geanix.com>

I find it a bit annoying to disable a package as simple/core as
ifupdown with musl.

Alpine Linux has two patches at
https://git.alpinelinux.org/aports/tree/main/ifupdown?h=master that
address the build issue by disabling the use of FNM_EXTMATCH with musl.
Since this only adds additional wildcard matching capabilities, it
works fine without.

Perhaps ifupdown should simply be improved to use FNM_EXTMATCH if
supported?

In any case, if we want to indeed add the !musl dependency like your
patch does, the Config.in comment needs to be adjusted to account for
the !musl dependency.

Best regards,

Thomas
diff mbox series

Patch

diff --git a/package/ifupdown/Config.in b/package/ifupdown/Config.in
index 97d02b4c37..999a2e7e0c 100644
--- a/package/ifupdown/Config.in
+++ b/package/ifupdown/Config.in
@@ -2,6 +2,7 @@  config BR2_PACKAGE_IFUPDOWN
 	bool "ifupdown"
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2
+	depends on !BR2_TOOLCHAIN_USES_MUSL # missing FNM_EXTMATCH define
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	# runtime for ip binary
 	select BR2_PACKAGE_IPROUTE2 if !BR2_PACKAGE_BUSYBOX
diff --git a/package/ifupdown/ifupdown.hash b/package/ifupdown/ifupdown.hash
index f8844a60a6..f5c2d2d34c 100644
--- a/package/ifupdown/ifupdown.hash
+++ b/package/ifupdown/ifupdown.hash
@@ -1,4 +1,4 @@ 
-# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.16.dsc
-sha256  601416c12e39ac29022951a2867aed5c607f732ac57fd51517bfba92a4cc4fb0  ifupdown_0.8.16.tar.xz
+# From http://snapshot.debian.org/archive/debian/20230222T205615Z/pool/main/i/ifupdown/ifupdown_0.8.41.dsc
+sha256  222c5bef313a9e71d9be4b946c73c8606c98f9e0229153191d9c6d8fb9b3599c  ifupdown_0.8.41.tar.xz
 # Locally computed
 sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk
index e62c2a79c5..14c36db0db 100644
--- a/package/ifupdown/ifupdown.mk
+++ b/package/ifupdown/ifupdown.mk
@@ -4,9 +4,9 @@ 
 #
 ################################################################################
 
-IFUPDOWN_VERSION = 0.8.16
+IFUPDOWN_VERSION = 0.8.41
 IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz
-IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160922T165503Z/pool/main/i/ifupdown
+IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20230222T205615Z/pool/main/i/ifupdown
 IFUPDOWN_LICENSE = GPL-2.0+
 IFUPDOWN_LICENSE_FILES = COPYING
 IFUPDOWN_CPE_ID_VENDOR = debian
@@ -14,6 +14,7 @@  IFUPDOWN_CPE_ID_VENDOR = debian
 define IFUPDOWN_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -D'IFUPDOWN_VERSION=\"$(IFUPDOWN_VERSION)\"'" \
+		ARCH=linux \
 		-C $(@D)
 endef