aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-05-07 05:53:08 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-05-07 05:53:20 +0000
commit084b9372103354999bffda490f597fca0740a91d (patch)
tree3a17259db835bc67c182036faa801a4ff77e6a46
parentf3830a9ef3b6d86fdc65860377cf5be2ef80f367 (diff)
downloadaports-084b9372103354999bffda490f597fca0740a91d.tar.bz2
aports-084b9372103354999bffda490f597fca0740a91d.tar.xz
main/alpine-conf: add fix for setup-interfaces
-rw-r--r--main/alpine-conf/0001-setup-interfaces-replace-non-breaking-space-with-nor.patch28
-rw-r--r--main/alpine-conf/APKBUILD12
2 files changed, 36 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-setup-interfaces-replace-non-breaking-space-with-nor.patch b/main/alpine-conf/0001-setup-interfaces-replace-non-breaking-space-with-nor.patch
new file mode 100644
index 0000000000..d2438c20bf
--- /dev/null
+++ b/main/alpine-conf/0001-setup-interfaces-replace-non-breaking-space-with-nor.patch
@@ -0,0 +1,28 @@
+From d5c11ff64cb280ddd1bc8b57e34508e2fa1d3c5c Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 6 May 2015 22:13:12 +0200
+Subject: [PATCH] setup-interfaces: replace non-breaking space with normal
+ space
+
+Non-breaking space (0xc2 0xa0) was added by mistake. Replace it with a
+normal space.
+---
+ setup-interfaces.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup-interfaces.in b/setup-interfaces.in
+index 1bf0713..c62cd30 100644
+--- a/setup-interfaces.in
++++ b/setup-interfaces.in
+@@ -400,7 +400,7 @@ prompt_for_interfaces() {
+ index=$(( $index + 1 ))
+ done
+
+- if [ "$(openrc --sys)" != "LXC" ] || ! ip addr show lo | grep -q 'inet.*127\.0'; then
++ if [ "$(openrc --sys)" != "LXC" ] || ! ip addr show lo | grep -q 'inet.*127\.0'; then
+ echo "type=loopback" > 000~lo.conf
+ echo "" > interface
+ fi
+--
+2.4.0
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 9543807aac..06e27456a3 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,13 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=3.2.0
-pkgrel=0
+pkgrel=1
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
arch="all"
license="GPL2"
depends="openrc"
source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
+ 0001-setup-interfaces-replace-non-breaking-space-with-nor.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -34,6 +35,9 @@ package() {
done
}
-md5sums="db580800445157df07c681722aab4b6b alpine-conf-3.2.0.tar.xz"
-sha256sums="9a2d1b23ba9f19ecdd07798d79f8ab6ba63ea28daa1cbbf19da8bd1c2e6b9484 alpine-conf-3.2.0.tar.xz"
-sha512sums="9e1b41d94212596693d7e98f3a310b0576c86628ed528a1f112fab72bc4d14e88d99a7bedf834563e0337ccf0b256a450e47bfb3a4dd4935130fcd503d35f2ea alpine-conf-3.2.0.tar.xz"
+md5sums="db580800445157df07c681722aab4b6b alpine-conf-3.2.0.tar.xz
+15eecd5eef638a7366e32c5a8c215674 0001-setup-interfaces-replace-non-breaking-space-with-nor.patch"
+sha256sums="9a2d1b23ba9f19ecdd07798d79f8ab6ba63ea28daa1cbbf19da8bd1c2e6b9484 alpine-conf-3.2.0.tar.xz
+a8122d90fbd7fd69ef793f8f116a1a518d861b6bfde8b837dbcb6477aa16933e 0001-setup-interfaces-replace-non-breaking-space-with-nor.patch"
+sha512sums="9e1b41d94212596693d7e98f3a310b0576c86628ed528a1f112fab72bc4d14e88d99a7bedf834563e0337ccf0b256a450e47bfb3a4dd4935130fcd503d35f2ea alpine-conf-3.2.0.tar.xz
+e11988eda8162463c980fd99f5492aa18e92ccf3e8ac52416145713ecf989758b84a603a8857dd9cf603ffd8cf3ce181a12eb5c90ae8709eac4c85bf1ee9fde0 0001-setup-interfaces-replace-non-breaking-space-with-nor.patch"