From aa5bb2c3dd2fe53333b48fba68d40e9d1358a234 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 30 Dec 2016 13:24:16 -0600 Subject: [PATCH] [libpng16] Clean up LICENSE, mention CVE-2016-10087 in CHANGES. --- CHANGES | 2 +- LICENSE | 1 + libpng.3 | 3 ++- png.h | 11 ++--------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 98dc8f73d..b114af4d0 100644 --- a/CHANGES +++ b/CHANGES @@ -5772,7 +5772,7 @@ Version 1.6.27rc01 [December 27, 2016] Version 1.6.27 [December 29, 2016] Fixed a potential null pointer dereference in png_set_text_2() (bug report - and patch by Patrick Keshishian). + and patch by Patrick Keshishian, CVE-2016-10087). Version 1.6.28beta01 [December 30, 2016] diff --git a/LICENSE b/LICENSE index f66ed5847..3a1ae0983 100644 --- a/LICENSE +++ b/LICENSE @@ -22,6 +22,7 @@ added to the list of Contributing Authors: Cosmin Truta Gilles Vollant James Yu + Mandar Sahastrabuddhe and with the following additions to the disclaimer: diff --git a/libpng.3 b/libpng.3 index 4b7e6430c..a21bed45d 100644 --- a/libpng.3 +++ b/libpng.3 @@ -6049,7 +6049,7 @@ this sentence. This code is released under the libpng license. libpng versions 1.0.7, July 1, 2000 through 1.6.28beta01, December 30, 2016 are -Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are +Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: @@ -6060,6 +6060,7 @@ added to the list of Contributing Authors: Cosmin Truta Gilles Vollant James Yu + Mandar Sahastrabuddhe and with the following additions to the disclaimer: diff --git a/png.h b/png.h index e4a905e06..adefeab81 100644 --- a/png.h +++ b/png.h @@ -25,10 +25,6 @@ * * This code is released under the libpng license. * - * Some files in the "contrib" directory and some configure-generated - * files that are distributed with libpng have other copyright owners and - * are released under other open source licenses. - * * libpng versions 1.0.7, July 1, 2000 through 1.6.28beta01, December 30, 2016 are * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same @@ -52,10 +48,10 @@ * risk of satisfactory quality, performance, accuracy, and effort is with * the user. * - * Some files in the "contrib" directory have other copyright owners and + * Some files in the "contrib" directory and some configure-generated + * files that are distributed with libpng have other copyright owners and * are released under other open source licenses. * - * * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are * Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from * libpng-0.96, and are distributed according to the same disclaimer and @@ -66,9 +62,6 @@ * Glenn Randers-Pehrson * Willem van Schaik * - * Some files in the "scripts" directory have different copyright owners - * but are also released under this license. - * * libpng versions 0.89, June 1996, through 0.96, May 1997, are * Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, * and are distributed according to the same disclaimer and license as