--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package lace
While working on some extra tests for Gitano, a nasty bug was exposed
in the Lace ACL library. This was fixed upstream and an immediate
upstream release was made. The version in testing (1.3-1) differs
from the version in unstable (1.3.1-1) only by this change.
You can see the patch upstream at:
https://git.gitano.org.uk/lace.git/commit/?id=3ba09da3af9b59cdd1f54626253c3cf67a41a4e7
Attached is the debdiff which is basically the above commit and an
entry for debian/changelog.
Thanks,
Daniel.
unblock lace/1.3.1-1
-- System Information:
Debian Release: 8.7
APT prefers stable
APT policy: (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru lace-1.3/debian/changelog lace-1.3.1/debian/changelog
--- lace-1.3/debian/changelog 2016-10-14 09:25:34.000000000 +0100
+++ lace-1.3.1/debian/changelog 2017-02-13 12:09:42.000000000 +0000
@@ -1,3 +1,10 @@
+lace (1.3.1-1) unstable; urgency=medium
+
+ * New upstream release
+ * Closes: #854967
+
+ -- Daniel Silverstone <dsilvers@digital-scurf.org> Mon, 13 Feb 2017 12:09:42 +0000
+
lace (1.3-1) unstable; urgency=medium
* Initial packaging of Lace as a separate project.
diff -Nru lace-1.3/lib/lace/compiler.lua lace-1.3.1/lib/lace/compiler.lua
--- lace-1.3/lib/lace/compiler.lua 2016-05-30 11:01:14.000000000 +0100
+++ lace-1.3.1/lib/lace/compiler.lua 2017-02-12 16:36:35.000000000 +0000
@@ -101,7 +101,7 @@
return bindname(exec_context, rule, name, defn)
end
- args[#args+1] = definename
+ args[#args+1] = content[i].acc .. definename
rules[#rules+1] = definerule
else
args[#args+1] = content[i].str
diff -Nru lace-1.3/lib/lace/lex.lua lace-1.3.1/lib/lace/lex.lua
--- lace-1.3/lib/lace/lex.lua 2016-05-30 11:01:14.000000000 +0100
+++ lace-1.3.1/lib/lace/lex.lua 2017-02-12 16:36:35.000000000 +0000
@@ -60,16 +60,14 @@
quoting = c
force_empty = true
elseif c == '[' and quoting == false then
- if acc == "" then
- -- Something worth lexing
- local ltab, rest, warns = lex_one_line(line, "]")
- -- For now, assume the accumulator is good enough
- cpos = cpos + #line - #rest
- r[#r+1] = { spos = spos, epos = cpos, sub = ltab }
- spos = cpos + 1
- line = rest
- acc = ""
- end
+ -- Something worth lexing
+ local ltab, rest, warns = lex_one_line(line, "]")
+ -- For now, assume the accumulator is good enough
+ cpos = cpos + #line - #rest
+ r[#r+1] = { spos = spos, epos = cpos, sub = ltab, acc = acc }
+ spos = cpos + 1
+ line = rest
+ acc = ""
elseif c == "'" and quoting == c then
-- End single quotes
quoting = false
diff -Nru lace-1.3/test/test-lace.compiler.lua lace-1.3.1/test/test-lace.compiler.lua
--- lace-1.3/test/test-lace.compiler.lua 2016-05-30 11:01:14.000000000 +0100
+++ lace-1.3.1/test/test-lace.compiler.lua 2017-02-12 16:36:35.000000000 +0000
@@ -398,6 +398,11 @@
assert(result, msg)
end
+function suite.okay_negated_subdefine()
+ local result, msg = compiler.compile(comp_context, "subdefine3")
+ assert(result, msg)
+end
+
local count_ok = 0
for _, testname in ipairs(testnames) do
-- print("Run: " .. testname)
diff -Nru lace-1.3/test/test-lace.compile-subdefine3.rules lace-1.3.1/test/test-lace.compile-subdefine3.rules
--- lace-1.3/test/test-lace.compile-subdefine3.rules 1970-01-01 01:00:00.000000000 +0100
+++ lace-1.3.1/test/test-lace.compile-subdefine3.rules 2017-02-12 16:36:35.000000000 +0000
@@ -0,0 +1,2 @@
+define is_susan equal susan
+deny "Booo" is_susan ![equal jeff]
diff -Nru lace-1.3/test/test-lace.engine-inverted-subdefine-works.rules lace-1.3.1/test/test-lace.engine-inverted-subdefine-works.rules
--- lace-1.3/test/test-lace.engine-inverted-subdefine-works.rules 1970-01-01 01:00:00.000000000 +0100
+++ lace-1.3.1/test/test-lace.engine-inverted-subdefine-works.rules 2017-02-12 16:36:35.000000000 +0000
@@ -0,0 +1,2 @@
+default allow
+deny "PASS" ![equal jeff geoff]
diff -Nru lace-1.3/test/test-lace.engine.lua lace-1.3.1/test/test-lace.engine.lua
--- lace-1.3/test/test-lace.engine.lua 2016-05-30 11:01:14.000000000 +0100
+++ lace-1.3.1/test/test-lace.engine.lua 2017-02-12 16:36:35.000000000 +0000
@@ -253,6 +253,14 @@
assert(result, msg)
end
+function suite.inverted_subdefine_works()
+ local ruleset, msg = lace.compiler.compile(comp_context, "inverted-subdefine-works")
+ assert(type(ruleset) == "table", "Ruleset did not compile")
+ local ectx = {jeff = "geoff"}
+ local result, msg = lace.engine.run(ruleset, ectx)
+ assert(result, msg)
+end
+
function suite.subdefine_err_reported()
local ruleset, msg = lace.compiler.compile(comp_context, "subdefine-error")
assert(type(ruleset) == "table", "Ruleset did not compile")
--- End Message ---