mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-12-03 18:33:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/ifupdown: bump to 0.8.41

Browse Source 
MUSL support is patched by defining FNM_EXTMATCH to zero, which omits
GNU-only extended pattern matching.

Signed-off-by: Martin Hundebøll <martin@geanix.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Martin Hundeboll 2023-03-16 10:45:15 +01:00 committed by Thomas Petazzoni
parent 1c36821be1
commit 25defd6857
3 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
package/ifupdown/0001-archcommon-define-GNU-only-FNM_EXTMATCH-to-zero-on-n.patch Normal file
View File

@ -0,0 +1,41 @@
From e27fe4b483194ee57736c228b7a6c56696ae8a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
Date: Thu, 16 Mar 2023 09:29:20 +0100
Subject: [PATCH] archcommon: define GNU-only FNM_EXTMATCH to zero on non-glibc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
FNM_EXTMATCH is a GNU extension that enables extended pattern matching
for fnmatch(3). Defining it to zero on non-glibc builds makes ifupdown
usable, albeit with a sligthy reduced pattern matching feature set.
Signed-off-by: Martin Hundebøll <martin@geanix.com>
Upstream-status: Denied [https://salsa.debian.org/debian/ifupdown/-/merge_requests/5]
---
archcommon.h | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/archcommon.h b/archcommon.h
index 818b0b6..981e84f 100644
--- a/archcommon.h
+++ b/archcommon.h
@@ -1,5 +1,15 @@
#include "header.h"
+/*
+ * FNM_EXTMATCH is a GNU extension, so it isn't available when compiling
+ * with MUSL. Defining FNM_EXTMATCH to zero is safe, as the flag merely
+ * enables extended pattern matching, which MUSL users should be able to
+ * live without.
+ */
+#ifndef FNM_EXTMATCH
+#define FNM_EXTMATCH 0
+#endif
+
bool execable(const char *);
#define iface_is_link() (!_iface_has(ifd->real_iface, ":."))
--
2.39.2

4
package/ifupdown/ifupdown.hash
View File

@ -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

5
package/ifupdown/ifupdown.mk
View File

@ -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