File v6.2.8...master.patch of Package lua-lyaml
From d1df7a4414c16edeaa4081b338a0ca083e6d6e7d Mon Sep 17 00:00:00 2001
From: "Gary V. Vaughan" <gary@gnu.org>
Date: Sat, 7 Jan 2023 15:38:33 -0700
Subject: [PATCH 1/4] maint: update copyright statements for 2023.
* LICENSE, README.md, build-aux/config.ld.in, ext/yaml/emitter.c,
ext/yaml/lyaml.h, ext/yaml/parser.c, ext/yaml/scanner.c,
ext/yaml/yaml.c, lib/lyaml/explicit.lua, lib/lyaml/functional.lua,
lib/lyaml/implicit.lua, lib/lyaml/init.lua, lukefile,
spec/ext_yaml_emitter_spec.yaml, spec/ext_yaml_parser_spec.yaml,
spec/ext_yaml_scanner_spec.yaml, spec/lib_lyaml_functional_spec.yaml,
spec/lib_lyaml_spec.yaml, spec/spec_helper.lua: Add 2023 to copyright
statements.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---
.github/workflows/spec.yml | 4 +--
LICENSE | 2 -
NEWS.md | 32 ++++++++++++++++++---------
README.md | 2 -
build-aux/config.ld.in | 2 -
build-aux/luke | 42 ++++++++++++++++++------------------
ext/yaml/emitter.c | 2 -
ext/yaml/lyaml.h | 2 -
ext/yaml/parser.c | 2 -
ext/yaml/scanner.c | 2 -
ext/yaml/yaml.c | 6 ++++-
lib/lyaml/explicit.lua | 2 -
lib/lyaml/functional.lua | 2 -
lib/lyaml/implicit.lua | 2 -
lib/lyaml/init.lua | 2 -
lukefile | 2 -
lyaml-6.2.8-1.rockspec | 2 -
spec/ext_yaml_emitter_spec.yaml | 2 -
spec/ext_yaml_parser_spec.yaml | 2 -
spec/ext_yaml_scanner_spec.yaml | 2 -
spec/lib_lyaml_functional_spec.yaml | 2 -
spec/lib_lyaml_spec.yaml | 2 -
spec/spec_helper.lua | 2 -
23 files changed, 68 insertions(+), 54 deletions(-)
Index: lyaml-6.2.8/.github/workflows/spec.yml
===================================================================
--- lyaml-6.2.8.orig/.github/workflows/spec.yml 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/.github/workflows/spec.yml 2026-02-28 02:59:00.821134853 +0100
@@ -18,11 +18,11 @@
steps:
- uses: actions/checkout@v2
- - uses: leafo/gh-actions-lua@v8.0.0
+ - uses: leafo/gh-actions-lua@v12
with:
luaVersion: ${{ matrix.lua-version }}
- - uses: leafo/gh-actions-luarocks@v4.0.0
+ - uses: leafo/gh-actions-luarocks@v6
- name: install
run: |
Index: lyaml-6.2.8/LICENSE
===================================================================
--- lyaml-6.2.8.orig/LICENSE 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/LICENSE 2026-02-28 02:59:00.821417875 +0100
@@ -4,7 +4,7 @@
unless noted otherwise in the body of that file.
====================================================================
-Copyright (C) 2013-2022 Gary V. Vaughan
+Copyright (C) 2013-2023 Gary V. Vaughan
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
Index: lyaml-6.2.8/NEWS.md
===================================================================
--- lyaml-6.2.8.orig/NEWS.md 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/NEWS.md 2026-02-28 02:59:00.821616900 +0100
@@ -1,5 +1,15 @@
# lyaml NEWS - User visible changes
+## Noteworthy changes in release ?.? (????-??-??) [?]
+
+### Bugs Fixed
+
+ - `luke` now uses the same cpp defines for conftests as
+ will be used for module compilation, otherwise we are
+ potestially testing and compiling with different sets
+ of features.
+
+
## Noteworthy changes in release 6.2.8 (2022-10-22) [stable]
### Bug fixes
@@ -13,14 +23,14 @@
## Noteworthy changes in release 6.2.7 (2020-11-27) [stable]
-### Bug fixes
+### Bugs Fixed
- Don't skip YAML entries from mixed key Lua tables.
## Noteworthy changes in release 6.2.6 (2020-08-28) [stable]
-### Bug fixes
+### Bugs Fixed
- `luke` really propagates `LDFLAGS` to module compilation
commands.
@@ -28,7 +38,7 @@
## Noteworthy changes in release 6.2.5 (2020-04-15) [stable]
-### Bug fixes
+### Bugs Fixed
- `luke` really propagates `YAML_BINDIR`, `YAML_DIR`,
`YAML_INCDIR` and `YAML_LIBDIR` to checksymbol test in lukefile
@@ -37,7 +47,7 @@
## Noteworthy changes in release 6.2.4 (2019-07-20) [stable]
-### Bug fixes
+### Bugs Fixed
- `luke` works with upgraded bootstrap luarocks version of
`require`.
@@ -52,7 +62,7 @@
## Noteworthy changes in release 6.2.2 (2018-03-28) [stable]
-### Bug fixes
+### Bugs Fixed
- Remove spurious dependency on `std.normalize` and `std._debug`
libraries.
@@ -60,7 +70,7 @@
## Noteworthy changes in release 6.2.1 (2018-02-20) [stable]
-### Bug fixes
+### Bugs Fixed
- `spec/spec_helper.lua` now looks in the correct objdir
for object modules built by luke, instead of adding unused
@@ -70,7 +80,7 @@
## Noteworthy changes in release 6.2 (2017-11-26) [stable]
-### Bug fixes
+### Bugs Fixed
- `luke` uses the correct spelling of LIBFLAG to match luarocks now.
@@ -81,14 +91,14 @@
## Noteworthy changes in release 6.1.3 (2017-05-29) [stable]
-### Bug fixes
+### Bugs Fixed
- `luke` no longer bombs out with a nil concat error.
## Noteworthy changes in release 6.1.2 (2017-04-30) [stable]
-### Bug fixes
+### Bugs Fixed
- `luke` now propagates `LUA_DIR`, `YAML_INCDIR` and `YAML_LIBDIR`
correctly.
@@ -103,7 +113,7 @@
## Noteworthy changes in release 6.1 (2016-10-08) [stable]
-### Bug fixes
+### Bugs Fixed
- `lyaml.load` now correctly reads implicit null scalars in a YAML
document as an `lyaml.null` reference, identical to the "~"
@@ -171,7 +181,7 @@
} -- END_STREAM
```
-### Bug fixes
+### Bugs Fixed
- Multi-line strings were previously being dumped using single quotes
which caused the dumped YAML to break.
Index: lyaml-6.2.8/README.md
===================================================================
--- lyaml-6.2.8.orig/README.md 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/README.md 2026-02-28 02:59:00.821797801 +0100
@@ -1,7 +1,7 @@
LYAML
=====
-Copyright (C) 2013-2022 Gary V. Vaughan
+Copyright (C) 2013-2023 Gary V. Vaughan
[](https://mit-license.org)
[](https://github.com/gvvaughan/lyaml/actions)
Index: lyaml-6.2.8/build-aux/config.ld.in
===================================================================
--- lyaml-6.2.8.orig/build-aux/config.ld.in 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/build-aux/config.ld.in 2026-02-28 02:59:00.821969373 +0100
@@ -1,6 +1,6 @@
--[[
LYAML binding for Lua 5.1, 5.2, 5.3 & 5.4
- Copyright (C) 2013-2022 Gary V. Vaughan
+ Copyright (C) 2013-2023 Gary V. Vaughan
]]
title = '@package@ @version@ Reference'
Index: lyaml-6.2.8/build-aux/luke
===================================================================
--- lyaml-6.2.8.orig/build-aux/luke 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/build-aux/luke 2026-02-28 02:59:00.822220035 +0100
@@ -17,10 +17,10 @@
end
package.preload['luke.cli']=function()
local _ENV=require'std.normalize'{'luke._base','luke.lukefile','luke.platforms','std.functional',}local function version()print[[
-luke (Luke) 0.2.3
+luke (Luke) 0.3
Written by Gary V. Vaughan <gary@gnu.org>, 2014
-Copyright (C) 2022, Gary V. Vaughan
+Copyright (C) 2023, Gary V. Vaughan
Luke comes with ABSOLUTELY NO WARRANTY.
You may redistribute copies of Luke under the terms of the MIT license;
it may be used for any purpose at absolutely no cost, without permission.
@@ -89,7 +89,7 @@
stderr:write(err..'\n')end
return status,out,err
end
-local function defines(env,deftables)return zip_with(merge({},unpack(deftables)),function(name,value)local fmt=cond({[int(value)==1]='-D%s'},{[match(value,SHELLMETACHARS)~=nil]="-D%s='%s'"},{[true]='-D%s=%s'})return format(fmt,name,value)end)end
+local function defines(...)return zip_with(merge({},unpack(except(list(...),nil))),function(name,value)local fmt=cond({[int(value)==1]='-D%s'},{[match(value,SHELLMETACHARS)~=nil]="-D%s='%s'"},{[true]='-D%s=%s'})return format(fmt,name,value)end)end
local function incdirs(...)return map(flatten(...),function(v)return'-I'..v
end)end
local function libdirs(...)return map(flatten(...),function(v)return'-L'..v
@@ -102,7 +102,7 @@
local function module_to_path(module,sources,objdir)return dropuntil(sources,function(source)return case(source,{['.*%.[ch]']=bind(c_source,{module,objdir}),['(.*%.[ch])%.in']=bind(c_source,{module,objdir}),['.*%.lua']=bind(lua_source,{module}),['(.*%.lua)%.in']=bind(lua_source,{module}),function(src)fatal("unsupported source type '%s'",src)end,})end)end
return{build_c_module=function(L,env,luke,name)local rules=luke.modules[name]local c_module=c_module_path(luke.variables.objdir,name)local command={'$MAKEDIRS',dirname(c_module)}local status,err,out=spawn(env,unpack(command))if status~=0 then
stdout:write(concat(command,' ')..'\n')stderr:write(err..'\n')exit(status)end
-return run(L,env,flatten('$CC $CFLAGS $LIBFLAG $PKGFLAGS $CPPFLAGS',defines(env,except(list(rules.defines,luke.defines),nil)),incdirs(rules.incdirs,luke.incdirs),rules.sources,'-o',c_module,'$LDFLAGS',libdirs(rules.libdirs,luke.libdirs),'$LIBS',rules.libraries,luke.libraries))end,c_modules=function(modules)return filter(keys(modules),function(name)return dropuntil(modules[name].sources,bind(match,{[2]='%.[ch]$'}))end)end,incdirs=incdirs,install_modules=function(L,env,luke,modules)return reduce(keys(modules),0,function(status,name)if status==0 then
+return run(L,env,flatten('$CC $CFLAGS $LIBFLAG $PKGFLAGS $CPPFLAGS',defines(rules.defines,luke.defines),incdirs(rules.incdirs,luke.incdirs),rules.sources,'-o',c_module,'$LDFLAGS',libdirs(rules.libdirs,luke.libdirs),'$LIBS',rules.libraries,luke.libraries))end,c_modules=function(modules)return filter(keys(modules),function(name)return dropuntil(modules[name].sources,bind(match,{[2]='%.[ch]$'}))end)end,defines=defines,incdirs=incdirs,install_modules=function(L,env,luke,modules)return reduce(keys(modules),0,function(status,name)if status==0 then
local src,dir=module_to_path(name,modules[name].sources,luke.variables.objdir)if not exists(interpolate(env,dir))then
status=run(L,env,{'$MAKEDIRS',dir})end
if status==0 then
@@ -112,8 +112,8 @@
end)end,libdirs=libdirs,run_command=run,spawn=spawn,}
end
package.preload['luke.configure']=function()
-local _ENV=require'std.normalize'{'luke._base','luke.compile','luke.environment','std.functional','type.context-manager','type.dict',CCPROGS={'cc','gcc','clang'},}local function logspawn(L,env,...)local status,err=spawn(env,...)if status~=0 and err~=''then
-L.log(err)end
+local _ENV=require'std.normalize'{'luke._base','luke.compile','luke.environment','std.functional','type.context-manager','type.dict',CCPROGS={'cc','gcc','clang'},}local function logspawn(L,env,filename,...)local status,err=spawn(env,...)if status~=0 and err~=''then
+with(File(filename,'r'),function(h)L.log(h.filename..':')L.log(slurp(h))end)L.log(err)end
return status
end
local function checking(L,...)L.verbose('checking ',concat({...},' '),'... ')end
@@ -128,13 +128,13 @@
local function found_result(L,x)L.verbose(x==0 and'yes\n'or'no\n')return x~=0 and 0 or 1
end
local function bindirs(...)return map(flatten(...),function(v)return v..':'end)end
-local function compile_command(L,env,config,filename)local command=flatten('$CC','-c','$CFLAGS',incdirs(config.incdir),'$CPPFLAGS',filename)L.log(interpolate(env,concat(command,' ')))return unpack(command)end
-local function link_command(L,env,config,a_out,source,lib)local command=flatten('$CC','$CFLAGS',incdirs(config.incdir),'$CPPFLAGS','-o',a_out,source,libdirs(config.libdir),'$LDFLAGS',lib,'$libs',CONFIGENV.libs)L.log(interpolate(env,concat(command,' ')))return unpack(command)end
+local function compile_command(L,env,config,filename)local command=flatten('$CC','-c','$CFLAGS',defines(L.luke.defines),incdirs(config.incdir),'$CPPFLAGS',filename)L.log(interpolate(env,concat(command,' ')))return unpack(command)end
+local function link_command(L,env,config,a_out,source,lib)local command=flatten('$CC','$CFLAGS',defines(L.luke.defines),incdirs(config.incdir),'$CPPFLAGS','-o',a_out,source,libdirs(config.libdir),'$LDFLAGS',lib,'$libs',CONFIGENV.libs)L.log(interpolate(env,concat(command,' ')))return unpack(command)end
local function check_executable_in_path(L,env,config,prog)local PATH=concat(bindirs(config.bindir))..getenv('PATH')local found=dropuntil(gmatch(PATH,'[^:]+'),function(path)local progpath=path..'/'..prog
return with(File(progpath,'r'),function(h)return h and isfile(h.context)and progpath or nil
end)end)L.log(found and'found '..found or prog..' not found')return found~=nil
end
-local function check_header_compile(L,env,config,header,extra_hdrs)return with(CTest(),function(conftest)conftest:write(format('%s\n#include "%s"\n',extra_hdrs,header))return logspawn(L,env,compile_command(L,env,config,conftest.filename))end)end
+local function check_header_compile(L,env,config,header,extra_hdrs)return with(CTest(),function(conftest)conftest:write(format('%s\n#include "%s"\n',extra_hdrs,header))conftest:flush()return logspawn(L,env,conftest.filename,compile_command(L,env,config,conftest.filename))end)end
local function check_struct_member_compile(L,env,config,structname,member,extra_hdrs)return with(CTest(),function(conftest)conftest:write(format([[
%s
int main () {
@@ -143,7 +143,7 @@
return 0;
return 0;
}
-]],extra_hdrs,structname,member))return logspawn(L,env,compile_command(L,env,config,conftest.filename))end)end
+]],extra_hdrs,structname,member))conftest:flush()return logspawn(L,env,conftest.filename,compile_command(L,env,config,conftest.filename))end)end
local function try_link(L,env,config,lib,symbol)return with(CTest(),TmpFile(),function(conftest,a_out)conftest:write(format([[
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -152,7 +152,7 @@
int main () {
return %s ();
}
-]],symbol,symbol))return logspawn(L,env,link_command(L,env,config,a_out.filename,conftest.filename,lib))end)end
+]],symbol,symbol))conftest:flush()return logspawn(L,env,conftest.filename,link_command(L,env,config,a_out.filename,conftest.filename,lib))end)end
local function try_compile(L,env,config,headers)return with(CTest(),TmpFile(),function(conftest,a_out)conftest:write(format([[
%s
#if !defined %s || %s == -1
@@ -163,7 +163,7 @@
{
return 0;
}
-]],headers,config.ifdef,config.ifdef))return logspawn(L,env,link_command(L,env,config,a_out.filename,conftest.filename))end)end
+]],headers,config.ifdef,config.ifdef))conftest:flush()return logspawn(L,env,conftest.filename,link_command(L,env,config,a_out.filename,conftest.filename))end)end
local function check_func_decl(L,env,config,fname,extra_hdrs)return with(CTest(),function(conftest)conftest:write(format([[
%s
int
@@ -174,10 +174,10 @@
#endif
return 0;
}
-]],extra_hdrs,fname,fname))return logspawn(L,env,compile_command(L,env,config,conftest.filename))end)end
+]],extra_hdrs,fname,fname))conftest:flush()return logspawn(L,env,conftest.filename,compile_command(L,env,config,conftest.filename))end)end
local function check_func_link(L,env,config,fname)return with(CTest(),TmpFile(),function(conftest,a_out)conftest:write(format([[
/* Define to an innocous variant, in case <limits.h> declares it.
- For example, HP-UX 11i <limits,h> declares gettimeofday. */
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define %s innocuous_%s
/* System header to define __stub macros and hopefully few prototypes,
@@ -208,7 +208,7 @@
int main () {
return %s ();
}
-]],fname,fname,fname,fname,fname,fname,fname))return logspawn(L,env,link_command(L,env,config,a_out.filename,conftest.filename))end)end
+]],fname,fname,fname,fname,fname,fname,fname))conftest:flush()return logspawn(L,env,conftest.filename,link_command(L,env,config,a_out.filename,conftest.filename))end)end
local function add_external_deps(env,config,prefix)if prefix~=nil then
for k,v in next,{bindir='$%s_BINDIR',incdir='$%s_INCDIR',libdir='$%s_LIBDIR'}do
local envvar=interpolate(env,format(v,prefix))if envvar~=''then
@@ -240,7 +240,7 @@
end)or fatal("unable to configure with keys '%s'",concat(keys(config),"', '"))end,function(type)fatal("unsupported configure type '%s'",type)end,})end,})return{config_compiler=function(L,env)local CC=env.CC
if CC==nil then
CC=configure(L,env,{checkprog='C compiler',progs=CCPROGS})env=makeenv(env,{CC=CC})end
-checking(L,interpolate(env,'whether $CC works'))local cm=CTest()local works,err=with(cm,function(conftest)conftest:write('typedef int x;\n')return spawn(env,'$compile',conftest.filename)end)if works~=0 then
+checking(L,interpolate(env,'whether $CC works'))local cm=CTest()local works,err=with(cm,function(conftest)conftest:write('typedef int x;\n')conftest:flush()return spawn(env,'$compile',conftest.filename)end)if works~=0 then
L.verbose'no\n'L.log(interpolate(env,'$compile '..cm.filename))if err and err~=''then
L.log(err)end
fatal('could not find a working C compiler')end
@@ -293,14 +293,14 @@
local _ENV=require'std.normalize'{'luke._base','luke.configure','luke.environment','luke.platforms','std.functional','type.context-manager',}local function has_anykey(t,keylist)return any(map(keylist,function(k)return t[k]~=nil
end))end
local function isconfig(x)return istable(x)and has_anykey(x,configure)end
-local function collect_configs(luke,modulename,configs)configs=configs or{}for k,v in next,luke do
+local function collect_configs(luke,modulename,configs,sectionname)configs=configs or{}for k,v in next,luke do
if isconfig(v)then
-append(configs,{t=luke,k=k,module=modulename})elseif istable(v)then
+append(configs,{t=luke,k=k,module=modulename,section=sectionname})elseif istable(v)then
if k=='modules'or k=='external_dependencies'then
for name,rules in next,v do
-collect_configs(rules,name,configs)end
+collect_configs(rules,name,configs,k)end
else
-collect_configs(v,modulename,configs)end
+collect_configs(v,modulename,configs,sectionname)end
end
end
return configs
@@ -348,7 +348,7 @@
return nil,"Error running file: "..err
end
r=filter_platforms(r)r.external_dependencies=normalize_configs(r.external_dependencies)r.ldocs=normalize_rules(r.ldocs)r.modules=mapvalues(r.modules,normalize_rules)return r
-end,collect_variables=function(luke)return collect_variables(luke,{})end,run_configs=function(L,env,luke)local r=deepcopy(luke)local all_configs=collect_configs(r)sort(all_configs,config_cmp)map(all_configs,function(config)config.t[config.k]=configure(L,env,config.t[config.k],config.module)end)return unwrap_external_dependencies(r)end,run_templates=function(L,env,luke)local r=copy(luke)local rewrite=bind(rewrite_template_files,{L,env})r.modules=mapvalues(r.modules,function(rules)rules.sources=map(rules.sources,rewrite)end)if r.ldocs then
+end,collect_variables=function(luke)return collect_variables(luke,{})end,run_configs=function(L,env,luke)local r=deepcopy(luke)local all_configs=collect_configs(r)sort(all_configs,config_cmp)map(all_configs,function(config)local prefix=case(config.section,{external_dependencies=function()return config.module end,})config.t[config.k]=configure(L,env,config.t[config.k],prefix)end)return unwrap_external_dependencies(r)end,run_templates=function(L,env,luke)local r=copy(luke)local rewrite=bind(rewrite_template_files,{L,env})r.modules=mapvalues(r.modules,function(rules)rules.sources=map(rules.sources,rewrite)end)if r.ldocs then
r.ldocs.sources=map(r.ldocs.sources,rewrite)end
return r
end,}
Index: lyaml-6.2.8/ext/yaml/emitter.c
===================================================================
--- lyaml-6.2.8.orig/ext/yaml/emitter.c 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/ext/yaml/emitter.c 2026-02-28 02:59:00.822587477 +0100
@@ -2,7 +2,7 @@
* emitter.c, LibYAML emitter binding for Lua
* Written by Gary V. Vaughan, 2013
*
- * Copyright (C) 2013-2022 Gary V. Vaughan
+ * Copyright (C) 2013-2023 Gary V. Vaughan
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Index: lyaml-6.2.8/ext/yaml/lyaml.h
===================================================================
--- lyaml-6.2.8.orig/ext/yaml/lyaml.h 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/ext/yaml/lyaml.h 2026-02-28 02:59:00.822884215 +0100
@@ -2,7 +2,7 @@
* lyaml.h, libyaml parser binding for Lua
* Written by Gary V. Vaughan, 2013
*
- * Copyright (C) 2013-2022 Gary V. Vaughan
+ * Copyright (C) 2013-2023 Gary V. Vaughan
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Index: lyaml-6.2.8/ext/yaml/parser.c
===================================================================
--- lyaml-6.2.8.orig/ext/yaml/parser.c 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/ext/yaml/parser.c 2026-02-28 02:59:00.823046721 +0100
@@ -2,7 +2,7 @@
* parser.c, libyaml parser binding for Lua
* Written by Gary V. Vaughan, 2013
*
- * Copyright (C) 2013-2022 Gary V. Vaughan
+ * Copyright (C) 2013-2023 Gary V. Vaughan
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Index: lyaml-6.2.8/ext/yaml/scanner.c
===================================================================
--- lyaml-6.2.8.orig/ext/yaml/scanner.c 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/ext/yaml/scanner.c 2026-02-28 02:59:00.823222512 +0100
@@ -2,7 +2,7 @@
* scanner.c, libyaml scanner binding for Lua
* Written by Gary V. Vaughan, 2013
*
- * Copyright (C) 2013-2022 Gary V. Vaughan
+ * Copyright (C) 2013-2023 Gary V. Vaughan
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Index: lyaml-6.2.8/ext/yaml/yaml.c
===================================================================
--- lyaml-6.2.8.orig/ext/yaml/yaml.c 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/ext/yaml/yaml.c 2026-02-28 02:59:00.823394516 +0100
@@ -2,7 +2,7 @@
* yaml.c, LibYAML binding for Lua
* Written by Andrew Danforth, 2009
*
- * Copyright (C) 2014-2022 Gary V. Vaughan
+ * Copyright (C) 2014-2023 Gary V. Vaughan
* Copyright (C) 2009 Andrew Danforth
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -57,7 +57,11 @@
parser_init (L);
scanner_init (L);
+#if LUA_VERSION_NUM >= 502
+ luaL_newlib(L, R);
+#else
luaL_register(L, "yaml", R);
+#endif
lua_pushliteral(L, MYVERSION);
lua_setfield(L, -2, "version");
Index: lyaml-6.2.8/lib/lyaml/explicit.lua
===================================================================
--- lyaml-6.2.8.orig/lib/lyaml/explicit.lua 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/lib/lyaml/explicit.lua 2026-02-28 02:59:00.823541833 +0100
@@ -1,7 +1,7 @@
-- LYAML parse explicit token values.
-- Written by Gary V. Vaughan, 2015
--
--- Copyright(C) 2015-2022 Gary V. Vaughan
+-- Copyright(C) 2015-2023 Gary V. Vaughan
--
-- Permission is hereby granted, free of charge, to any person obtaining
-- a copy of this software and associated documentation files(the
Index: lyaml-6.2.8/lib/lyaml/functional.lua
===================================================================
--- lyaml-6.2.8.orig/lib/lyaml/functional.lua 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/lib/lyaml/functional.lua 2026-02-28 02:59:00.823737692 +0100
@@ -1,7 +1,7 @@
-- Minimal functional programming utilities.
-- Written by Gary V. Vaughan, 2015
--
--- Copyright(C) 2015-2022 Gary V. Vaughan
+-- Copyright(C) 2015-2023 Gary V. Vaughan
--
-- Permission is hereby granted, free of charge, to any person obtaining
-- a copy of this software and associated documentation files(the
Index: lyaml-6.2.8/lib/lyaml/implicit.lua
===================================================================
--- lyaml-6.2.8.orig/lib/lyaml/implicit.lua 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/lib/lyaml/implicit.lua 2026-02-28 02:59:00.823928902 +0100
@@ -1,7 +1,7 @@
-- LYAML parse implicit type tokens.
-- Written by Gary V. Vaughan, 2015
--
--- Copyright(C) 2015-2022 Gary V. Vaughan
+-- Copyright(C) 2015-2023 Gary V. Vaughan
--
-- Permission is hereby granted, free of charge, to any person obtaining
-- a copy of this software and associated documentation files(the
Index: lyaml-6.2.8/lib/lyaml/init.lua
===================================================================
--- lyaml-6.2.8.orig/lib/lyaml/init.lua 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/lib/lyaml/init.lua 2026-02-28 02:59:00.824097369 +0100
@@ -1,7 +1,7 @@
-- Transform between YAML 1.1 streams and Lua table representations.
-- Written by Gary V. Vaughan, 2013
--
--- Copyright(C) 2013-2022 Gary V. Vaughan
+-- Copyright(C) 2013-2023 Gary V. Vaughan
--
-- Permission is hereby granted, free of charge, to any person obtaining
-- a copy of this software and associated documentation files(the
Index: lyaml-6.2.8/lukefile
===================================================================
--- lyaml-6.2.8.orig/lukefile 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/lukefile 2026-02-28 02:59:00.824266998 +0100
@@ -1,6 +1,6 @@
--[[
LYAML binding for Lua 5.1, 5.2, 5.3 & 5.4
- Copyright (C) 2013-2022 Gary V. Vaughan
+ Copyright (C) 2013-2023 Gary V. Vaughan
]]
package = 'lyaml'
Index: lyaml-6.2.8/lyaml-6.2.8-1.rockspec
===================================================================
--- lyaml-6.2.8.orig/lyaml-6.2.8-1.rockspec 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/lyaml-6.2.8-1.rockspec 2026-02-28 02:59:20.194087167 +0100
@@ -16,7 +16,7 @@
}
dependencies = {
- 'lua >= 5.1, < 5.5',
+ 'lua >= 5.1, < 5.6',
}
external_dependencies = {
Index: lyaml-6.2.8/spec/ext_yaml_emitter_spec.yaml
===================================================================
--- lyaml-6.2.8.orig/spec/ext_yaml_emitter_spec.yaml 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/spec/ext_yaml_emitter_spec.yaml 2026-02-28 02:59:00.824440805 +0100
@@ -1,5 +1,5 @@
# LYAML binding for Lua 5.1, 5.2, 5.3 & 5.4
-# Copyright (C) 2013-2022 Gary V. Vaughan
+# Copyright (C) 2013-2023 Gary V. Vaughan
specify emitting:
- it diagnoses an invalid event:
Index: lyaml-6.2.8/spec/ext_yaml_parser_spec.yaml
===================================================================
--- lyaml-6.2.8.orig/spec/ext_yaml_parser_spec.yaml 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/spec/ext_yaml_parser_spec.yaml 2026-02-28 02:59:00.824675948 +0100
@@ -1,5 +1,5 @@
# LYAML binding for Lua 5.1, 5.2, 5.3 & 5.4
-# Copyright (C) 2013-2022 Gary V. Vaughan
+# Copyright (C) 2013-2023 Gary V. Vaughan
specify parsing:
- it parses empty streams:
Index: lyaml-6.2.8/spec/ext_yaml_scanner_spec.yaml
===================================================================
--- lyaml-6.2.8.orig/spec/ext_yaml_scanner_spec.yaml 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/spec/ext_yaml_scanner_spec.yaml 2026-02-28 02:59:00.824858191 +0100
@@ -1,5 +1,5 @@
# LYAML binding for Lua 5.1, 5.2, 5.3 & 5.4
-# Copyright (C) 2013-2022 Gary V. Vaughan
+# Copyright (C) 2013-2023 Gary V. Vaughan
before:
function consume (n, str)
Index: lyaml-6.2.8/spec/lib_lyaml_functional_spec.yaml
===================================================================
--- lyaml-6.2.8.orig/spec/lib_lyaml_functional_spec.yaml 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/spec/lib_lyaml_functional_spec.yaml 2026-02-28 02:59:00.825034342 +0100
@@ -1,5 +1,5 @@
# LYAML binding for Lua 5.1, 5.2, 5.3 & 5.4
-# Copyright (C) 2013-2022 Gary V. Vaughan
+# Copyright (C) 2013-2023 Gary V. Vaughan
before:
this_module = 'lyaml.functional'
Index: lyaml-6.2.8/spec/lib_lyaml_spec.yaml
===================================================================
--- lyaml-6.2.8.orig/spec/lib_lyaml_spec.yaml 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/spec/lib_lyaml_spec.yaml 2026-02-28 02:59:00.825188482 +0100
@@ -1,5 +1,5 @@
# LYAML binding for Lua 5.1, 5.2, 5.3 & 5.4
-# Copyright (C) 2013-2022 Gary V. Vaughan
+# Copyright (C) 2013-2023 Gary V. Vaughan
before: |
lyaml = require "lyaml"
Index: lyaml-6.2.8/spec/spec_helper.lua
===================================================================
--- lyaml-6.2.8.orig/spec/spec_helper.lua 2022-10-23 02:14:27.000000000 +0200
+++ lyaml-6.2.8/spec/spec_helper.lua 2026-02-28 02:59:00.825490902 +0100
@@ -1,6 +1,6 @@
--[[
LYAML binding for Lua 5.1, 5.2, 5.3 & 5.4
- Copyright (C) 2013-2022 Gary V. Vaughan
+ Copyright (C) 2013-2023 Gary V. Vaughan
]]
do
