From 7978e8b8f11255127dd6ef05052b8cafe6d8f837 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Mon, 29 Jul 2019 19:11:39 +0200 Subject: [PATCH 1/2] Fix #78349: Bundled pcre2 library missing LICENCE file The PCRE library is noted in short on two places: - README.REDIST.BINS - CONTRIBUTING.md so contributors know where to send patches to upstream and users are now also more familiar with its LICENSE and basic info. Other documentation related files are not included since they might get outdated soon. Links to upstream location is better way to note its usage, their authors and its license. --- README.REDIST.BINS | 100 +------------------------------------- ext/pcre/pcre2lib/LICENCE | 94 +++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 99 deletions(-) create mode 100644 ext/pcre/pcre2lib/LICENCE diff --git a/README.REDIST.BINS b/README.REDIST.BINS index 717cb554be901..e6146814b62d6 100644 --- a/README.REDIST.BINS +++ b/README.REDIST.BINS @@ -1,6 +1,6 @@ 1. libmagic (ext/fileinfo) see ext/fileinfo/libmagic/LICENSE 2. libmbfl (ext/mbstring) see ext/mbstring/libmbfl/LICENSE - 3. pcre2lib (ext/pcre) + 3. pcre2lib (ext/pcre) see ext/pcre/pcre2lib/LICENSE 4. ext/standard crypt 5. ext/standard crypt's blowfish implementation 6. ext/standard/rand @@ -18,104 +18,6 @@ 18. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP -3. pcre2lib (ext/pcre) - -PCRE2 LICENCE -------------- - -PCRE2 is a library of functions to support regular expressions whose syntax -and semantics are as close as possible to those of the Perl 5 language. - -Release 10 of PCRE2 is distributed under the terms of the "BSD" licence, as -specified below, with one exemption for certain binary redistributions. The -documentation for PCRE2, supplied in the "doc" directory, is distributed under -the same terms as the software itself. The data in the testdata directory is -not copyrighted and is in the public domain. - -The basic library functions are written in C and are freestanding. Also -included in the distribution is a just-in-time compiler that can be used to -optimize pattern matching. This is an optional feature that can be omitted when -the library is built. - - -THE BASIC LIBRARY FUNCTIONS ---------------------------- - -Written by: Philip Hazel -Email local part: ph10 -Email domain: cam.ac.uk - -University of Cambridge Computing Service, -Cambridge, England. - -Copyright (c) 1997-2018 University of Cambridge -All rights reserved. - - -PCRE2 JUST-IN-TIME COMPILATION SUPPORT --------------------------------------- - -Written by: Zoltan Herczeg -Email local part: hzmester -Emain domain: freemail.hu - -Copyright(c) 2010-2018 Zoltan Herczeg -All rights reserved. - - -STACK-LESS JUST-IN-TIME COMPILER --------------------------------- - -Written by: Zoltan Herczeg -Email local part: hzmester -Emain domain: freemail.hu - -Copyright(c) 2009-2018 Zoltan Herczeg -All rights reserved. - - -THE "BSD" LICENCE ------------------ - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notices, - this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notices, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the University of Cambridge nor the names of any - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - - -EXEMPTION FOR BINARY LIBRARY-LIKE PACKAGES ------------------------------------------- - -The second condition in the BSD licence (covering binary redistributions) does -not apply all the way down a chain of software. If binary package A includes -PCRE2, it must respect the condition, but if package B is software that -includes package A, the condition is not imposed on package B unless it uses -PCRE2 independently. - -End - - 4. ext/standard crypt FreeSec: libcrypt for NetBSD diff --git a/ext/pcre/pcre2lib/LICENCE b/ext/pcre/pcre2lib/LICENCE new file mode 100644 index 0000000000000..142b3b3f9adbc --- /dev/null +++ b/ext/pcre/pcre2lib/LICENCE @@ -0,0 +1,94 @@ +PCRE2 LICENCE +------------- + +PCRE2 is a library of functions to support regular expressions whose syntax +and semantics are as close as possible to those of the Perl 5 language. + +Releases 10.00 and above of PCRE2 are distributed under the terms of the "BSD" +licence, as specified below, with one exemption for certain binary +redistributions. The documentation for PCRE2, supplied in the "doc" directory, +is distributed under the same terms as the software itself. The data in the +testdata directory is not copyrighted and is in the public domain. + +The basic library functions are written in C and are freestanding. Also +included in the distribution is a just-in-time compiler that can be used to +optimize pattern matching. This is an optional feature that can be omitted when +the library is built. + + +THE BASIC LIBRARY FUNCTIONS +--------------------------- + +Written by: Philip Hazel +Email local part: ph10 +Email domain: cam.ac.uk + +University of Cambridge Computing Service, +Cambridge, England. + +Copyright (c) 1997-2019 University of Cambridge +All rights reserved. + + +PCRE2 JUST-IN-TIME COMPILATION SUPPORT +-------------------------------------- + +Written by: Zoltan Herczeg +Email local part: hzmester +Email domain: freemail.hu + +Copyright(c) 2010-2019 Zoltan Herczeg +All rights reserved. + + +STACK-LESS JUST-IN-TIME COMPILER +-------------------------------- + +Written by: Zoltan Herczeg +Email local part: hzmester +Email domain: freemail.hu + +Copyright(c) 2009-2019 Zoltan Herczeg +All rights reserved. + + +THE "BSD" LICENCE +----------------- + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notices, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notices, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of any + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + + +EXEMPTION FOR BINARY LIBRARY-LIKE PACKAGES +------------------------------------------ + +The second condition in the BSD licence (covering binary redistributions) does +not apply all the way down a chain of software. If binary package A includes +PCRE2, it must respect the condition, but if package B is software that +includes package A, the condition is not imposed on package B unless it uses +PCRE2 independently. + +End From 5673a35a1ae362ed55d7819ddc555e8287c64fba Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Mon, 29 Jul 2019 22:54:18 +0200 Subject: [PATCH 2/2] Rename LICENCE to LICENSE - PHP will use American English spellings https://www.grammarly.com/blog/licence-license/ --- ext/pcre/pcre2lib/{LICENCE => LICENSE} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ext/pcre/pcre2lib/{LICENCE => LICENSE} (100%) diff --git a/ext/pcre/pcre2lib/LICENCE b/ext/pcre/pcre2lib/LICENSE similarity index 100% rename from ext/pcre/pcre2lib/LICENCE rename to ext/pcre/pcre2lib/LICENSE