Commit d8f7e200 authored by Milan P. Stanić's avatar Milan P. Stanić Committed by Natanael Copa

main/ifupdown: upgrade to 0.8.35

remove some patches and added new ones
rename _builddir to builddir
parent a80d49fc
# Contributor:
# Maintainer:
pkgname=ifupdown
pkgver=0.7.53.1
pkgrel=1
pkgver=0.8.35
pkgrel=0
pkgdesc="high level tools to configure network interfaces"
url="http://packages.debian.org/ifupdown"
arch="all"
license="GPL"
depends=
depends_dev=
makedepends="perl"
install=""
subpackages=
source="http://ftp.de.debian.org/debian/pool/main/i/$pkgname/${pkgname}_$pkgver.tar.xz
ifupdown-busybox-compat.patch
musl-macros-main.patch
musl-macros-archlinux.patch
makefile-arch.patch
busybox-compat.patch
ifupdown-alpine-ifstate.patch
ifupdown-cflags-version.patch
ifupdown-no-dpkg.patch"
_builddir="$srcdir/$pkgname"
builddir="$srcdir/$pkgname"
prepare() {
cd $builddir
local i
cd "$_builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......@@ -31,27 +29,19 @@ prepare() {
}
build() {
cd "$_builddir"
cd $builddir
make || return 1
}
package() {
cd "$_builddir"
cd $builddir
make BASEDIR="$pkgdir" install || return 1
}
md5sums="b36eab51a079e927b444a033bc608c65 ifupdown_0.7.53.1.tar.xz
c16541064bfb1d5e520acf41b6e990c9 ifupdown-busybox-compat.patch
dc9f46ad2bfffebffa41b74520ddb103 ifupdown-alpine-ifstate.patch
4332f9a584fbb762ab48edc6f3a953c5 ifupdown-cflags-version.patch
74a96adf311db2acfc52110f85a510cd ifupdown-no-dpkg.patch"
sha256sums="a97981b52d5758da42a8a2a3885a11d6e5f97eaf1a1b3c5fe36195e638ae6c03 ifupdown_0.7.53.1.tar.xz
b7423069317d87de8aa743d3203bbd537aab2a1b5a33c9c71c7d9de259bedfdf ifupdown-busybox-compat.patch
0b8e64b1a9dcf7bdbd6434289a51f142b1ab702fe5d97ffd4a9d4d793293d7b0 ifupdown-alpine-ifstate.patch
defdfa65fd774af133d344a80ce5224e2412f513b10b54946ae2fdba2f1d8ea3 ifupdown-cflags-version.patch
912d37c13ee1e06e24b7208819dd419451fd42b0091c4c4d9236eec6ccd248c8 ifupdown-no-dpkg.patch"
sha512sums="e54061474616bca5f2cb1aaeddb82bc4ee0ff72391098dc465554b213c88f2c18de1872e0d8cfe574b7ab15728d6f233a6cf5ee1952d1830dfa9a655ebe35086 ifupdown_0.7.53.1.tar.xz
2dc92ba007cac0bc5bc0c82d6283a772b4b20330e1569a6e889fa02a17debd08e3063cafbd7e6c447b38f8d93597d953dbf2d236c67415cfac24d0accaa3b881 ifupdown-busybox-compat.patch
sha512sums="ec18b9cc36914b27ee9cfd1d30dc6fbf356f9ca5a0e7af1eafe6318c22ab59f6e214869e47c61ca00389061a58fa46e4bf113423156b8b5ebf75308a3ad23153 ifupdown_0.8.35.tar.xz
1de60402dfc2e246c162726093c765971021e7a0069372e0a167f62a9e90ef742f4a5e7593dd9da45f689e806d23e59156754d6bbeed4e1a725d97adb525eac6 musl-macros-main.patch
a70b947b1b618d838e03f6493f2a9748565b0a077b1d526c6ad7ba7f4d7e8c287c42d92140164f4e7eb2e1860e1d476b3d44b88070e5e6bfe00ab0286db64006 musl-macros-archlinux.patch
31e436464be33e63c37a914ab77c9a3c0d4b94a1037457e483754bb1c262d4c6a318205a76277f58510a7030b7e69ae6b36ab8a966940771dbe8544a6079915b makefile-arch.patch
c99209142275b103d978e45037f3dcf0dcc4a6f33cf480e582e48d9c7858b7873012f287c2894376c841610842046b4e5b7da58632f839ab526e33704f758e5d busybox-compat.patch
422998dae8d0ac6049064c93c22baea143eefa7cab9a330b41ec6e317294da4976c193a7a252a8b4a3a47b93ebb01ef308f5a3803838d6452fc283a159ad1e89 ifupdown-alpine-ifstate.patch
ffe843f52b894b80dde4401bc71434f9d78d3498c501e3bc46c9737628283cb518834ed972d4381521535ce6de45dd606d3940420d21308c87602ec828e9c3ba ifupdown-cflags-version.patch
dfda752c68fd71d016f770753fa7142179dcb2c6f92cc78a9efa8135897e8186c549062bb1631c50c6087725e796c62e900d3f3a91e52d8c436be64a18efbfba ifupdown-no-dpkg.patch"
--- a/main.c 2019-01-28 18:21:37.000000000 +0100
+++ b/main.c 2019-06-01 19:22:23.224959630 +0200
@@ -94,8 +94,8 @@
"\t--no-loopback don't act specially on the loopback device\n");
if (!(cmds == iface_list) && !(cmds == iface_query))
- printf( "\t--force force de/configuration\n"
- "\t--ignore-errors ignore errors\n");
+ printf("\t-f,--force\t\t\tforce de/configuration\n"
+ "\t--ignore-errors\t\t\tignore errors\n");
if ((cmds == iface_list) || (cmds == iface_query))
printf( "\t--list list all matching known interfaces\n"
@@ -439,7 +439,7 @@
{"no-mappings", no_argument, NULL, 1},
{"no-scripts", no_argument, NULL, 4},
{"no-loopback", no_argument, NULL, 5},
- {"force", no_argument, NULL, 2},
+ {"force", no_argument, NULL, 'f'},
{"ignore-errors", no_argument, NULL, 7},
{"option", required_argument, NULL, 'o'},
{"list", no_argument, NULL, 'l'},
@@ -450,7 +450,7 @@
};
for (;;) {
- int c = getopt_long(*argc, *argv, "X:s:i:o:hVvnal", long_opts, NULL);
+ int c = getopt_long(*argc, *argv, "X:s:i:o:hVvnalf", long_opts, NULL);
if (c == EOF)
break;
@@ -526,7 +526,7 @@
run_mappings = false;
break;
- case 2: /* --force */
+ case 'f': /* --force */
if ((cmds == iface_list) || (cmds == iface_query))
usage();
force = true;
diff --git a/main.c b/main.c
index eea2492..008ed8f 100644
--- a/main.c
+++ b/main.c
@@ -89,7 +89,7 @@ static void help(char *execname, int (*cmds) (interface_defn *))
printf("\t--no-loopback\t\tdon't act specially on the loopback device\n");
if (!(cmds == iface_list)
&& !(cmds == iface_query)) {
- printf("\t--force\t\t\tforce de/configuration\n");
+ printf("\t-f,--force\t\t\tforce de/configuration\n");
printf("\t--ignore-errors\t\t\tignore errors\n");
}
if ((cmds == iface_list)
@@ -410,7 +410,7 @@ int main(int argc, char **argv)
{"no-mappings", no_argument, NULL, 1},
{"no-scripts", no_argument, NULL, 4},
{"no-loopback", no_argument, NULL, 5},
- {"force", no_argument, NULL, 2},
+ {"force", no_argument, NULL, 'f'},
{"ignore-errors", no_argument, NULL, 7},
{"option", required_argument, NULL, 'o'},
{"list", no_argument, NULL, 'l'},
@@ -473,7 +473,7 @@ int main(int argc, char **argv)
}
for (;;) {
int c;
- c = getopt_long(argc, argv, "X:s:i:o:hVvnal", long_opts, NULL);
+ c = getopt_long(argc, argv, "X:s:i:o:hVvnalf", long_opts, NULL);
if (c == EOF)
break;
@@ -504,7 +504,7 @@ int main(int argc, char **argv)
case 5:
no_loopback = true;
break;
- case 2:
+ case 'f':
if ((cmds == iface_list) || (cmds == iface_query))
usage(argv[0]);
force = 1;
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
VERSION ?= 0.7
-CFLAGS ?= -Wall -W -g -O2 -D'IFUPDOWN_VERSION="$(VERSION)"'
+CFLAGS ?= -Wall -W -g -O2
+CFLAGS += -D'IFUPDOWN_VERSION="$(VERSION)"'
ARCH ?= linux
BASEDIR ?= $(DESTDIR)
--- a/Makefile 2019-01-28 18:25:51.000000000 +0100
+++ b/Makefile 2019-06-01 19:10:28.644361881 +0200
@@ -1,6 +1,6 @@
VERSION ?= 0.8
CFLAGS ?= -Wall -W -Wno-unused-parameter -g -O2
-ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+ARCH := linux
BASEDIR ?= $(DESTDIR)
--- a/archlinux.c 2018-08-25 16:09:19.000000000 +0200
+++ b/archlinux.c 2019-06-01 19:02:42.615387535 +0200
@@ -10,6 +10,10 @@
#include "archcommon.h"
+#ifndef 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"))
--- a/main.c 2019-01-28 18:21:37.000000000 +0100
+++ b/main.c 2019-06-01 18:59:48.889202981 +0200
@@ -20,6 +20,10 @@
#include "archcommon.h"
#include "header.h"
+#ifndef FNM_EXTMATCH
+#define FNM_EXTMATCH 0
+#endif
+
static const char *argv0;
bool do_interface_lock = true;
bool no_act = false;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment