Downgrade to version 3.13

We cannot upgrade to 5.1.1 yet due to these pip check errors:

docker-compose 1.23.2 has requirement PyYAML<4,>=3.10, but you have pyyaml 5.1.1.
awscli 1.16.199 has requirement PyYAML<=5.1,>=3.10, but you have pyyaml 5.1.1.

Makefile

@@ -1,5 +1,5 @@
 PKG_NAME := PyYAML
-URL = https://github.com/yaml/pyyaml/archive/5.1.1/pyyaml-5.1.1.tar.gz
+URL = https://github.com/yaml/pyyaml/archive/3.13/pyyaml-3.13.tar.gz
 ARCHIVES = 
 
 include ../common/Makefile.common

PyYAML.spec

@@ -3,10 +3,10 @@
 # Generated by: autospec.py
 #
 Name     : PyYAML
-Version  : 5.1.1
-Release  : 58
-URL      : https://github.com/yaml/pyyaml/archive/5.1.1/pyyaml-5.1.1.tar.gz
-Source0  : https://github.com/yaml/pyyaml/archive/5.1.1/pyyaml-5.1.1.tar.gz
+Version  : 3.13
+Release  : 59
+URL      : https://github.com/yaml/pyyaml/archive/3.13/pyyaml-3.13.tar.gz
+Source0  : https://github.com/yaml/pyyaml/archive/3.13/pyyaml-3.13.tar.gz
 Summary  : No detailed summary available
 Group    : Development/Tools
 License  : MIT
@@ -18,6 +18,8 @@ BuildRequires : buildreq-distutils3
 BuildRequires : python-dev
 BuildRequires : python3-dev
 BuildRequires : yaml-dev
+Patch1: 0001-CVE-2017-18342-1.patch
+Patch2: 0002-CVE-2017-18342-2.patch
 
 %description
 PyYAML - The next generation YAML parser and emitter for Python.
@@ -51,14 +53,16 @@ python3 components for the PyYAML package.
 
 
 %prep
-%setup -q -n pyyaml-5.1.1
+%setup -q -n pyyaml-3.13
+%patch1 -p1
+%patch2 -p1
 
 %build
 export http_proxy=http://127.0.0.1:9/
 export https_proxy=http://127.0.0.1:9/
 export no_proxy=localhost,127.0.0.1,0.0.0.0
 export LANG=C.UTF-8
-export SOURCE_DATE_EPOCH=1563471559
+export SOURCE_DATE_EPOCH=1563473686
 export GCC_IGNORE_WERROR=1
 export AR=gcc-ar
 export RANLIB=gcc-ranlib

buildreq_cache

@@ -1,2 +1,2 @@
-5.1.1
+3.13
 python3-dev

options.conf

@@ -1,6 +1,6 @@
 [package]
 name = PyYAML
-url = https://github.com/yaml/pyyaml/archive/5.1.1/pyyaml-5.1.1.tar.gz
+url = https://github.com/yaml/pyyaml/archive/3.13/pyyaml-3.13.tar.gz
 archives = 
 giturl = https://github.com/yaml/pyyaml.git
 

release

@@ -1 +1 @@
-58
+59

series

@@ -1,2 +1,2 @@
-#0001-CVE-2017-18342-1.patch
-#0002-CVE-2017-18342-2.patch
+0001-CVE-2017-18342-1.patch
+0002-CVE-2017-18342-2.patch

testresults

@@ -1,5 +1,5 @@
-Total : 2607
-Pass : 2602
+Total : 2590
+Pass : 2585
 Fail : 5
 Skip : 0
 XFail : 0

upstream

@@ -1 +1 @@
-f96e9e76ad2ceb92a071d9a7f5d45bb24e52a0b9/pyyaml-5.1.1.tar.gz
+0b1651cd9b47e79ead9be7e671732c5ea0d0a549/pyyaml-3.13.tar.gz