Skip to contentSkip to conversation

ifupdown: update to 0.8.22

PATCH In review Oleksandr Kravchuk 2 participants 3 messages Jul 2, 2019 – Jul 3, 2019

lore
Share & tools
lore

Oleksandr Kravchuk

author
#0 lore raw

PATCH v3 1/1 ifupdown: update to 0.8.22

Signed-off-by Oleksandr Kravchuk <[email protected]>
---
 .../0001-Define-FNM_EXTMATCH-for-musl.patch   | 47 +++++++++++++++++++
 ...t-rely-on-dpkg-architecture-to-set-a.patch |  8 ++--
 ...efn-fix-inverted-checks-for-loopback.patch | 45 +++++++++---------
 ...{ifupdown_0.8.16.bb => ifupdown_0.8.22.bb} |  3 +-
 4 files changed, 74 insertions(+), 29 deletions(-)
 create mode 100644 meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch
 rename meta/recipes-core/ifupdown/{ifupdown_0.8.16.bb => ifupdown_0.8.22.bb} (93%)
meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch new file +47 -0
new file mode 100644
index 0000000000..7bf02ea536
@@ -0,0 +1,47 @@
+From ff714d6461569d69b253089110ec659e4ebec248 Mon Sep 17 00:00:00 2001
+From: Oleksandr Kravchuk <[email protected]>
+Date: Tue, 2 Jul 2019 20:10:42 +0200
+Subject: [PATCH] Define FNM_EXTMATCH for musl
+
+Fixes the following compilation errors with musl that does not have
+FNM_EXTMATCH defined:
+
+| main.c: In function 'expand_matches':
+| main.c:700:40: error: 'FNM_EXTMATCH' undeclared (first use in this
+function); did you mean 'FNM_NOMATCH'?
+|   700 |     if(fnmatch(pattern, ifa->ifa_name, FNM_EXTMATCH))
+|       |                                        ^~~~~~~~~~~~
+|       |                                        FNM_NOMATCH
+
+and
+
+| archlinux.c:40:28: error: 'FNM_EXTMATCH' undeclared (first use in this
+function); did you mean 'FNM_NOMATCH'?
+|    40 |   if(fnmatch(pattern, buf, FNM_EXTMATCH) == 0) {
+|       |                            ^~~~~~~~~~~~
+|       |                            FNM_NOMATCH
+
+Upstream-Status: Submitted [https://salsa.debian.org/debian/ifupdown/merge_requests/5]
+
+Signed-off-by: Oleksandr Kravchuk <[email protected]>
+---
+ archcommon.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/archcommon.h b/archcommon.h
+index fe99950..f257f9d 100644
+--- a/archcommon.h
++++ b/archcommon.h
+@@ -1,5 +1,9 @@
+ #include "header.h"
+ 
++#if !defined(FNM_EXTMATCH)
++#define FNM_EXTMATCH 0
++#endif
++
+ bool execable(const char *);
+ 
+ #define iface_is_link() (!_iface_has(ifd->real_iface, ":."))
+-- 
+2.17.1
+
meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch +4 -4
index a24b8cda66..d1c3d260ed 100644
@@ -1,4 +1,4 @@
-From 7af9db748974cb3a2c6ef8f9e03d7db1f9f8ee16 Mon Sep 17 00:00:00 2001
+From 40257d65b338b6e2ed9d89d6fa7c7b8701a4c311 Mon Sep 17 00:00:00 2001
 From: Paul Gortmaker <[email protected]>
 Date: Wed, 6 Aug 2014 14:54:12 -0400
 Subject: [PATCH 1/2] defn2[c|man]: don't rely on dpkg-architecture to set arch

@@ -19,7 +19,7 @@ Upstream-Status: Pending
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/defn2c.pl b/defn2c.pl
-index c449de2f3d1c..38845e374c76 100755
+index 8798dc2..f2551c7 100755
 --- a/defn2c.pl
 +++ b/defn2c.pl
 @@ -2,9 +2,9 @@

@@ -36,7 +36,7 @@ index c449de2f3d1c..38845e374c76 100755
  # declarations
  my $address_family = "";
 diff --git a/defn2man.pl b/defn2man.pl
-index 6ddcfdd4fe68..c9c4dd046597 100755
+index 6ddcfdd..c9c4dd0 100755
 --- a/defn2man.pl
 +++ b/defn2man.pl
 @@ -2,9 +2,9 @@

@@ -53,5 +53,5 @@ index 6ddcfdd4fe68..c9c4dd046597 100755
  # declarations
  my $line;
 -- 
-1.9.1
+2.17.1
meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch +21 -24

106 lines not on this page · raw message

meta/recipes-core/ifupdown/ifupdown_0.8.22.bb renamed from meta/recipes-core/ifupdown/ifupdown_0.8.16.bb +2 -1
similarity index 93%
rename from meta/recipes-core/ifupdown/ifupdown_0.8.16.bb
rename to meta/recipes-core/ifupdown/ifupdown_0.8.22.bb
index e9f3a2aee9..bd0989e885 100644
@@ -10,8 +10,9 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \
 	   file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \
 	   file://inet-6-.defn-fix-inverted-checks-for-loopback.patch \
 	   file://99_network \
+	   file://0001-Define-FNM_EXTMATCH-for-musl.patch \
 	  "
-SRCREV = "11b9f99f7ecc7052497e6786156cfed531f11823"
+SRCREV = "ab5a0f464e53e172316a5ca8b5dcdc49e8848999"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
#1 lore raw
Quoted 5 lines · Oleksandr Kravchuk

...
++#if !defined(FNM_EXTMATCH)
++#define FNM_EXTMATCH 0
++#endif
...

This fixes the musl build, but the code will misbehave on musl.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
author
#2 lore raw

Sure. Technically, package is musl incompatible/not ready.

This trivial patch allows us to build ifupdown with musl.

Quoted 11 lines · Adrian Bunk
Quoted 5 lines · Oleksandr Kravchuk

...
++#if !defined(FNM_EXTMATCH)
++#define FNM_EXTMATCH 0
++#endif
...

This fixes the musl build, but the code will misbehave on musl.

cu
Adrian