From ec904350eefbd508eee14b346d8451c223ae157239212b3ca668ca0a2409a75a Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 30 May 2020 12:23:29 +0000 Subject: [PATCH] - Fix configure.ac for correct version of PYTHON_FO_REGEN OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=284 --- configure_PYTHON_FOR_REGEN.patch | 11 +++++++++++ python-base.changes | 5 +++++ python-base.spec | 4 ++++ python-doc.changes | 5 +++++ python-doc.spec | 4 ++++ python.changes | 5 +++++ python.spec | 4 ++++ 7 files changed, 38 insertions(+) create mode 100644 configure_PYTHON_FOR_REGEN.patch diff --git a/configure_PYTHON_FOR_REGEN.patch b/configure_PYTHON_FOR_REGEN.patch new file mode 100644 index 0000000..166c682 --- /dev/null +++ b/configure_PYTHON_FOR_REGEN.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -19,7 +19,7 @@ AC_SUBST(host) + # pybuilddir.txt will be created by --generate-posix-vars in the Makefile + rm -f pybuilddir.txt + +-AC_CHECK_PROGS(PYTHON_FOR_REGEN, python$PACKAGE_VERSION python3 python, python3) ++AC_CHECK_PROGS(PYTHON_FOR_REGEN, python$PACKAGE_VERSION python python2, python) + AC_SUBST(PYTHON_FOR_REGEN) + + if test "$cross_compiling" = yes; then diff --git a/python-base.changes b/python-base.changes index e53f85c..2cf82ff 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 30 12:19:40 UTC 2020 - Matej Cepl + +- Fix configure.ac for correct version of PYTHON_FO_REGEN + ------------------------------------------------------------------- Mon Apr 27 06:56:55 UTC 2020 - Matej Cepl diff --git a/python-base.spec b/python-base.spec index ad010fc..a08793f 100644 --- a/python-base.spec +++ b/python-base.spec @@ -94,6 +94,9 @@ Patch58: CVE-2020-8492-urllib-ReDoS.patch # PATCH-FIX-UPSTREAM CVE-2019-9674-zip-bomb.patch bsc#1162825 mcepl@suse.com # Improve documentation warning against the possible zip bombs Patch59: CVE-2019-9674-zip-bomb.patch +# PATCH-FIX-UPSTREAM configure_PYTHON_FOR_REGEN.patch bsc#1078326 mcepl@suse.com +# PYTHON_FOR_REGEN value is set very weird upstream +Patch60: configure_PYTHON_FOR_REGEN.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake @@ -219,6 +222,7 @@ other applications. %patch56 -p1 %patch58 -p1 %patch59 -p1 +%patch60 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac diff --git a/python-doc.changes b/python-doc.changes index e53f85c..2cf82ff 100644 --- a/python-doc.changes +++ b/python-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 30 12:19:40 UTC 2020 - Matej Cepl + +- Fix configure.ac for correct version of PYTHON_FO_REGEN + ------------------------------------------------------------------- Mon Apr 27 06:56:55 UTC 2020 - Matej Cepl diff --git a/python-doc.spec b/python-doc.spec index 49300c0..023fa61 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -96,6 +96,9 @@ Patch58: CVE-2020-8492-urllib-ReDoS.patch # PATCH-FIX-UPSTREAM CVE-2019-9674-zip-bomb.patch bsc#1162825 mcepl@suse.com # Improve documentation warning against the possible zip bombs Patch59: CVE-2019-9674-zip-bomb.patch +# PATCH-FIX-UPSTREAM configure_PYTHON_FOR_REGEN.patch bsc#1078326 mcepl@suse.com +# PYTHON_FOR_REGEN value is set very weird upstream +Patch60: configure_PYTHON_FOR_REGEN.patch # COMMON-PATCH-END Provides: pyth_doc Provides: pyth_ps @@ -162,6 +165,7 @@ Python, and Macintosh Module Reference in PDF format. %patch56 -p1 %patch58 -p1 %patch59 -p1 +%patch60 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac diff --git a/python.changes b/python.changes index e53f85c..2cf82ff 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 30 12:19:40 UTC 2020 - Matej Cepl + +- Fix configure.ac for correct version of PYTHON_FO_REGEN + ------------------------------------------------------------------- Mon Apr 27 06:56:55 UTC 2020 - Matej Cepl diff --git a/python.spec b/python.spec index 3b3940b..d835e75 100644 --- a/python.spec +++ b/python.spec @@ -96,6 +96,9 @@ Patch58: CVE-2020-8492-urllib-ReDoS.patch # PATCH-FIX-UPSTREAM CVE-2019-9674-zip-bomb.patch bsc#1162825 mcepl@suse.com # Improve documentation warning against the possible zip bombs Patch59: CVE-2019-9674-zip-bomb.patch +# PATCH-FIX-UPSTREAM configure_PYTHON_FOR_REGEN.patch bsc#1078326 mcepl@suse.com +# PYTHON_FOR_REGEN value is set very weird upstream +Patch60: configure_PYTHON_FOR_REGEN.patch # COMMON-PATCH-END BuildRequires: automake BuildRequires: db-devel @@ -276,6 +279,7 @@ that rely on earlier non-verification behavior. %patch56 -p1 %patch58 -p1 %patch59 -p1 +%patch60 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac