[warrior][PATCH] python3: Upgrade 3.7.4 -> 3.7.5

[warrior][PATCH] python3: Upgrade 3.7.4 -> 3.7.5

[Adrian Bunk]

3.7.5 also includes the fixes for CVE-2019-16056 and CVE-2019-16935.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 ...Do-not-hardcode-lib-as-location-for-site-packages-an.patch | 2 +-
 ...python3-use-cc_basename-to-replace-CC-for-checking-c.patch | 2 +-
 .../python/{python3_3.7.4.bb => python3_3.7.5.bb}             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/python/{python3_3.7.4.bb => python3_3.7.5.bb} (98%)

diff --git a/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch b/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch
index 661f52d01f..ea75262c4f 100644
--- a/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch
+++ b/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch
@@ -70,7 +70,7 @@ index 6e81b2f..671a20e 100644
  
  Programs/python.o: $(srcdir)/Programs/python.c
 @@ -856,7 +857,7 @@ regen-opcode:
- Python/compile.o Python/symtable.o Python/ast_unparse.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h
+ Python/compile.o Python/symtable.o Python/ast_unparse.o Python/ast.o Python/future.o Parser/parsetok.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h
  
  Python/getplatform.o: $(srcdir)/Python/getplatform.c
 -		$(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
diff --git a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
index 5735954628..a0ea897f4e 100644
--- a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
+++ b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
@@ -63,7 +63,7 @@ index a7de901..4a3681f 100644
 +  case $cc_basename in
      *clang*)
        AC_SUBST(LLVM_AR)
-       AC_PATH_TARGET_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path})
+       AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path})
 @@ -1426,7 +1427,7 @@ then
    fi
  fi
diff --git a/meta/recipes-devtools/python/python3_3.7.4.bb b/meta/recipes-devtools/python/python3_3.7.5.bb
similarity index 98%
rename from meta/recipes-devtools/python/python3_3.7.4.bb
rename to meta/recipes-devtools/python/python3_3.7.5.bb
index af3c3259c2..30d4bedef2 100644
--- a/meta/recipes-devtools/python/python3_3.7.4.bb
+++ b/meta/recipes-devtools/python/python3_3.7.5.bb
@@ -32,8 +32,8 @@ SRC_URI_append_class-nativesdk = " \
            file://0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch \
            "
 
-SRC_URI[md5sum] = "d33e4aae66097051c2eca45ee3604803"
-SRC_URI[sha256sum] = "fb799134b868199930b75f26678f18932214042639cd52b16da7fd134cd9b13f"
+SRC_URI[md5sum] = "08ed8030b1183107c48f2092e79a87e2"
+SRC_URI[sha256sum] = "e85a76ea9f3d6c485ec1780fca4e500725a4a7bbc63c78ebc44170de9b619d94"
 
 # exclude pre-releases for both python 2.x and 3.x
 UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
-- 
2.17.1

Re: [warrior][PATCH] python3: Upgrade 3.7.4 -> 3.7.5

[akuster808]

On 11/5/19 1:44 PM, Adrian Bunk wrote:
> 3.7.5 also includes the fixes for CVE-2019-16056 and CVE-2019-16935.

I see a patch is being updated. Reason not noted in commit message.

Also, do you have any issue if I backport the other py3 bugfixes in zeus?

- Armin
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>


> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  ...Do-not-hardcode-lib-as-location-for-site-packages-an.patch | 2 +-
>  ...python3-use-cc_basename-to-replace-CC-for-checking-c.patch | 2 +-
>  .../python/{python3_3.7.4.bb => python3_3.7.5.bb}             | 4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
>  rename meta/recipes-devtools/python/{python3_3.7.4.bb => python3_3.7.5.bb} (98%)
>
> diff --git a/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch b/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch
> index 661f52d01f..ea75262c4f 100644
> --- a/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch
> +++ b/meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch
> @@ -70,7 +70,7 @@ index 6e81b2f..671a20e 100644
>   
>   Programs/python.o: $(srcdir)/Programs/python.c
>  @@ -856,7 +857,7 @@ regen-opcode:
> - Python/compile.o Python/symtable.o Python/ast_unparse.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h
> + Python/compile.o Python/symtable.o Python/ast_unparse.o Python/ast.o Python/future.o Parser/parsetok.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h
>   
>   Python/getplatform.o: $(srcdir)/Python/getplatform.c
>  -		$(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
> diff --git a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
> index 5735954628..a0ea897f4e 100644
> --- a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
> +++ b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
> @@ -63,7 +63,7 @@ index a7de901..4a3681f 100644
>  +  case $cc_basename in
>       *clang*)
>         AC_SUBST(LLVM_AR)
> -       AC_PATH_TARGET_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path})
> +       AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path})
>  @@ -1426,7 +1427,7 @@ then
>     fi
>   fi
> diff --git a/meta/recipes-devtools/python/python3_3.7.4.bb b/meta/recipes-devtools/python/python3_3.7.5.bb
> similarity index 98%
> rename from meta/recipes-devtools/python/python3_3.7.4.bb
> rename to meta/recipes-devtools/python/python3_3.7.5.bb
> index af3c3259c2..30d4bedef2 100644
> --- a/meta/recipes-devtools/python/python3_3.7.4.bb
> +++ b/meta/recipes-devtools/python/python3_3.7.5.bb
> @@ -32,8 +32,8 @@ SRC_URI_append_class-nativesdk = " \
>             file://0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch \
>             "
>  
> -SRC_URI[md5sum] = "d33e4aae66097051c2eca45ee3604803"
> -SRC_URI[sha256sum] = "fb799134b868199930b75f26678f18932214042639cd52b16da7fd134cd9b13f"
> +SRC_URI[md5sum] = "08ed8030b1183107c48f2092e79a87e2"
> +SRC_URI[sha256sum] = "e85a76ea9f3d6c485ec1780fca4e500725a4a7bbc63c78ebc44170de9b619d94"
>  
>  # exclude pre-releases for both python 2.x and 3.x
>  UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"

Re: [warrior][PATCH] python3: Upgrade 3.7.4 -> 3.7.5

[Adrian Bunk]

On Sun, Nov 10, 2019 at 03:58:56PM -0800, akuster808 wrote:
> 
> 
> On 11/5/19 1:44 PM, Adrian Bunk wrote:
> > 3.7.5 also includes the fixes for CVE-2019-16056 and CVE-2019-16935.
> 
> I see a patch is being updated. Reason not noted in commit message.

That's just trivial context change.

> Also, do you have any issue if I backport the other py3 bugfixes in zeus?

I was aiming at a minimal change, but nothing of the other changes 
strikes me as wrong or very risky.

> - Armin

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed