From 24fa196ae8878b804fc2f8b3760de1f54c7439a7 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 14 Jul 2022 22:23:17 +0200 Subject: [PATCH 1/3] .mailmap: Add Martin Ettl --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 3a112254..4475f60b 100644 --- a/.mailmap +++ b/.mailmap @@ -7,6 +7,7 @@ José Gutiérrez de la Concha Karl Waclawek Karl Waclawek Kishore Kunche +Martin Ettl Rhodri James Rolf Eike Beer Sebastian Pipping From 39b2e99355039626438d48a4eca6aacba2b44d5e Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 14 Jul 2022 22:19:15 +0200 Subject: [PATCH 2/3] Sync file headers --- appveyor.yml | 2 +- expat/COPYING | 2 +- expat/lib/xmltok.c | 1 + expat/lib/xmltok_impl.c | 1 + expat/xmlwf/win32filemap.c | 1 + expat/xmlwf/xmlwf.c | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index cf9b9339..22d6fdc6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ # |_| XML parser # # Copyright (c) 2017 José Gutiérrez de la Concha -# Copyright (c) 2017-2021 Sebastian Pipping +# Copyright (c) 2017-2022 Sebastian Pipping # Copyright (c) 2017 Franek Korta # Licensed under the MIT license: # diff --git a/expat/COPYING b/expat/COPYING index 3c0142e7..ce9e5939 100644 --- a/expat/COPYING +++ b/expat/COPYING @@ -1,5 +1,5 @@ Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper -Copyright (c) 2001-2019 Expat maintainers +Copyright (c) 2001-2022 Expat maintainers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c index 5a331ed5..2b7012a5 100644 --- a/expat/lib/xmltok.c +++ b/expat/lib/xmltok.c @@ -21,6 +21,7 @@ Copyright (c) 2017 José Gutiérrez de la Concha Copyright (c) 2019 David Loffredo Copyright (c) 2021 Dong-hee Na + Copyright (c) 2022 Martin Ettl Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/lib/xmltok_impl.c b/expat/lib/xmltok_impl.c index 9c319a5a..1971d74b 100644 --- a/expat/lib/xmltok_impl.c +++ b/expat/lib/xmltok_impl.c @@ -16,6 +16,7 @@ Copyright (c) 2018 Anton Maklakov Copyright (c) 2019 David Loffredo Copyright (c) 2020 Boris Kolpackov + Copyright (c) 2022 Martin Ettl Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/xmlwf/win32filemap.c b/expat/xmlwf/win32filemap.c index 51634c42..a0ed75be 100644 --- a/expat/xmlwf/win32filemap.c +++ b/expat/xmlwf/win32filemap.c @@ -10,6 +10,7 @@ Copyright (c) 2000 Clark Cooper Copyright (c) 2002 Fred L. Drake, Jr. Copyright (c) 2016-2017 Sebastian Pipping + Copyright (c) 2022 Martin Ettl Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/xmlwf/xmlwf.c b/expat/xmlwf/xmlwf.c index 3a6b8bad..471f2a20 100644 --- a/expat/xmlwf/xmlwf.c +++ b/expat/xmlwf/xmlwf.c @@ -17,6 +17,7 @@ Copyright (c) 2020 Joe Orton Copyright (c) 2020 Kleber Tarcísio Copyright (c) 2021 Tim Bray + Copyright (c) 2022 Martin Ettl Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining From 34f57a0b3033bd6eff689e613ebf3eed56b2d1c7 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 14 Jul 2022 22:27:25 +0200 Subject: [PATCH 3/3] COPYING: cp expat/COPYING ./ --- COPYING | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..ce9e5939 --- /dev/null +++ b/COPYING @@ -0,0 +1,21 @@ +Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper +Copyright (c) 2001-2022 Expat maintainers + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +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.