From d5a5c094f0dff2f27928483a9b927e02f8d8612f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20R=C3=BChsen?= Date: Sun, 5 Jul 2026 22:53:35 +0200 Subject: [PATCH] Simplify license headers --- .gitignore | 1 + COPYING | 20 +------------------ LICENSE | 3 ++- NEWS | 8 +++++++- configure.ac | 4 +++- fuzz/fuzzer.h | 21 +++----------------- fuzz/libpsl_fuzzer.c | 21 +++----------------- fuzz/libpsl_load_dafsa_fuzzer.c | 21 +++----------------- fuzz/libpsl_load_fuzzer.c | 21 +++----------------- fuzz/main.c | 21 +++----------------- fuzz/run-afl.sh | 20 ++----------------- fuzz/run-clang.sh | 20 ++----------------- include/libpsl.h.in | 5 +---- include/meson.build | 14 ++++++------- meson.build | 7 +++++++ src/psl.c | 25 +++--------------------- tests/common.c | 21 +++----------------- tests/common.h | 21 +++----------------- tests/test-is-cookie-domain-acceptable.c | 25 +++--------------------- tests/test-is-public-all.c | 25 +++--------------------- tests/test-is-public-builtin.c | 25 +++--------------------- tests/test-is-public.c | 25 +++--------------------- tests/test-registrable-domain.c | 25 +++--------------------- tools/meson.build | 7 ++++++- tools/{psl.1 => psl.1.in} | 4 ++-- tools/psl.c | 25 +++--------------------- 26 files changed, 83 insertions(+), 352 deletions(-) mode change 100644 => 120000 COPYING rename tools/{psl.1 => psl.1.in} (92%) diff --git a/.gitignore b/.gitignore index 9ca30f36..03ceaf09 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ tests/test-is-public-builtin tests/test-is-tld tests/test-registrable-domain tools/psl +tools/psl.1 diff --git a/COPYING b/COPYING deleted file mode 100644 index 85945e76..00000000 --- a/COPYING +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (C) 2014-2024 Tim Rühsen - -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. diff --git a/COPYING b/COPYING new file mode 120000 index 00000000..7a694c96 --- /dev/null +++ b/COPYING @@ -0,0 +1 @@ +LICENSE \ No newline at end of file diff --git a/LICENSE b/LICENSE index 85945e76..6207b504 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ -Copyright (C) 2014-2024 Tim Rühsen +Copyright (C) Tim Rühsen and Libpsl Contributors. +See Git history for individual modification years. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/NEWS b/NEWS index e5d5c305..933e01e5 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,10 @@ -Copyright (C) 2014-2026 Tim Rühsen +/* + * SPDX-License-Identifier: MIT + * + * See the LICENSE file in the root directory for details and copyrights. + * + * This file is part of libpsl. + */ 24.06.2026 Release V0.22.0 * Allow building from tarball without Python diff --git a/configure.ac b/configure.ac index aba60763..8b7ccc8c 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,9 @@ AC_SUBST([LIBPSL_VERSION_MAJOR], [$(echo $VERSION | cut -d'.' -f1)]) AC_SUBST([LIBPSL_VERSION_MINOR], [$(echo $VERSION | cut -d'.' -f2)]) AC_SUBST([LIBPSL_VERSION_PATCH], [$(echo $VERSION | cut -d'.' -f3)]) AC_SUBST([LIBPSL_VERSION_NUMBER], [$(printf '0x%02x%02x%02x' $LIBPSL_VERSION_MAJOR $LIBPSL_VERSION_MINOR $LIBPSL_VERSION_PATCH)]) -AC_CONFIG_FILES([include/libpsl.h]) +AC_SUBST([COPYRIGHT_MONTH], [$(date +%B)]) +AC_SUBST([COPYRIGHT_YEAR], [$(date +%Y)]) +AC_CONFIG_FILES([include/libpsl.h tools/psl.1]) dnl dnl Gettext diff --git a/fuzz/fuzzer.h b/fuzz/fuzzer.h index cbe65c74..2fd00079 100644 --- a/fuzz/fuzzer.h +++ b/fuzz/fuzzer.h @@ -1,25 +1,10 @@ /* - * Copyright(c) 2017-2024 Tim Ruehsen + * SPDX-License-Identifier: MIT * - * 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. + * See the LICENSE file in the root directory for details and copyrights. * * This file is part of libpsl. + * */ #include diff --git a/fuzz/libpsl_fuzzer.c b/fuzz/libpsl_fuzzer.c index 22514c57..a3f9264c 100644 --- a/fuzz/libpsl_fuzzer.c +++ b/fuzz/libpsl_fuzzer.c @@ -1,25 +1,10 @@ /* - * Copyright(c) 2017-2024 Tim Ruehsen + * SPDX-License-Identifier: MIT * - * 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. + * See the LICENSE file in the root directory for details and copyrights. * * This file is part of libpsl. + * */ #include diff --git a/fuzz/libpsl_load_dafsa_fuzzer.c b/fuzz/libpsl_load_dafsa_fuzzer.c index 0abcb34c..3c6e770d 100644 --- a/fuzz/libpsl_load_dafsa_fuzzer.c +++ b/fuzz/libpsl_load_dafsa_fuzzer.c @@ -1,25 +1,10 @@ /* - * Copyright(c) 2017-2024 Tim Ruehsen + * SPDX-License-Identifier: MIT * - * 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. + * See the LICENSE file in the root directory for details and copyrights. * * This file is part of libpsl. + * */ #include diff --git a/fuzz/libpsl_load_fuzzer.c b/fuzz/libpsl_load_fuzzer.c index aa0ac2a7..d40e2c7c 100644 --- a/fuzz/libpsl_load_fuzzer.c +++ b/fuzz/libpsl_load_fuzzer.c @@ -1,25 +1,10 @@ /* - * Copyright(c) 2017-2024 Tim Ruehsen + * SPDX-License-Identifier: MIT * - * 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. + * See the LICENSE file in the root directory for details and copyrights. * * This file is part of libpsl. + * */ #include diff --git a/fuzz/main.c b/fuzz/main.c index 7fe2bab0..bb160de3 100644 --- a/fuzz/main.c +++ b/fuzz/main.c @@ -1,25 +1,10 @@ /* - * Copyright(c) 2017-2024 Tim Ruehsen + * SPDX-License-Identifier: MIT * - * 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. + * See the LICENSE file in the root directory for details and copyrights. * * This file is part of libpsl. + * */ #include diff --git a/fuzz/run-afl.sh b/fuzz/run-afl.sh index b1e94753..c6412028 100755 --- a/fuzz/run-afl.sh +++ b/fuzz/run-afl.sh @@ -1,24 +1,8 @@ #!/bin/sh -eu # -# Copyright(c) 2017-2024 Tim Ruehsen +# SPDX-License-Identifier: MIT # -# 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. +# See the LICENSE file in the root directory for details and copyrights. # # This file is part of libpsl. diff --git a/fuzz/run-clang.sh b/fuzz/run-clang.sh index 9bbdb356..f16995cd 100755 --- a/fuzz/run-clang.sh +++ b/fuzz/run-clang.sh @@ -1,24 +1,8 @@ #!/bin/bash -e # -# Copyright(c) 2017-2024 Tim Ruehsen +# SPDX-License-Identifier: MIT # -# 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. +# See the LICENSE file in the root directory for details and copyrights. # # This file is part of libpsl. diff --git a/include/libpsl.h.in b/include/libpsl.h.in index 0ae1fafa..05bec18e 100644 --- a/include/libpsl.h.in +++ b/include/libpsl.h.in @@ -1,5 +1,5 @@ /* - * Copyright(c) 2014-2024 Tim Ruehsen + * Copyright (C) 2014-@COPYRIGHT_YEAR@ Tim Rühsen and Libpsl Contributors. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -23,9 +23,6 @@ * * Header file for libpsl library routines * - * Changelog - * 20.03.2014 Tim Ruehsen created - * */ #ifndef LIBPSL_LIBPSL_H diff --git a/include/meson.build b/include/meson.build index ea6075fe..59f24b29 100644 --- a/include/meson.build +++ b/include/meson.build @@ -4,15 +4,15 @@ major = version_arr[0].to_int() minor = version_arr[1].to_int() patch = version_arr[2].to_int() -cdata = configuration_data() -cdata.set('LIBPSL_VERSION', version) -cdata.set('LIBPSL_VERSION_MAJOR', major) -cdata.set('LIBPSL_VERSION_MINOR', minor) -cdata.set('LIBPSL_VERSION_PATCH', patch) +# Extend shared _cdata from parent scope with version defines +_cdata.set('LIBPSL_VERSION', version) +_cdata.set('LIBPSL_VERSION_MAJOR', major) +_cdata.set('LIBPSL_VERSION_MINOR', minor) +_cdata.set('LIBPSL_VERSION_PATCH', patch) hex = '0123456789abcdef' ver = '0x@0@@1@@2@@3@@4@@5@' -cdata.set('LIBPSL_VERSION_NUMBER', +_cdata.set('LIBPSL_VERSION_NUMBER', ver.format( hex[major / 16], hex[major % 16], hex[minor / 16], hex[minor % 16], @@ -21,6 +21,6 @@ cdata.set('LIBPSL_VERSION_NUMBER', libpsl_h = configure_file( input : 'libpsl.h.in', output : 'libpsl.h', - configuration : cdata) + configuration : _cdata) install_headers(libpsl_h) diff --git a/meson.build b/meson.build index 29c49a00..1e46d069 100644 --- a/meson.build +++ b/meson.build @@ -154,6 +154,13 @@ if cc.get_id() == 'msvc' endif endif +# Shared configuration data for copyright date and version +_cdata = configuration_data() +_cdata.set('PACKAGE_VERSION', meson.project_version()) +copyright_date = run_command(['date', '+%B %Y'], check: true).stdout().strip() +_cdata.set('COPYRIGHT_MONTH', copyright_date.split()[0]) +_cdata.set('COPYRIGHT_YEAR', copyright_date.split()[1]) + subdir('include') subdir('src') subdir('tools') diff --git a/src/psl.c b/src/psl.c index 57b6742d..133b93b8 100644 --- a/src/psl.c +++ b/src/psl.c @@ -1,31 +1,12 @@ /* - * Copyright(c) 2014-2024 Tim Ruehsen - * - * 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. + * SPDX-License-Identifier: MIT + * + * See the LICENSE file in the root directory for details and copyrights. * * This file is part of libpsl. * * Public Suffix List routines * - * Changelog - * 19.03.2014 Tim Ruehsen created from libmget/cookie.c - * */ #if HAVE_CONFIG_H diff --git a/tests/common.c b/tests/common.c index e7d1c9cd..c04515b9 100644 --- a/tests/common.c +++ b/tests/common.c @@ -1,25 +1,10 @@ /* - * Copyright(c) 2014-2024 Tim Ruehsen + * SPDX-License-Identifier: MIT * - * 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: + * See the LICENSE file in the root directory for details and copyrights. * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. + * This file is part of libpsl. * - * 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. - * - * This file is part of the test suite of libpsl. */ #include /* snprintf */ diff --git a/tests/common.h b/tests/common.h index fa76fee0..ecf8f166 100644 --- a/tests/common.h +++ b/tests/common.h @@ -1,25 +1,10 @@ /* - * Copyright(c) 2014-2024 Tim Ruehsen + * SPDX-License-Identifier: MIT * - * 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: + * See the LICENSE file in the root directory for details and copyrights. * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. + * This file is part of libpsl. * - * 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. - * - * This file is part of the test suite of libpsl. */ #ifndef COMMON_H diff --git a/tests/test-is-cookie-domain-acceptable.c b/tests/test-is-cookie-domain-acceptable.c index 7bf4f117..4df5bd7a 100644 --- a/tests/test-is-cookie-domain-acceptable.c +++ b/tests/test-is-cookie-domain-acceptable.c @@ -1,31 +1,12 @@ /* - * Copyright(c) 2014-2024 Tim Ruehsen + * SPDX-License-Identifier: MIT * - * 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: + * See the LICENSE file in the root directory for details and copyrights. * - * 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. - * - * This file is part of the test suite of libpsl. + * This file is part of libpsl. * * Test case for psl_is_cookie_doamin_acceptable() * - * Changelog - * 15.04.2014 Tim Ruehsen created from libmget/cookie.c - * */ #if HAVE_CONFIG_H diff --git a/tests/test-is-public-all.c b/tests/test-is-public-all.c index ac08092c..22b86115 100644 --- a/tests/test-is-public-all.c +++ b/tests/test-is-public-all.c @@ -1,31 +1,12 @@ /* - * Copyright(c) 2014-2024 Tim Ruehsen + * SPDX-License-Identifier: MIT * - * 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: + * See the LICENSE file in the root directory for details and copyrights. * - * 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. - * - * This file is part of the test suite of libpsl. + * This file is part of libpsl. * * Test psl_is_public_suffix() for all entries in public_suffix_list.dat * - * Changelog - * 19.03.2014 Tim Ruehsen created - * */ #if HAVE_CONFIG_H diff --git a/tests/test-is-public-builtin.c b/tests/test-is-public-builtin.c index dde7e716..f2fea5b5 100644 --- a/tests/test-is-public-builtin.c +++ b/tests/test-is-public-builtin.c @@ -1,31 +1,12 @@ /* - * Copyright(c) 2014-2024 Tim Ruehsen + * SPDX-License-Identifier: MIT * - * 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: + * See the LICENSE file in the root directory for details and copyrights. * - * 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. - * - * This file is part of the test suite of libpsl. + * This file is part of libpsl. * * Test case for psl built-in functions * - * Changelog - * 19.03.2014 Tim Ruehsen created from libmget/cookie.c - * */ #if HAVE_CONFIG_H diff --git a/tests/test-is-public.c b/tests/test-is-public.c index eaaa26a3..e568e828 100644 --- a/tests/test-is-public.c +++ b/tests/test-is-public.c @@ -1,31 +1,12 @@ /* - * Copyright(c) 2014-2024 Tim Ruehsen + * SPDX-License-Identifier: MIT * - * 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: + * See the LICENSE file in the root directory for details and copyrights. * - * 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. - * - * This file is part of the test suite of libpsl. + * This file is part of libpsl. * * Test case for psl_load_file(), psl_is_public_suffix(), psl_free() * - * Changelog - * 19.03.2014 Tim Ruehsen created from libmget/cookie.c - * */ #if HAVE_CONFIG_H diff --git a/tests/test-registrable-domain.c b/tests/test-registrable-domain.c index 8c7d13bd..424979f5 100644 --- a/tests/test-registrable-domain.c +++ b/tests/test-registrable-domain.c @@ -1,31 +1,12 @@ /* - * Copyright(c) 2014-2024 Tim Ruehsen + * SPDX-License-Identifier: MIT * - * 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: + * See the LICENSE file in the root directory for details and copyrights. * - * 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. - * - * This file is part of the test suite of libpsl. + * This file is part of libpsl. * * Test psl_registered_domain() for all entries in test_psl.dat * - * Changelog - * 26.03.2014 Tim Ruehsen created - * */ #if HAVE_CONFIG_H diff --git a/tools/meson.build b/tools/meson.build index e2ea10a3..ba46537b 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -6,4 +6,9 @@ psl = executable('psl', 'psl.c', install : true, ) -install_man('psl.1') +psl_man = configure_file( + input : 'psl.1.in', + output : 'psl.1', + configuration : _cdata) + +install_man(psl_man) diff --git a/tools/psl.1 b/tools/psl.1.in similarity index 92% rename from tools/psl.1 rename to tools/psl.1.in index 079d53b5..56f9dcb0 100644 --- a/tools/psl.1 +++ b/tools/psl.1.in @@ -1,4 +1,4 @@ -.TH PSL "1" "July 2016" "psl 0.13.0" "User Commands" +.TH PSL "1" "@COPYRIGHT_MONTH@ @COPYRIGHT_YEAR@" "psl @PACKAGE_VERSION@" "User Commands" .SH NAME psl \- Explore the Public Suffix List .SH SYNOPSIS @@ -61,7 +61,7 @@ load PSL data from file https://publicsuffix.org/ https://github.com/rockdaboot/libpsl .SH COPYRIGHT -libpsl and `psl' are copyright \(co 2014\-2016 Tim Ruehsen under an +libpsl and `psl' are copyright \(co Tim Rühsen and Libpsl contributors under an MIT-style License. .br This documentation was written by Daniel Kahn Gillmor for the Debian diff --git a/tools/psl.c b/tools/psl.c index fe175a9a..0b5b678d 100644 --- a/tools/psl.c +++ b/tools/psl.c @@ -1,31 +1,12 @@ /* - * Copyright(c) 2014-2024 Tim Ruehsen + * SPDX-License-Identifier: MIT * - * 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. + * See the LICENSE file in the root directory for details and copyrights. * * This file is part of libpsl. * * Using the libpsl functions via command line * - * Changelog - * 11.04.2014 Tim Ruehsen created - * */ #if HAVE_CONFIG_H @@ -161,7 +142,7 @@ int main(int argc, const char *const *argv) printf("psl %s (0x%06x)\n", PACKAGE_VERSION, psl_check_version_number(0)); printf("libpsl %s\n", psl_get_version()); printf("\n"); - printf("Copyright (C) 2014-2024 Tim Ruehsen\n"); + printf("Copyright (C) Tim Ruehsen and Libpsl Contributors\n"); printf("License: MIT\n"); exit(0); }