diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/augeas/0001-Dnsmasq-add-structure-to-address-and-server-options.patch | 132 | ||||
| -rw-r--r-- | main/augeas/APKBUILD | 17 |
2 files changed, 141 insertions, 8 deletions
diff --git a/main/augeas/0001-Dnsmasq-add-structure-to-address-and-server-options.patch b/main/augeas/0001-Dnsmasq-add-structure-to-address-and-server-options.patch new file mode 100644 index 0000000000..941c8c51da --- /dev/null +++ b/main/augeas/0001-Dnsmasq-add-structure-to-address-and-server-options.patch @@ -0,0 +1,132 @@ +From f52aea2430e31d39c6b454d3387bae8cb62fa02d Mon Sep 17 00:00:00 2001 +From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> +Date: Mon, 16 Jun 2014 15:15:55 +0300 +Subject: [PATCH] Dnsmasq: add structure to 'address' and 'server' options + +This is a backwards incompatible change. +--- + lenses/dnsmasq.aug | 34 ++++++++++++++++++++++--------- + lenses/tests/test_dnsmasq.aug | 47 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 72 insertions(+), 9 deletions(-) + +diff --git a/lenses/dnsmasq.aug b/lenses/dnsmasq.aug +index e19aab8..78ae23a 100644 +--- a/lenses/dnsmasq.aug ++++ b/lenses/dnsmasq.aug +@@ -17,26 +17,42 @@ module Dnsmasq = + * USEFUL PRIMITIVES + *************************************************************************) + +-let eol = Util.eol +-let spc = Util.del_ws_spc +-let comment = Util.comment +-let empty = Util.empty ++let eol = Util.eol ++let spc = Util.del_ws_spc ++let comment = Util.comment ++let empty = Util.empty + +-let sep_eq = del /=/ "=" +-let sto_to_eol = store /([^ \t\n].*[^ \t\n]|[^ \t\n])/ ++let sep_eq = Sep.equal ++let sto_to_eol = store /([^ \t\n].*[^ \t\n]|[^ \t\n])/ ++ ++let slash = Util.del_str "/" ++let sto_no_slash = store /([^\/ \t\n]+)/ ++let domains = slash . [ label "domain" . sto_no_slash . slash ]+ + + (************************************************************************ +- * ENTRIES ++ * SIMPLE ENTRIES + *************************************************************************) + +-let entry_re = /[A-Za-z0-9._-]+/ ++let entry_re = Rx.word - /(address|server)/ + let entry = [ key entry_re . (sep_eq . sto_to_eol)? . eol ] + + (************************************************************************ ++ * STRUCTURED ENTRIES ++ *************************************************************************) ++ ++let address = [ key "address" . sep_eq . domains . sto_no_slash . eol ] ++ ++let server = ++ let port = [ Build.xchgs "#" "port" . store Rx.integer ]? ++ in let source = [ Build.xchgs "@" "source" . store /[^#\/ \t\n]+/ . port ]? ++ in let srv_spec = ( store /(#|([^#@\/ \t\n]+))/ . port . source )? ++ in [ key "server" . sep_eq . domains? . srv_spec . eol ] ++ ++(************************************************************************ + * LENS + *************************************************************************) + +-let lns = (comment|empty|entry) * ++let lns = (comment|empty|address|server|entry) * + + let filter = incl "/etc/dnsmasq.conf" + . incl "/etc/dnsmasq.d/*" +diff --git a/lenses/tests/test_dnsmasq.aug b/lenses/tests/test_dnsmasq.aug +index 0abfa6b..c6a63d9 100644 +--- a/lenses/tests/test_dnsmasq.aug ++++ b/lenses/tests/test_dnsmasq.aug +@@ -6,6 +6,16 @@ let conf = "# Configuration file for dnsmasq. + + conf-dir=/etc/dnsmasq.d + selfmx ++ ++address=/foo.com/bar.net/10.1.2.3 ++ ++server=10.4.5.6#1234 ++server=/bar.com/foo.net/10.7.8.9 ++server=/foo.org/bar.org/10.3.2.1@eth0#5678 ++server=/baz.org/# ++server=/baz.net/#@eth1 ++server=10.6.5.4#1234@eth0#5678 ++server=/qux.com/qux.net/ + " + + test Dnsmasq.lns get conf = +@@ -15,3 +25,40 @@ test Dnsmasq.lns get conf = + {} + { "conf-dir" = "/etc/dnsmasq.d" } + { "selfmx" } ++ {} ++ { "address" = "10.1.2.3" ++ { "domain" = "foo.com" } ++ { "domain" = "bar.net" } ++ } ++ {} ++ { "server" = "10.4.5.6" ++ { "port" = "1234" } ++ } ++ { "server" = "10.7.8.9" ++ { "domain" = "bar.com" } ++ { "domain" = "foo.net" } ++ } ++ { "server" = "10.3.2.1" ++ { "domain" = "foo.org" } ++ { "domain" = "bar.org" } ++ { "source" = "eth0" ++ { "port" = "5678" } ++ } ++ } ++ { "server" = "#" ++ { "domain" = "baz.org" } ++ } ++ { "server" = "#" ++ { "domain" = "baz.net" } ++ { "source" = "eth1" } ++ } ++ { "server" = "10.6.5.4" ++ { "port" = "1234" } ++ { "source" = "eth0" ++ { "port" = "5678" } ++ } ++ } ++ { "server" ++ { "domain" = "qux.com" } ++ { "domain" = "qux.net" } ++ } +-- +1.8.3.1 + diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD index 8095be2395..c416c81b7a 100644 --- a/main/augeas/APKBUILD +++ b/main/augeas/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=augeas pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A configuration editing tool" url="http://augeas.net" arch="all" @@ -11,7 +11,8 @@ 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 + 0001-Dnsmasq-add-structure-to-address-and-server-options.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -21,9 +22,6 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - - # workaround for https://github.com/hercules-team/augeas/issues/89 - rm -f lenses/xymon_alerting.aug lenses/tests/test_xymon_alerting.aug } build() { @@ -65,6 +63,9 @@ libs() { "$subpkgdir"/usr/share/augeas/ || return 1 } -md5sums="dce2f52cbd20f72c7da48e014ad48076 augeas-1.2.0.tar.gz" -sha256sums="f4aeb28ebe0b0921920fe1c9b4c016739c25261a15de04cb97db02d669f481e0 augeas-1.2.0.tar.gz" -sha512sums="fa3cf6bf5143bc4afbf3b360834565a295d7ef815894a019f1e8017a0199f778adc6d6c44ee220b24b37355211264535af7efc56134c81b167df296134095aa8 augeas-1.2.0.tar.gz" +md5sums="dce2f52cbd20f72c7da48e014ad48076 augeas-1.2.0.tar.gz +b140791828aec2037c411164102ef8cd 0001-Dnsmasq-add-structure-to-address-and-server-options.patch" +sha256sums="f4aeb28ebe0b0921920fe1c9b4c016739c25261a15de04cb97db02d669f481e0 augeas-1.2.0.tar.gz +0cb29dfdef3f293c5a4db06704072a6672ce728c82d4b2a7260da341522efc37 0001-Dnsmasq-add-structure-to-address-and-server-options.patch" +sha512sums="fa3cf6bf5143bc4afbf3b360834565a295d7ef815894a019f1e8017a0199f778adc6d6c44ee220b24b37355211264535af7efc56134c81b167df296134095aa8 augeas-1.2.0.tar.gz +f2cdf6fcd84de4f86bc54d89292d3c4c19070b1c6d5149af6a8d7c49678e2a7527b6549ad114e5ccec53d4d9582814153732f69a4c0228243aac96c48a0e1d1d 0001-Dnsmasq-add-structure-to-address-and-server-options.patch" |