[PATCH] zlib: Upgrade 1.2.8 -> 1.2.11

[PATCH] zlib: Upgrade 1.2.8 -> 1.2.11

[Peter Marko]

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
---
 1.2.11                                                              | 0
 .../zlib/{zlib-1.2.8 => zlib-1.2.11}/Makefile-runtests.patch        | 0
 .../zlib/{zlib-1.2.8 => zlib-1.2.11}/ldflags-tests.patch            | 0
 .../zlib/{zlib-1.2.8 => zlib-1.2.11}/remove.ldconfig.call.patch     | 0
 meta/recipes-core/zlib/{zlib-1.2.8 => zlib-1.2.11}/run-ptest        | 0
 meta/recipes-core/zlib/{zlib_1.2.8.bb => zlib_1.2.11.bb}            | 6 +++---
 6 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 1.2.11
 rename meta/recipes-core/zlib/{zlib-1.2.8 => zlib-1.2.11}/Makefile-runtests.patch (100%)
 rename meta/recipes-core/zlib/{zlib-1.2.8 => zlib-1.2.11}/ldflags-tests.patch (100%)
 rename meta/recipes-core/zlib/{zlib-1.2.8 => zlib-1.2.11}/remove.ldconfig.call.patch (100%)
 rename meta/recipes-core/zlib/{zlib-1.2.8 => zlib-1.2.11}/run-ptest (100%)
 rename meta/recipes-core/zlib/{zlib_1.2.8.bb => zlib_1.2.11.bb} (86%)

diff --git a/1.2.11 b/1.2.11
new file mode 100644
index 0000000..e69de29
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/Makefile-runtests.patch b/meta/recipes-core/zlib/zlib-1.2.11/Makefile-runtests.patch
similarity index 100%
rename from meta/recipes-core/zlib/zlib-1.2.8/Makefile-runtests.patch
rename to meta/recipes-core/zlib/zlib-1.2.11/Makefile-runtests.patch
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch b/meta/recipes-core/zlib/zlib-1.2.11/ldflags-tests.patch
similarity index 100%
rename from meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch
rename to meta/recipes-core/zlib/zlib-1.2.11/ldflags-tests.patch
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/remove.ldconfig.call.patch b/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch
similarity index 100%
rename from meta/recipes-core/zlib/zlib-1.2.8/remove.ldconfig.call.patch
rename to meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/run-ptest b/meta/recipes-core/zlib/zlib-1.2.11/run-ptest
similarity index 100%
rename from meta/recipes-core/zlib/zlib-1.2.8/run-ptest
rename to meta/recipes-core/zlib/zlib-1.2.11/run-ptest
diff --git a/meta/recipes-core/zlib/zlib_1.2.8.bb b/meta/recipes-core/zlib/zlib_1.2.11.bb
similarity index 86%
rename from meta/recipes-core/zlib/zlib_1.2.8.bb
rename to meta/recipes-core/zlib/zlib_1.2.11.bb
index 913c703..2018e7b 100644
--- a/meta/recipes-core/zlib/zlib_1.2.8.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.11.bb
@@ -4,7 +4,7 @@ library which is used by many different programs."
 HOMEPAGE = "http://zlib.net/"
 SECTION = "libs"
 LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=fde612df1e5933c428b73844a0c494fd"
+LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \
            file://remove.ldconfig.call.patch \
@@ -13,8 +13,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \
            file://run-ptest \
            "
 
-SRC_URI[md5sum] = "28f1205d8dd2001f26fec1e8c2cebe37"
-SRC_URI[sha256sum] = "831df043236df8e9a7667b9e3bb37e1fcb1220a0f163b6de2626774b9590d057"
+SRC_URI[md5sum] = "85adef240c5f370b308da8c938951a68"
+SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"
 
 RDEPENDS_${PN}-ptest += "make"
 
-- 
2.1.4

Re: [PATCH] zlib: Upgrade 1.2.8 -> 1.2.11

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 607 bytes --]

On 27 February 2017 at 17:18, Peter Marko <peter.marko@siemens.com> wrote:

> -LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=
> fde612df1e5933c428b73844a0c494fd"
> +LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=
> 5377232268e952e9ef63bc555f7aa6c0"
>

To demonstrate that you haven't just updated the checksum without checking
the license changes, can you sent a v3 with an explanation of this change
in the commit log?  Something along the lines of "copyright dates changed"
is fine, we just need to know that the change isn't "relicensed under
GPLv3". :)

Ross

[-- Attachment #2: Type: text/html, Size: 1086 bytes --]

Re: [PATCH] zlib: Upgrade 1.2.8 -> 1.2.11

[Alexander Kanavin]

On 02/27/2017 04:41 PM, Burton, Ross wrote:
> vvvvvvvvvvvvvvvvvvvvvvvvvvvv beginline=4 vvvvvvvvvvvvvvvvvvvvvvvvvvvvv
>   Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
....
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ endline=23 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> zlib: Check if the license information has changed in
> /data/poky-master/tmp/work/corei7-64-poky-linux/zlib/1.2.11-r0/zlib-1.2.11/zlib.h
> (lines 4 through to 23) to verify that the LICENSE value "Zlib" remains
> valid [license-checksum]

It's probably just the year changing to 2017, in which case the 
beginline can be changed to 5.

Alex

Re: [PATCH] zlib: Upgrade 1.2.8 -> 1.2.11

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 1939 bytes --]

On 27 February 2017 at 14:05, Peter Marko <peter.marko@siemens.com> wrote:

> Signed-off-by: Peter Marko <peter.marko@siemens.com>
> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
>

ERROR: zlib-1.2.11-r0 do_populate_lic: QA Issue: zlib: The LIC_FILES_CHKSUM
does not match for
file://zlib.h;beginline=4;endline=23;md5=fde612df1e5933c428b73844a0c494fd
zlib: The new md5 checksum is 627e6ecababe008a45c70e318ae7014e
zlib: Here is the selected license text:
vvvvvvvvvvvvvvvvvvvvvvvvvvvv beginline=4 vvvvvvvvvvvvvvvvvvvvvvvvvvvvv
  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
  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.

  Jean-loup Gailly        Mark Adler
  jloup@gzip.org          madler@alumni.caltech.edu
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ endline=23 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
zlib: Check if the license information has changed in
/data/poky-master/tmp/work/corei7-64-poky-linux/zlib/1.2.11-r0/zlib-1.2.11/zlib.h
(lines 4 through to 23) to verify that the LICENSE value "Zlib" remains
valid [license-checksum]

Ross

[-- Attachment #2: Type: text/html, Size: 3519 bytes --]

[PATCH] zlib: Upgrade 1.2.8 -> 1.2.11

[Peter Marko]

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
---
 .../zlib/{zlib-1.2.8 => zlib-1.2.11}/Makefile-runtests.patch          | 0
 .../recipes-core/zlib/{zlib-1.2.8 => zlib-1.2.11}/ldflags-tests.patch | 0
 .../zlib/{zlib-1.2.8 => zlib-1.2.11}/remove.ldconfig.call.patch       | 0
 meta/recipes-core/zlib/{zlib-1.2.8 => zlib-1.2.11}/run-ptest          | 0
 meta/recipes-core/zlib/{zlib_1.2.8.bb => zlib_1.2.11.bb}              | 4 ++--
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/zlib/{zlib-1.2.8 => zlib-1.2.11}/Makefile-runtests.patch (100%)
 rename meta/recipes-core/zlib/{zlib-1.2.8 => zlib-1.2.11}/ldflags-tests.patch (100%)
 rename meta/recipes-core/zlib/{zlib-1.2.8 => zlib-1.2.11}/remove.ldconfig.call.patch (100%)
 rename meta/recipes-core/zlib/{zlib-1.2.8 => zlib-1.2.11}/run-ptest (100%)
 rename meta/recipes-core/zlib/{zlib_1.2.8.bb => zlib_1.2.11.bb} (91%)

diff --git a/meta/recipes-core/zlib/zlib-1.2.8/Makefile-runtests.patch b/meta/recipes-core/zlib/zlib-1.2.11/Makefile-runtests.patch
similarity index 100%
rename from meta/recipes-core/zlib/zlib-1.2.8/Makefile-runtests.patch
rename to meta/recipes-core/zlib/zlib-1.2.11/Makefile-runtests.patch
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch b/meta/recipes-core/zlib/zlib-1.2.11/ldflags-tests.patch
similarity index 100%
rename from meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch
rename to meta/recipes-core/zlib/zlib-1.2.11/ldflags-tests.patch
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/remove.ldconfig.call.patch b/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch
similarity index 100%
rename from meta/recipes-core/zlib/zlib-1.2.8/remove.ldconfig.call.patch
rename to meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/run-ptest b/meta/recipes-core/zlib/zlib-1.2.11/run-ptest
similarity index 100%
rename from meta/recipes-core/zlib/zlib-1.2.8/run-ptest
rename to meta/recipes-core/zlib/zlib-1.2.11/run-ptest
diff --git a/meta/recipes-core/zlib/zlib_1.2.8.bb b/meta/recipes-core/zlib/zlib_1.2.11.bb
similarity index 91%
rename from meta/recipes-core/zlib/zlib_1.2.8.bb
rename to meta/recipes-core/zlib/zlib_1.2.11.bb
index 913c703..939be68 100644
--- a/meta/recipes-core/zlib/zlib_1.2.8.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.11.bb
@@ -13,8 +13,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \
            file://run-ptest \
            "
 
-SRC_URI[md5sum] = "28f1205d8dd2001f26fec1e8c2cebe37"
-SRC_URI[sha256sum] = "831df043236df8e9a7667b9e3bb37e1fcb1220a0f163b6de2626774b9590d057"
+SRC_URI[md5sum] = "85adef240c5f370b308da8c938951a68"
+SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"
 
 RDEPENDS_${PN}-ptest += "make"
 
-- 
2.1.4