testing/ifupdown: move to main

7 files changed, 152 insertions, 0 deletions

diff --git a/main/ifupdown/APKBUILD b/main/ifupdown/APKBUILD
new file mode 100644
index 0000000000..ecd977d527
--- /dev/null
+++ b/main/ifupdown/APKBUILD
@@ -0,0 +1,57 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=ifupdown
+pkgver=0.7.53.1
+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="$pkgname.post-deinstall $pkgname.post-upgrade"
+subpackages=
+source="http://ftp.de.debian.org/debian/pool/main/i/$pkgname/${pkgname}_$pkgver.tar.xz
+	ifupdown-busybox-compat.patch
+	ifupdown-alpine-ifstate.patch
+	ifupdown-cflags-version.patch
+	ifupdown-no-dpkg.patch"
+
+_builddir="$srcdir/$pkgname"
+
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	make || return 1
+}
+
+package() {
+	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
+422998dae8d0ac6049064c93c22baea143eefa7cab9a330b41ec6e317294da4976c193a7a252a8b4a3a47b93ebb01ef308f5a3803838d6452fc283a159ad1e89  ifupdown-alpine-ifstate.patch
+ffe843f52b894b80dde4401bc71434f9d78d3498c501e3bc46c9737628283cb518834ed972d4381521535ce6de45dd606d3940420d21308c87602ec828e9c3ba  ifupdown-cflags-version.patch
+dfda752c68fd71d016f770753fa7142179dcb2c6f92cc78a9efa8135897e8186c549062bb1631c50c6087725e796c62e900d3f3a91e52d8c436be64a18efbfba  ifupdown-no-dpkg.patch"
diff --git a/main/ifupdown/ifupdown-alpine-ifstate.patch b/main/ifupdown/ifupdown-alpine-ifstate.patch
new file mode 100644
index 0000000000..fd76da91b2
--- /dev/null
+++ b/main/ifupdown/ifupdown-alpine-ifstate.patch
@@ -0,0 +1,13 @@
+diff --git a/header.h b/header.h
+index b621448..a735176 100644
+--- a/header.h
++++ b/header.h
+@@ -97,7 +97,7 @@ struct mapping_defn
+ #define MAX_VARNAME    32
+ #define EUNBALPER   10000
+ #ifndef RUN_DIR
+-#define RUN_DIR "/run/network/"
++#define RUN_DIR "/var/run/"
+ #endif
+ 
+ #ifndef LO_IFACE
diff --git a/main/ifupdown/ifupdown-busybox-compat.patch b/main/ifupdown/ifupdown-busybox-compat.patch
new file mode 100644
index 0000000000..36c3d7ceb7
--- /dev/null
+++ b/main/ifupdown/ifupdown-busybox-compat.patch
@@ -0,0 +1,40 @@
+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;
diff --git a/main/ifupdown/ifupdown-cflags-version.patch b/main/ifupdown/ifupdown-cflags-version.patch
new file mode 100644
index 0000000000..1ef9ef9108
--- /dev/null
+++ b/main/ifupdown/ifupdown-cflags-version.patch
@@ -0,0 +1,10 @@
+--- 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)
diff --git a/main/ifupdown/ifupdown-no-dpkg.patch b/main/ifupdown/ifupdown-no-dpkg.patch
new file mode 100644
index 0000000000..4cb9268123
--- /dev/null
+++ b/main/ifupdown/ifupdown-no-dpkg.patch
@@ -0,0 +1,26 @@
+diff --git a/defn2c.pl b/defn2c.pl
+index c449de2..ef8d475 100755
+--- a/defn2c.pl
++++ b/defn2c.pl
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ 
+-my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
++my $DEB_HOST_ARCH_OS = `uname -s|tr [A-Z] [a-z]`;
+ 
+ $DEB_HOST_ARCH_OS =~ s/\n//;
+ 
+diff --git a/defn2man.pl b/defn2man.pl
+index 6ddcfdd..f1e6bde 100755
+--- a/defn2man.pl
++++ b/defn2man.pl
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ 
+-my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
++my $DEB_HOST_ARCH_OS = `uname -s | tr [A-Z] [a-z]`;
+ 
+ $DEB_HOST_ARCH_OS =~ s/\n//;
+ 
diff --git a/main/ifupdown/ifupdown.post-deinstall b/main/ifupdown/ifupdown.post-deinstall
new file mode 100644
index 0000000000..99b57c4635
--- /dev/null
+++ b/main/ifupdown/ifupdown.post-deinstall
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+busybox --install -s
diff --git a/main/ifupdown/ifupdown.post-upgrade b/main/ifupdown/ifupdown.post-upgrade
new file mode 100644
index 0000000000..99b57c4635
--- /dev/null
+++ b/main/ifupdown/ifupdown.post-upgrade
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+busybox --install -s