From a23775a30dc2bea45c2707083134308c24d818b2 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Thu, 11 Jul 2024 14:09:40 +0200 Subject: [PATCH] Fix GH-14888: README.REDIST.BINS refers to non-existing LICENSE [ci skip] The LICENSE file of libmagic had been inadvertently removed when the lib had been upgraded to 5.43. So we add the file `COPYING` from that release[1], and rename it to `LICENSE`. [1] Closes GH-14917. --- NEWS | 4 ++++ ext/fileinfo/libmagic/LICENSE | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 ext/fileinfo/libmagic/LICENSE diff --git a/NEWS b/NEWS index 0f87ee43bfe..a7c4f1cea92 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,10 @@ PHP NEWS - Dom: . Fixed bug GH-14702 (DOMDocument::xinclude() crash). (nielsdos) +- Fileinfo: + . Fixed bug GH-14888 (README.REDIST.BINS refers to non-existing LICENSE). + (cmb) + - Gd: . ext/gd/tests/gh10614.phpt: skip if no PNG support. (orlitzky) diff --git a/ext/fileinfo/libmagic/LICENSE b/ext/fileinfo/libmagic/LICENSE new file mode 100644 index 00000000000..16410a17f2f --- /dev/null +++ b/ext/fileinfo/libmagic/LICENSE @@ -0,0 +1,29 @@ +$File: COPYING,v 1.2 2018/09/09 20:33:28 christos Exp $ +Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995. +Software written by Ian F. Darwin and others; +maintained 1994- Christos Zoulas. + +This software is not subject to any export provision of the United States +Department of Commerce, and may be exported to any country or planet. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice immediately at the beginning of the file, without modification, + this list of conditions, and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.