DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Roll zlib (flutter/engine#20119)

Browse Source 
Picks up the buildroot change to roll zlib to the latest version from Chromium.
This commit is contained in:
stuartmorgan 2020-07-29 16:02:30 -07:00 committed by GitHub
parent b9763a4749
commit 71aa3f412f
4 changed files with 140 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -107,7 +107,7 @@ allowed_hosts = [
]
deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '4073a7a300d845597b8b2d553e584d3fd97f70df',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '92f0936b9c4daec1af9296125d449807bdec9219',
# Fuchsia compatibility
#

2
engine/src/flutter/ci/licenses_golden/tool_signature
View File

@ -1,2 +1,2 @@
Signature: 7d6c8db696965832bc69c4289701d394
Signature: af78da7ecf2921dc867b7088d451f3af

244
engine/src/flutter/sky/packages/sky_engine/LICENSE
View File

@ -1109,6 +1109,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
base
fuchsia_sdk
skia
zlib
Copyright 2018 The Chromium Authors. All rights reserved.
@ -1140,6 +1141,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
base
icu
zlib
Copyright 2014 The Chromium Authors. All rights reserved.
@ -13116,26 +13118,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2003, 2010 Jean-loup Gailly.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2003, 2010 Mark Adler
This software is provided 'as-is', without any express or implied
@ -13156,7 +13138,8 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2005 Jean-loup Gailly.
Copyright (C) 1995-2003, 2010 Mark Adler
Copyright (C) 2017 ARM, Inc.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@ -13176,7 +13159,7 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2005, 2010 Jean-loup Gailly.
Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@ -13216,7 +13199,7 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2006, 2010 Mark Adler
Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@ -13236,7 +13219,7 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2007 Mark Adler
Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@ -13256,7 +13239,7 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2008, 2010 Mark Adler
Copyright (C) 1995-2011, 2016 Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@ -13276,7 +13259,7 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2009 Mark Adler
Copyright (C) 1995-2016 Jean-loup Gailly
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@ -13296,7 +13279,7 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2010 Jean-loup Gailly
Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@ -13316,7 +13299,47 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2010 Jean-loup Gailly
Copyright (C) 1995-2016 Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2017 Jean-loup Gailly
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2017 Jean-loup Gailly
detect_data_type() function provided freely by Cosmin Truta, 2006
This software is provided 'as-is', without any express or implied
@ -13337,7 +13360,7 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@ -13357,27 +13380,7 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2010 Jean-loup Gailly.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
--------------------------------------------------------------------------------
zlib
Copyright (C) 1995-2010 Mark Adler
Copyright (C) 1995-2017 Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@ -13454,7 +13457,7 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 2004, 2005, 2010 Mark Adler
Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@ -13494,6 +13497,26 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 2004-2017 Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
--------------------------------------------------------------------------------
zlib
Copyright (C) 2013 Intel Corporation
Authors:
Arjan van de Ven <arjan@linux.intel.com>
@ -13517,48 +13540,6 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 2013 Intel Corporation Jim Kukunas
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
--------------------------------------------------------------------------------
zlib
Copyright (C) 2013 Intel Corporation. All rights reserved.
Author:
Jim Kukunas
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
--------------------------------------------------------------------------------
zlib
Copyright (C) 2013 Intel Corporation. All rights reserved.
Authors:
Wajdi Feghali <wajdi.k.feghali@intel.com>
@ -13585,23 +13566,34 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
zlib
Copyright (C) 2014 Intel Corporation
Copyright (C) 2017 ARM, Inc.
Copyright 2017 The Chromium Authors. All rights reserved.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* 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.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
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.
--------------------------------------------------------------------------------
zlib
@ -13635,10 +13627,39 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
zlib
zlib.h -- interface of the 'zlib' general purpose compression library
version 1.2.4, March 14th, 2010
Copyright 2017 The Chromium Authors. All rights reserved.
Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
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
notice, this list of conditions and the following disclaimer.
* 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.
* Neither the name of Google Inc. nor the names of its
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.
--------------------------------------------------------------------------------
zlib
version 1.2.11, January 15th, 2017
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@ -13655,6 +13676,3 @@ freely, subject to the following restrictions:
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
Jean-loup Gailly
Mark Adler

10
engine/src/flutter/tools/licenses/lib/patterns.dart
View File

@ -322,9 +322,13 @@ final List<LicenseFileReferencePattern> csReferencesByFilename = <LicenseFileRef
fileIndex: 5,
pattern: RegExp(
kIndent +
r'(Copyright .+(The .+ Authors)\. +All rights reserved\. *\n)' +
r'\1\2Use of this source code is governed by a BSD-style license that can be *\n'
r'\1\2found in the Chromium source repository ([^ ]+) file.',
// The " \* " is needed to ensure that both copyright lines start with
// the comment decoration in the captured match, otherwise it won't be
// stripped from the second line when generating output.
r'((?: \* Copyright \(C\) 2017 ARM, Inc.\n)?'
r'Copyright .+(The .+ Authors)\. +All rights reserved\.)\n'
r'Use of this source code is governed by a BSD-style license that can be\n'
r'found in the Chromium source repository ([^ ]+) file.'.replaceAll(r'\n', _linebreakLoose),
multiLine: true,
caseSensitive: false,
)