aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/augeas/APKBUILD13
-rw-r--r--main/augeas/iface-multiopt.patch54
2 files changed, 62 insertions, 5 deletions
diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index ff71dcf17f..534952baf2 100644
--- a/main/augeas/APKBUILD
+++ b/main/augeas/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=augeas
pkgver=1.1.0
-pkgrel=0
+pkgrel=1
pkgdesc="A configuration editing tool"
url="http://augeas.net"
arch="all"
@@ -11,7 +11,7 @@ depends_dev="libxml2-dev"
makedepends="$depends_dev readline-dev"
install=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-tests $pkgname-libs"
-source="http://download.augeas.net/augeas-$pkgver.tar.gz"
+source="http://download.augeas.net/augeas-$pkgver.tar.gz iface-multiopt.patch"
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
@@ -67,6 +67,9 @@ libs() {
"$subpkgdir"/usr/share/augeas/ || return 1
}
-md5sums="520ce983457ff9ffa3816bc41a9f328b augeas-1.1.0.tar.gz"
-sha256sums="9d81e4228329e2d5cccb018ab06bc8b734fb2dede2c4d9b5c02303d4a690b76b augeas-1.1.0.tar.gz"
-sha512sums="ddb06f71993079330fc5b134ccd45476c1ab24f475b7a859c5920a7af3bd00d4dae31bf8110841ded4c4f5197e72911c298d7fcfe32d1d3e6821bca74aa67e26 augeas-1.1.0.tar.gz"
+md5sums="520ce983457ff9ffa3816bc41a9f328b augeas-1.1.0.tar.gz
+5fb936320a5f7f0386fbc00f3bc751c2 iface-multiopt.patch"
+sha256sums="9d81e4228329e2d5cccb018ab06bc8b734fb2dede2c4d9b5c02303d4a690b76b augeas-1.1.0.tar.gz
+1407f8de30cc2383cb6279e650fe458e664551426fa8227803e474a1550086a8 iface-multiopt.patch"
+sha512sums="ddb06f71993079330fc5b134ccd45476c1ab24f475b7a859c5920a7af3bd00d4dae31bf8110841ded4c4f5197e72911c298d7fcfe32d1d3e6821bca74aa67e26 augeas-1.1.0.tar.gz
+185875ddac0e81d2842864a5627e90dea402492927b5dfb92397c01045ac864994e1ff2502ab4c21b66d9e8ad65028c3f5dcf860bf24181b18cd5422f2d04adf iface-multiopt.patch"
diff --git a/main/augeas/iface-multiopt.patch b/main/augeas/iface-multiopt.patch
new file mode 100644
index 0000000000..68260a336e
--- /dev/null
+++ b/main/augeas/iface-multiopt.patch
@@ -0,0 +1,54 @@
+--- augeas-1.1.0/lenses/interfaces.aug
++++ augeas-1.1.0.iface/lenses/interfaces.aug
+@@ -36,21 +36,26 @@
+ let stanza_id (t:string) = key t . sep_spc . sto_to_spc
+ let stanza_param (l:string) = [ sep_spc . label l . sto_to_spc ]
+
+-(* Define reseverved words *)
+-let stanza_word = /(iface|auto|allow-[a-z-]+|mapping)/
++(* Define reseverved words and multi-value options*)
++let stanza_word = /(iface|auto|allow-[a-z-]+|mapping|bond-slaves|bridge-ports)/
+
++(* Define stanza option indentation *)
++let stanza_indent = del /[ \t]*/ " "
++
+ (* Define additional lines for multi-line stanzas *)
+-let stanza_option = [ del /[ \t]*/ " "
++let stanza_option = [ stanza_indent
+ . key ( /[a-z_-]+/ - stanza_word )
+ . sep_spc
+ . sto_to_eol ]
+
++(* Define space-separated array *)
++let array (r:regexp) (t:string) = del r t . label t . counter t
++ . [ sep_spc . seq t . sto_to_spc ]+
++
+ (************************************************************************
+ * AUTO
+ *************************************************************************)
+
+-let array (r:regexp) (t:string) = del r t . label t . counter t
+- . [ sep_spc . seq t . sto_to_spc ]+
+ let auto = [ array /(allow-)?auto/ "auto" . eol ]
+
+ (************************************************************************
+@@ -74,12 +79,18 @@
+ * IFACE
+ *************************************************************************)
+
++let multi_option (t:string) = [ stanza_indent . array t t . eol ]
++
+ let iface = [ Util.indent
+ . stanza_id "iface"
+ . stanza_param "family"
+ . stanza_param "method"
+ . eol
+- . (stanza_option|comment|empty)* ]
++ . ( stanza_option
++ | multi_option "bond-slaves"
++ | multi_option "bridge-ports"
++ | comment
++ | empty )* ]
+
+ (************************************************************************
+ * STANZAS