diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-03-28 11:18:01 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-03-28 11:18:01 +0200 |
| commit | 199edbb340a36afbcee8df7f30038abb19c3f9d3 (patch) | |
| tree | f0cfbe966fe6e0fca5ac1aaaaa1a4f85aa9296d9 /main/awall | |
| parent | 4a4e149b84b0c2ec2bd7f4933be0534be4124e51 (diff) | |
main/awall: cherry-pick boolean variable fix from git
Diffstat (limited to 'main/awall')
| -rw-r--r-- | main/awall/0001-make-boolean-variables-work.patch | 30 | ||||
| -rw-r--r-- | main/awall/APKBUILD | 15 |
2 files changed, 40 insertions, 5 deletions
diff --git a/main/awall/0001-make-boolean-variables-work.patch b/main/awall/0001-make-boolean-variables-work.patch new file mode 100644 index 00000000000..e05b7df27ef --- /dev/null +++ b/main/awall/0001-make-boolean-variables-work.patch @@ -0,0 +1,30 @@ +From fe3ce1d7fef26030b45ac4ab4e3a613735dc20d7 Mon Sep 17 00:00:00 2001 +From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> +Date: Fri, 28 Mar 2014 10:56:00 +0200 +Subject: make boolean variables work + + +diff --git a/awall/policy.lua b/awall/policy.lua +index 585b04c..4e5d72b 100644 +--- a/awall/policy.lua ++++ b/awall/policy.lua +@@ -1,6 +1,6 @@ + --[[ + Policy file handling for Alpine Wall +-Copyright (C) 2012-2013 Kaarle Ritvanen ++Copyright (C) 2012-2014 Kaarle Ritvanen + See LICENSE file for license details + ]]-- + +@@ -43,7 +43,7 @@ function PolicyConfig:expand() + table.insert(visited, name) + + local var = self.data.variable[name] +- if not var then raise('Invalid variable reference: '..name) end ++ if var == nil then raise('Invalid variable reference: '..name) end + + if si == 1 and ei == string.len(value) then value = var + elseif contains({'number', 'string'}, type(var)) then +-- +cgit v0.10.1 + diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD index 6b6ae2f90e4..8c2368c6ce6 100644 --- a/main/awall/APKBUILD +++ b/main/awall/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=awall pkgver=1.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine Wall" url="http://git.alpinelinux.org/cgit/awall/" arch="noarch" @@ -11,7 +11,9 @@ replaces="awall-nat" depends="bind-tools ip6tables ipset iptables lua lua-alt-getopt lua-filesystem lua-json4 lua-pc lua-signal lua-sleep lua-stringy xtables-addons" subpackages=$pkgname-masquerade -source=http://dev.alpinelinux.org/archive/awall/awall-$pkgver.tar.xz +source="http://dev.alpinelinux.org/archive/awall/awall-$pkgver.tar.xz + 0001-make-boolean-variables-work.patch + " _builddir=$srcdir/awall-$pkgver prepare() { @@ -42,6 +44,9 @@ masquerade() { done } -md5sums="d3d36a6df7e6b11d1454fa14180ff5ff awall-1.0.0.tar.xz" -sha256sums="f5334cc27533bc457d2e0287ce7df44719f5ea0d856e52c9a1e5044e5e30012a awall-1.0.0.tar.xz" -sha512sums="7b6780bdc849abb931a737c1d8b95c2906a833c380dfa29c5eda3ed5470035cf8fa37e36214b6e0b4f322000fa97164288a4c8835f35ddfa57b253d7ecdbcff1 awall-1.0.0.tar.xz" +md5sums="d3d36a6df7e6b11d1454fa14180ff5ff awall-1.0.0.tar.xz +9d966feb770d9dc6c6b57445e94c892c 0001-make-boolean-variables-work.patch" +sha256sums="f5334cc27533bc457d2e0287ce7df44719f5ea0d856e52c9a1e5044e5e30012a awall-1.0.0.tar.xz +051f8d1eb6bb21d89d60de187c2a3ad9b0c168110a307fa3cd6a99730139c1be 0001-make-boolean-variables-work.patch" +sha512sums="7b6780bdc849abb931a737c1d8b95c2906a833c380dfa29c5eda3ed5470035cf8fa37e36214b6e0b4f322000fa97164288a4c8835f35ddfa57b253d7ecdbcff1 awall-1.0.0.tar.xz +88006cb2c554f447559da829bac9872082153b896588a8e975f33a67045a853a33faa9983ddee9efd0b2fde1e84606c459a0f47eb9110d5fc36de3293fd5a3d4 0001-make-boolean-variables-work.patch" |