From dbc0290f16142e4f6fa1d1c0ab87a207a00279ac Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 26 Oct 2017 01:48:49 -0200 Subject: [PATCH] ifupdown: update to 0.8.28. Closes: #8570 [via git-merge-pr] --- srcpkgs/ifupdown/patches/fix-musl.patch | 55 ++++--------------------- srcpkgs/ifupdown/template | 6 +-- 2 files changed, 11 insertions(+), 50 deletions(-) diff --git a/srcpkgs/ifupdown/patches/fix-musl.patch b/srcpkgs/ifupdown/patches/fix-musl.patch index 83803ae4a2..892644b4fe 100644 --- a/srcpkgs/ifupdown/patches/fix-musl.patch +++ b/srcpkgs/ifupdown/patches/fix-musl.patch @@ -1,52 +1,13 @@ ---- main.c -+++ main.c -@@ -19,6 +19,10 @@ - #include "archcommon.h" - #include "header.h" +--- archcommon.h ++++ archcommon.h +@@ -2,6 +2,10 @@ + + bool execable(const char *); +#if !defined(FNM_EXTMATCH) +#define FNM_EXTMATCH 0 +#endif + - static const char *argv0; - bool no_act = false; - bool run_scripts = true; ---- archhurd.c -+++ archhurd.c -@@ -6,6 +6,10 @@ - - #include "archcommon.h" - -+#if !defined(FNM_EXTMATCH) -+#define FNM_EXTMATCH 0 -+#endif -+ - bool variable_match(const char *iface, const char *variable, const char *pattern) { - if (!strcasecmp(variable, "name")) - return fnmatch(pattern, iface, FNM_EXTMATCH) == 0; ---- archkfreebsd.c -+++ archkfreebsd.c -@@ -9,6 +9,10 @@ - - #include "archcommon.h" - -+#if !defined(FNM_EXTMATCH) -+#define FNM_EXTMATCH 0 -+#endif -+ - static bool match_mac(const char *iface, const char *pattern) { - for (struct ifaddrs *ifa = ifap; ifa; ifa = ifa->ifa_next) { - if (ifa->ifa_addr->sa_family != AF_LINK) ---- archlinux.c -+++ archlinux.c -@@ -10,6 +10,10 @@ - - #include "archcommon.h" - -+#if !defined(FNM_EXTMATCH) -+#define FNM_EXTMATCH 0 -+#endif -+ - bool variable_match(const char *iface, const char *variable, const char *pattern) { - // Map platform-independent variables to sysfs names - if(!strcasecmp(variable, "mac")) + #define iface_is_link() (!_iface_has(ifd->real_iface, ":.")) + #define iface_has(s) _iface_has(ifd->real_iface, (s)) + #define iface_is_lo() ((!strcmp(ifd->logical_iface, LO_IFACE)) && (!no_loopback)) diff --git a/srcpkgs/ifupdown/template b/srcpkgs/ifupdown/template index c6a1f34223..727f820980 100644 --- a/srcpkgs/ifupdown/template +++ b/srcpkgs/ifupdown/template @@ -1,7 +1,7 @@ # Template file for 'ifupdown' pkgname=ifupdown -version=0.8.25 -revision=2 +version=0.8.28 +revision=1 wrksrc=$pkgname build_style=gnu-makefile make_use_env=1 @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="GPL-2" homepage="https://tracker.debian.org/pkg/ifupdown" distfiles="http://http.debian.net/debian/pool/main/i/ifupdown/ifupdown_${version}.tar.xz" -checksum=be1439efb3af81c8cf1c2c540d0de82c5d280bfcceb3bac1c4beecae1dcbec42 +checksum=a7fcd46d0f590fcbb685540e2638ad06286bff09f2ab07240d987d42c6a0d902 make_dirs="/etc/network/interfaces.d 0755 root root /etc/network/if-pre-up.d 0755 root root