Control: tags -1 patch Hi,
I am including additional patches that fix the problem with the first lua 5.3 upload. Also, I would like to request joining the team so I can do the team upload myself. I could not find information on how to apply, so I have requested membership on the salsa group. If there is more to know, please provide some info. Thanks, Bastian
diff -Nru cardpeek-0.8.4/debian/changelog cardpeek-0.8.4/debian/changelog --- cardpeek-0.8.4/debian/changelog 2025-02-13 11:46:27.000000000 +0100 +++ cardpeek-0.8.4/debian/changelog 2025-03-07 22:31:00.000000000 +0100 @@ -1,3 +1,11 @@ +cardpeek (0.8.4-3) unstable; urgency=medium + + * Team upload + * Build with lua 5.3 again (Closes: #1050543) + * Include patches for lua scripts that break with lua 5.3, see #1063333 + + -- Bastian Germann <[email protected]> Fri, 07 Mar 2025 22:31:00 +0100 + cardpeek (0.8.4-2) unstable; urgency=medium * Team upload. diff -Nru cardpeek-0.8.4/debian/control cardpeek-0.8.4/debian/control --- cardpeek-0.8.4/debian/control 2025-02-13 11:46:27.000000000 +0100 +++ cardpeek-0.8.4/debian/control 2025-03-07 22:30:44.000000000 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Package Salvaging Team <[email protected]> Uploaders: Richard Ulrich <[email protected]> -Build-Depends: debhelper-compat (= 13), libluabind-dev, libpcsclite-dev, libgtk-3-dev, libglib2.0-dev, doc-base, libssl-dev, liblua5.2-dev, libcurl4-openssl-dev +Build-Depends: debhelper-compat (= 13), libluabind-dev, libpcsclite-dev, libgtk-3-dev, libglib2.0-dev, doc-base, libssl-dev, liblua5.3-dev, libcurl4-openssl-dev Standards-Version: 4.7.0 Vcs-Browser: https://salsa.debian.org/salvage-team/cardpeek Vcs-Git: https://salsa.debian.org/salvage-team/cardpeek.git diff -Nru cardpeek-0.8.4/debian/patches/0001-apdu.lua-convert-to-integer-atr-output.patch cardpeek-0.8.4/debian/patches/0001-apdu.lua-convert-to-integer-atr-output.patch --- cardpeek-0.8.4/debian/patches/0001-apdu.lua-convert-to-integer-atr-output.patch 1970-01-01 01:00:00.000000000 +0100 +++ cardpeek-0.8.4/debian/patches/0001-apdu.lua-convert-to-integer-atr-output.patch 2025-03-07 22:25:53.000000000 +0100 @@ -0,0 +1,27 @@ +Origin: https://github.com/L1L1/cardpeek/pull/110 +From: =?UTF-8?q?David=20Santamar=C3=ADa=20Rogado?= <[email protected]> +Date: Sat, 8 Feb 2020 21:46:17 +0100 +Subject: [PATCH 1/3] apdu.lua: convert to integer #atr output + +Lua 5.3 changes the way behaves with floats and integers. +To maintain the same output as with Lua 5.2 convert #atr to integer. +This way cold ATR appears as for example 23 instead 23.0. + +Signed-off-by: David Santamaría Rogado <[email protected]> +--- + dot_cardpeek_dir/scripts/lib/apdu.lua | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dot_cardpeek_dir/scripts/lib/apdu.lua b/dot_cardpeek_dir/scripts/lib/apdu.lua +index f139b60..87f1a5a 100644 +--- a/dot_cardpeek_dir/scripts/lib/apdu.lua ++++ b/dot_cardpeek_dir/scripts/lib/apdu.lua +@@ -113,7 +113,7 @@ function card.tree_startup(title) + + atrnode = mycard:append({ classname="atr", + label="cold ATR", +- size=#atr, ++ size=math.tointeger(#atr), + val=atr }) + + if candidates then diff -Nru cardpeek-0.8.4/debian/patches/0002-tachograph.lua-Avoid-errors-over-Lua-5.3.patch cardpeek-0.8.4/debian/patches/0002-tachograph.lua-Avoid-errors-over-Lua-5.3.patch --- cardpeek-0.8.4/debian/patches/0002-tachograph.lua-Avoid-errors-over-Lua-5.3.patch 1970-01-01 01:00:00.000000000 +0100 +++ cardpeek-0.8.4/debian/patches/0002-tachograph.lua-Avoid-errors-over-Lua-5.3.patch 2025-03-07 22:26:11.000000000 +0100 @@ -0,0 +1,67 @@ +Origin: https://github.com/L1L1/cardpeek/pull/110 +From: =?UTF-8?q?David=20Santamar=C3=ADa=20Rogado?= <[email protected]> +Date: Sat, 8 Feb 2020 21:54:22 +0100 +Subject: [PATCH 2/3] tachograph.lua: Avoid errors over Lua 5.3 + +This changes the bare-minimum to let tachograph.lua work over Lua 5.3. +Just the ISO-8859- part converted to integer to avoid conversion be nil +and the hours calculation floored. + +Signed-off-by: David Santamaría Rogado <[email protected]> +--- + dot_cardpeek_dir/scripts/tachograph.lua | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/dot_cardpeek_dir/scripts/tachograph.lua b/dot_cardpeek_dir/scripts/tachograph.lua +index 17d52bc..77663d4 100644 +--- a/dot_cardpeek_dir/scripts/tachograph.lua ++++ b/dot_cardpeek_dir/scripts/tachograph.lua +@@ -281,9 +281,10 @@ end + + function Tacho_TEXT_8859(data,node) + global('iconv') ++ local part = math.tointeger(data[0]) + +- if iconv and data[0]>0 then +- local format = "ISO-8859-"..data[0] ++ if iconv and part>0 then ++ local format = "ISO-8859-"..part + local conversion = iconv.open(format,"UTF-8") + local converted = conversion:iconv(data:sub(1):format("%C")) + if converted then +@@ -292,9 +293,9 @@ function Tacho_TEXT_8859(data,node) + end + end + +- if data[0]==1 then ++ if part==1 then + node:set_attribute("alt",data:sub(1):format("%P")) +- elseif data[0]==0 then ++ elseif part==0 then + node:set_attribute("alt","(empty)") + end + end +@@ -327,7 +328,7 @@ function Tacho_ActivityChangeInfo(data,node) + local time = bit.AND(data:tonumber(),0x07FF) + local sub_node = node:append({ classname='record', + label='Change', +- id=string.format("%02u:%02u",time/60,time%60), ++ id=string.format("%02u:%02u",math.floor(time/60),time%60), + val=data, + size=2 }) + local activity = bit.SHR(bit.AND(data[0],0x18),3) +@@ -452,10 +453,10 @@ function Tacho_ACTIVITY_RECORDS(data,node) + subnode:set_attribute("alt",string.format("%s: %d km\n %dh%02d break, %dh%02d availability, %dh%02d work, %dh%02d drive", + rec_date, + subpart(data,ptr+10,ptr+11):tonumber(), +- cat_total[1]/60, cat_total[1]%60, +- cat_total[2]/60, cat_total[2]%60, +- cat_total[3]/60, cat_total[3]%60, +- cat_total[4]/60, cat_total[4]%60)) ++ math.floor(cat_total[1]/60), cat_total[1]%60, ++ math.floor(cat_total[2]/60), cat_total[2]%60, ++ math.floor(cat_total[3]/60), cat_total[3]%60, ++ math.floor(cat_total[4]/60), cat_total[4]%60)) + else + subnode:set_attribute("alt","(no activity)") + end diff -Nru cardpeek-0.8.4/debian/patches/0003-tachograph.lua-Preserve-with-Lua-5.3-the-same-output.patch cardpeek-0.8.4/debian/patches/0003-tachograph.lua-Preserve-with-Lua-5.3-the-same-output.patch --- cardpeek-0.8.4/debian/patches/0003-tachograph.lua-Preserve-with-Lua-5.3-the-same-output.patch 1970-01-01 01:00:00.000000000 +0100 +++ cardpeek-0.8.4/debian/patches/0003-tachograph.lua-Preserve-with-Lua-5.3-the-same-output.patch 2025-03-07 22:26:29.000000000 +0100 @@ -0,0 +1,71 @@ +Origin: https://github.com/L1L1/cardpeek/pull/110 +From: =?UTF-8?q?David=20Santamar=C3=ADa=20Rogado?= <[email protected]> +Date: Sat, 8 Feb 2020 22:05:21 +0100 +Subject: tachograph.lua: Preserve with Lua 5.3 the same output as with 5.2 + +Just convert to integers some output values to avoid .0 appearing in the output. + +Signed-off-by: David Santamaría Rogado <[email protected]> +--- + dot_cardpeek_dir/scripts/tachograph.lua | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/dot_cardpeek_dir/scripts/tachograph.lua b/dot_cardpeek_dir/scripts/tachograph.lua +index 77663d4..4df1535 100644 +--- a/dot_cardpeek_dir/scripts/tachograph.lua ++++ b/dot_cardpeek_dir/scripts/tachograph.lua +@@ -105,7 +105,7 @@ function Count_NoOfEventsPerType() + end + + function Count_ActivityStructureLength() +- return activityStructureLength ++ return math.tointeger(activityStructureLength) + end + + function Count_NoOfCardVehicleRecords() +@@ -306,7 +306,7 @@ function Tacho_DATEF(data,node) + end + + function Tacho_NUMERIC(data,node) +- node:set_attribute("alt",data:tonumber()) ++ node:set_attribute("alt",math.tointeger(data:tonumber())) + end + + function Tacho_REGION_NUMERIC(data,node) +@@ -413,15 +413,15 @@ function Tacho_ACTIVITY_RECORDS(data,node) + local cat_cur = 0 + local rec_date = os.date("!%d/%m/%Y", subpart(data,ptr+4,ptr+7):tonumber()) + +- subnode = node:append({classname='record',label='CardActivityDailyRecord', size=rec_len, id=counter}) ++ subnode = node:append({classname='record',label='CardActivityDailyRecord', size=math.tointeger(rec_len), id=counter}) + subnode:append({classname='item', + label='activityRecordLength', + val=subpart(data,ptr+2,ptr+3), +- alt=string.format("%d (address:%s)",rec_len,ptr)}) ++ alt=string.format("%d (address:%s)",rec_len,math.tointeger(ptr))}) + subnode:append({classname='item', + label='activityPreviousRecordLength', + val=subpart(data,ptr,ptr+1), +- alt=subpart(data,ptr,ptr+1):tonumber()}) ++ alt=math.tointeger(subpart(data,ptr,ptr+1):tonumber())}) + subnode:append({classname='item', + label='activityRecordDate', + val=subpart(data,ptr+4,ptr+7), +@@ -429,14 +429,14 @@ function Tacho_ACTIVITY_RECORDS(data,node) + subnode:append({classname='item', + label='dailyPresenceCounter', + val=subpart(data,ptr+8,ptr+9), +- alt=subpart(data,ptr+8,ptr+9):tonumber() }) ++ alt=math.tointeger(subpart(data,ptr+8,ptr+9):tonumber()) }) + subnode:append({classname='item', + label='activityDayDistance', + val=subpart(data,ptr+10,ptr+11), +- alt=subpart(data,ptr+10,ptr+11):tonumber() .. " km"}) ++ alt=math.tointeger(subpart(data,ptr+10,ptr+11):tonumber()) .. " km"}) + subsub_node = subnode:append({classname='record', + label='activityChangeInfo', +- size=#activity, ++ size=math.tointeger(#activity), + val=activity}) + + if #activity>0 then diff -Nru cardpeek-0.8.4/debian/patches/series cardpeek-0.8.4/debian/patches/series --- cardpeek-0.8.4/debian/patches/series 2025-02-13 11:46:27.000000000 +0100 +++ cardpeek-0.8.4/debian/patches/series 2025-03-07 22:28:01.000000000 +0100 @@ -1,5 +1,8 @@ +0001-apdu.lua-convert-to-integer-atr-output.patch +0002-tachograph.lua-Avoid-errors-over-Lua-5.3.patch +0003-tachograph.lua-Preserve-with-Lua-5.3-the-same-output.patch lintian_warnings lintian2 -#lua5.3-pkgconf.patch -#lua5.3.patch +lua5.3-pkgconf.patch +lua5.3.patch fix_link_in_manpage.patch
