diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-08-20 13:05:49 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-10-06 10:03:33 +0000 |
| commit | 5860e0969752efdd95025098dba9a5802a4c4108 (patch) | |
| tree | 0b53a7b5b4536ee8ce9d64091ad85fb316c66524 | |
| parent | 3a9ee56e9bbce692e9e718b1bbe482589f67edf1 (diff) | |
| download | aports-5860e0969752efdd95025098dba9a5802a4c4108.tar.bz2 aports-5860e0969752efdd95025098dba9a5802a4c4108.tar.xz | |
main/aaudit: minor server side fix
(cherry picked from commit ded74a6c8d3e2f0d055c00899e308bce660226d0)
| -rw-r--r-- | main/aaudit/APKBUILD | 8 | ||||
| -rw-r--r-- | main/aaudit/aaudit-server.lua | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/main/aaudit/APKBUILD b/main/aaudit/APKBUILD index 11a3f2058..7272fb991 100644 --- a/main/aaudit/APKBUILD +++ b/main/aaudit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=aaudit -pkgver=0.7 +pkgver=0.7.1 pkgrel=0 pkgdesc="Alpine Auditor" url="http://alpinelinux.org" @@ -50,7 +50,7 @@ server() { } md5sums="b81b0707b297a69dacbc1606324de029 aaudit-common.lua -4950638ccc64b5c89777e53450d14907 aaudit-server.lua +10fe426bac7030cda718239295328fc4 aaudit-server.lua 246782b6d8a47dc3568f4c232e35b638 aaudit f5de73f12b6df1a751c89f19c92871be aaudit-shell feef077f56f40002ca11846512d347af aaudit-update-keys @@ -58,7 +58,7 @@ feef077f56f40002ca11846512d347af aaudit-update-keys 8a80554c91d9fca8acb82f023de02f11 aaudit.json f0e97a7a07a472278298b5999a397f58 aaudit-server.json" sha256sums="ee1998e730356c2de0ff9d5e27d9e0277e3c1f051777146b7c5b820437edfd7f aaudit-common.lua -eef60186a6f468a2d2a2bef3b0d211f74718b64357f08f36e1691d4b82e00e13 aaudit-server.lua +8d9324e78bece410bb7b63a993be9f571b0f3dd2cc928f2396ff18591654be54 aaudit-server.lua 8c92fc5dd339883b940364ef27accb4d1756609a429682dd8f462b76d61fc8b7 aaudit 659c755cfca95a76da78f4d28d0ab9a32d55bea0077be7420ceaf9d45c518354 aaudit-shell 660dcf86f02a9d0e3ff47cb359e0291a0921d03215e368552a2878d2d691a9cc aaudit-update-keys @@ -66,7 +66,7 @@ eef60186a6f468a2d2a2bef3b0d211f74718b64357f08f36e1691d4b82e00e13 aaudit-server. ca3d163bab055381827226140568f3bef7eaac187cebd76878e0b63e9e442356 aaudit.json ab276c9caeaa238c8999c79cd3b016f4ba149e6793475c5cde088597cedd849c aaudit-server.json" sha512sums="aaa378fd710d17cb3663954648e97dd5128406cc6f37e9834075046aed1912dcc9e448b6c96502350b8d3496e00b7803cae671a4be2c12c584a84dc0b6e843e9 aaudit-common.lua -245af4789490bacca464266fe0e1a138fa539f4eaff02fb8dbceacf9a8c586702215ac0bbb56c42b551d1cc7c9560b61ca25985b92d39558d656d0f51eebcfc1 aaudit-server.lua +3df9e6cebb0c927be0fabea22b21394d5bfb2f3efd27d34ac50119dd5828da46a74027a12f22de50c8cecc036350f25016e34c00a44ed391cf363b11e2e46613 aaudit-server.lua f9f7f9d12bcb08571d6f071ee7557ec9ca17fbaefd27e6dc085331d84434a42df05a483b8d11b187530f146757bce4390b9bb149791d2f63254ade80cf900801 aaudit 18499771d7d425f9305209c562eb8e62ef41910e88b08219baf010cdb472d49087080feb67384c4826c53bddcc0ce92c0c23c78df22dc40c64f1b17bf0ad05ec aaudit-shell aec728a9a1e4c92baeb94a9d95e1785ea166652a157571fe2e848e71c1246635ecb99512e92435e1314c620b1fa8e4f37400350bed78bd375db4a63828c500f0 aaudit-update-keys diff --git a/main/aaudit/aaudit-server.lua b/main/aaudit/aaudit-server.lua index f0f73ab6f..b039e2c77 100644 --- a/main/aaudit/aaudit-server.lua +++ b/main/aaudit/aaudit-server.lua @@ -11,7 +11,7 @@ local HOME = os.getenv("HOME") M.serverconfig = aac.readconfig(("%s/aaudit-server.json"):format(HOME)) or {} local function merge_bool(a, b) return a or b end -local function merge_array(a, b) if b then for i=1,#b do a[#a+1] = b[i] end end return a end +local function merge_array(a, b) a = a or {} if b then for i=1,#b do a[#a+1] = b[i] end end return a end local function match_file(fn, match_list) if not match_list then return false end |