Package: lua-cjson Version: 2.1.0+dfsg-2.1 Severity: normal Tags: patch pending X-Debbugs-CC: [email protected] [email protected] [email protected]
Dear maintainer, I've prepared an NMU for lua-cjson (versioned as 2.1.0+dfsg-2.2) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. The NMU mainly adds support for lua5.3 and lua5.4. The purpose of this NMU is to avoiding bundling another copy of lua-cjson source code when packaging src:xmake ( https://bugs.debian.org/986736 ). For the git packaging repo, having someone to create lua-team/lua-cjson.git on Salsa would also be great. I am including this change in Vcs-* fields in advance to avoid the necessity of yet another upload. Please feel free to let me know if you have any doubts or questions. Thanks! Regards, Boyuan Yang diff -Nru lua-cjson-2.1.0+dfsg/debian/changelog lua-cjson- 2.1.0+dfsg/debian/changelog --- lua-cjson-2.1.0+dfsg/debian/changelog 2018-01-20 15:15:36.000000000 -0500 +++ lua-cjson-2.1.0+dfsg/debian/changelog 2022-11-30 11:26:18.000000000 -0500 @@ -1,3 +1,19 @@ +lua-cjson (2.1.0+dfsg-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * Add lua version 5.3 (Closes: #872599, #942569). + * Add lua version 5.4. + * Add Rules-Requires-Root: no. + * Add hardening options. + * Bump debhelper compat to 13. + * Bump Standards-Version to 4.6.1. + + [ Boyuan Yang ] + * debian/control: Migrate Vcs-* fields to Salsa lua-team. + * debian/copyright: Use latest machine-readable copyright format. + + -- Yangfl <[email protected]> Thu, 01 Dec 2022 00:26:18 +0800 + lua-cjson (2.1.0+dfsg-2.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru lua-cjson-2.1.0+dfsg/debian/compat lua-cjson- 2.1.0+dfsg/debian/compat --- lua-cjson-2.1.0+dfsg/debian/compat 2012-08-24 09:21:32.000000000 -0400 +++ lua-cjson-2.1.0+dfsg/debian/compat 1969-12-31 19:00:00.000000000 -0500 @@ -1,2 +0,0 @@ -7 - diff -Nru lua-cjson-2.1.0+dfsg/debian/control lua-cjson- 2.1.0+dfsg/debian/control --- lua-cjson-2.1.0+dfsg/debian/control 2018-01-20 15:15:36.000000000 -0500 +++ lua-cjson-2.1.0+dfsg/debian/control 2022-11-30 11:26:18.000000000 -0500 @@ -1,13 +1,14 @@ Source: lua-cjson Maintainer: The Debian Lua Team <[email protected]> Uploaders: Dmitry E. Oboukhov <[email protected]> -Build-Depends: debhelper (>= 9), dh-lua -Standards-Version: 3.9.3 +Build-Depends: debhelper-compat (= 13), dh-lua +Standards-Version: 4.6.1 Section: interpreters Priority: optional +Rules-Requires-Root: no Homepage: http://www.kyne.com.au/~mark/software/lua-cjson.php -VCS-Git: git://anonscm.debian.org/collab-maint/liblua-cjson.git -VCS-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/liblua-cjson.git;a=summary +Vcs-Git: https://salsa.debian.org/lua-team/lua-cjson.git +Vcs-Browser: https://salsa.debian.org/lua-team/lua-cjson Package: lua-cjson Architecture: any @@ -30,7 +31,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends}, lua-cjson (= ${binary:Version}) +Depends: ${misc:Depends}, lua-cjson (= ${binary:Version}) Provides: ${lua:Provides} XB-Lua-Versions: ${lua:Versions} Description: JSON parser/encoder for Lua, development files diff -Nru lua-cjson-2.1.0+dfsg/debian/copyright lua-cjson- 2.1.0+dfsg/debian/copyright --- lua-cjson-2.1.0+dfsg/debian/copyright 2012-08-24 09:21:32.000000000 -0400 +++ lua-cjson-2.1.0+dfsg/debian/copyright 2022-11-30 11:26:18.000000000 -0500 @@ -1,11 +1,21 @@ -Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135 -Maintainer: Mark Pulford <[email protected]> +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://www.kyne.com.au/~mark/software/lua-cjson.php -Name: CJSON + +Files: * +Copyright: 2010-2012, Mark Pulford <[email protected]> +Comment: In the Lua community this license is better known as "MIT". + Unfortunately other variants of this license are also known as "MIT". + To obtain a machine intepretable copyright file Debian prefers to name this + version of the MIT license using the non ambiguous term "Expat". +License: Expat + +Files: debian/* +Copyright: 2012, Dmitry E. Oboukhov <[email protected]> +License: Expat Files: g_fmt.c, dtoa.c Copyright: 1991-2001, Lucent Technologies. -License: +License: Permissive Permission to use, copy, modify, and distribute this software for any purpose without fee is hereby granted, provided that this entire notice is included in all copies of any software which is or includes a copy @@ -17,16 +27,6 @@ REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. -Files: debian/* -Copyright: 2012, Dmitry E. Oboukhov <[email protected]> -License: Expat - -Files: * -Copyright: 2010-2012, Mark Pulford <[email protected]> -Comment: In the Lua community this license is better known as "MIT". - Unfortunately other variants of this license are also known as "MIT". - To obtain a machine intepretable copyright file Debian prefers to name this - version of the MIT license using the non ambiguous term "Expat". License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -46,4 +46,3 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff -Nru lua-cjson-2.1.0+dfsg/debian/lua5.3.dh-lua.conf lua-cjson- 2.1.0+dfsg/debian/lua5.3.dh-lua.conf --- lua-cjson-2.1.0+dfsg/debian/lua5.3.dh-lua.conf 1969-12-31 19:00:00.000000000 -0500 +++ lua-cjson-2.1.0+dfsg/debian/lua5.3.dh-lua.conf 2022-11-30 11:26:18.000000000 -0500 @@ -0,0 +1,10 @@ +### mandatory fields +PKG_NAME=cjson + +### things relative to the C library part +CLIB_OBJS=lua_cjson.lo fpconv.lo strbuf.lo + +### things relative to the lua library part +LUA_TEST=cd tests/ && @@LUA@@ test.lua +LUA_SOURCES=$(wildcard lua/cjson/*.lua) +LUA_SOURCES_MANGLER=sed -e 's?^lua/??' diff -Nru lua-cjson-2.1.0+dfsg/debian/lua5.4.dh-lua.conf lua-cjson- 2.1.0+dfsg/debian/lua5.4.dh-lua.conf --- lua-cjson-2.1.0+dfsg/debian/lua5.4.dh-lua.conf 1969-12-31 19:00:00.000000000 -0500 +++ lua-cjson-2.1.0+dfsg/debian/lua5.4.dh-lua.conf 2022-11-30 11:26:18.000000000 -0500 @@ -0,0 +1,10 @@ +### mandatory fields +PKG_NAME=cjson + +### things relative to the C library part +CLIB_OBJS=lua_cjson.lo fpconv.lo strbuf.lo + +### things relative to the lua library part +LUA_TEST=cd tests/ && @@LUA@@ test.lua +LUA_SOURCES=$(wildcard lua/cjson/*.lua) +LUA_SOURCES_MANGLER=sed -e 's?^lua/??' diff -Nru lua-cjson-2.1.0+dfsg/debian/not-installed lua-cjson- 2.1.0+dfsg/debian/not-installed --- lua-cjson-2.1.0+dfsg/debian/not-installed 1969-12-31 19:00:00.000000000 -0500 +++ lua-cjson-2.1.0+dfsg/debian/not-installed 2022-11-30 11:26:18.000000000 -0500 @@ -0,0 +1 @@ +usr/lib/*/*.la diff -Nru lua-cjson-2.1.0+dfsg/debian/patches/disable-sparse-array-test lua- cjson-2.1.0+dfsg/debian/patches/disable-sparse-array-test --- lua-cjson-2.1.0+dfsg/debian/patches/disable-sparse-array- test 1969-12-31 19:00:00.000000000 -0500 +++ lua-cjson-2.1.0+dfsg/debian/patches/disable-sparse-array- test 2022-11-30 11:26:18.000000000 -0500 @@ -0,0 +1,18 @@ +diff --git a/tests/test.lua b/tests/test.lua +index 31e7270..5d5c359 100755 +--- a/tests/test.lua ++++ b/tests/test.lua +@@ -289,9 +289,10 @@ local cjson_tests = { + { "Encode sparse table as array #2", + json.encode, { { [1] = "one", [4] = "sparse test" } }, + true, { '["one",null,null,"sparse test"]' } }, +- { "Encode sparse array as object", +- json.encode, { { [1] = "one", [5] = "sparse test" } }, +- true, { '{"1":"one","5":"sparse test"}' } }, ++ -- buggy: the sequence of sparse array cannot be predetermined ++ -- { "Encode sparse array as object", ++ -- json.encode, { { [1] = "one", [5] = "sparse test" } }, ++ -- true, { '{"1":"one","5":"sparse test"}' } }, + { "Encode table with numeric string key as object", + json.encode, { { ["2"] = "numeric string key test" } }, + true, { '{"2":"numeric string key test"}' } }, diff -Nru lua-cjson-2.1.0+dfsg/debian/patches/lua5.2-function-names lua- cjson-2.1.0+dfsg/debian/patches/lua5.2-function-names --- lua-cjson-2.1.0+dfsg/debian/patches/lua5.2-function-names 2012-08-24 09:21:32.000000000 -0400 +++ lua-cjson-2.1.0+dfsg/debian/patches/lua5.2-function-names 2022-11-30 11:26:18.000000000 -0500 @@ -8,7 +8,7 @@ if type1 ~= "table" then - return val1 == val2 + -- Lua 5.2 reports function names more precisely -+ if _VERSION == "Lua 5.2" and type1 == "string" then ++ if _VERSION >= "Lua 5.2" and type1 == "string" then + if val1 == val2 then return true else + local start, stop = string.find(val2, "to '%?'") + if start == nil then return false else diff -Nru lua-cjson-2.1.0+dfsg/debian/patches/lua5.3-unpack lua-cjson- 2.1.0+dfsg/debian/patches/lua5.3-unpack --- lua-cjson-2.1.0+dfsg/debian/patches/lua5.3-unpack 1969-12-31 19:00:00.000000000 -0500 +++ lua-cjson-2.1.0+dfsg/debian/patches/lua5.3-unpack 2022-11-30 11:26:18.000000000 -0500 @@ -0,0 +1,10 @@ +diff --git a/lua/cjson/util.lua b/lua/cjson/util.lua +index 4bbe319..406f81a 100644 +--- a/lua/cjson/util.lua ++++ b/lua/cjson/util.lua +@@ -1,4 +1,5 @@ + local json = require "cjson" ++local unpack = unpack or table.unpack + + -- Various common routines used by the Lua CJSON package + -- diff -Nru lua-cjson-2.1.0+dfsg/debian/patches/series lua-cjson- 2.1.0+dfsg/debian/patches/series --- lua-cjson-2.1.0+dfsg/debian/patches/series 2012-08-24 09:21:32.000000000 -0400 +++ lua-cjson-2.1.0+dfsg/debian/patches/series 2022-11-30 11:26:18.000000000 -0500 @@ -1,2 +1,4 @@ +disable-sparse-array-test disable-utf16-test lua5.2-function-names +lua5.3-unpack diff -Nru lua-cjson-2.1.0+dfsg/debian/rules lua-cjson- 2.1.0+dfsg/debian/rules --- lua-cjson-2.1.0+dfsg/debian/rules 2012-08-24 09:21:32.000000000 -0400 +++ lua-cjson-2.1.0+dfsg/debian/rules 2022-11-30 11:26:18.000000000 -0500 @@ -1,8 +1,9 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + %: dh $@ --buildsystem=lua --with lua -override_dh_clean: - dh_clean - rm -f debian/trash +execute_after_dh_clean: + $(RM) -f debian/trash
signature.asc
Description: This is a digitally signed message part
