Skip to content

Commit 12c2eef

Browse files
authored
Merge pull request libgit2#6187 from libgit2/ethomson/copyright
COPYING: remove regex copyright, add PCRE copyright
2 parents 50eb7d3 + f2faa01 commit 12c2eef

File tree

1 file changed

+24
-19
lines changed

1 file changed

+24
-19
lines changed

COPYING

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -406,30 +406,35 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
406406

407407
----------------------------------------------------------------------
408408

409-
The regex library (deps/regex/) is licensed under the GNU LGPL
410-
(available at the end of this file).
409+
The bundled PCRE implementation (deps/pcre/) is licensed under the BSD
410+
license.
411411

412-
Definitions for data structures and routines for the regular
413-
expression library.
412+
Redistribution and use in source and binary forms, with or without
413+
modification, are permitted provided that the following conditions are met:
414414

415-
Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006,2008
416-
Free Software Foundation, Inc.
417-
This file is part of the GNU C Library.
415+
* Redistributions of source code must retain the above copyright notice,
416+
this list of conditions and the following disclaimer.
418417

419-
The GNU C Library is free software; you can redistribute it and/or
420-
modify it under the terms of the GNU Lesser General Public
421-
License as published by the Free Software Foundation; either
422-
version 2.1 of the License, or (at your option) any later version.
418+
* Redistributions in binary form must reproduce the above copyright
419+
notice, this list of conditions and the following disclaimer in the
420+
documentation and/or other materials provided with the distribution.
423421

424-
The GNU C Library is distributed in the hope that it will be useful,
425-
but WITHOUT ANY WARRANTY; without even the implied warranty of
426-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
427-
Lesser General Public License for more details.
422+
* Neither the name of the University of Cambridge nor the name of Google
423+
Inc. nor the names of their contributors may be used to endorse or
424+
promote products derived from this software without specific prior
425+
written permission.
428426

429-
You should have received a copy of the GNU Lesser General Public
430-
License along with the GNU C Library; if not, write to the Free
431-
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
432-
02110-1301 USA.
427+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
428+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
429+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
430+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
431+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
432+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
433+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
434+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
435+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
436+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
437+
POSSIBILITY OF SUCH DAMAGE.
433438

434439
----------------------------------------------------------------------
435440

0 commit comments

Comments
 (0)