From 1b9b18f680291fa769c48430d59318fce17bfeac Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Mon, 15 May 2023 20:04:29 +0200 Subject: [PATCH] Replace whole repo with latest content from branch stream-3.12-rhel-8.8.0 Content corresponds with RHEL dist-git commit d9b0a81 --- .gitignore | 5 ++- PyYAML-CVE-2014-9130.patch | 35 ++++++++++++++++++ debian-big-endian-fix.patch | 73 +++++++++++++++++++++++++++++++++++++ gating.yaml | 6 --- sources | 2 +- 5 files changed, 113 insertions(+), 8 deletions(-) create mode 100644 PyYAML-CVE-2014-9130.patch create mode 100644 debian-big-endian-fix.patch delete mode 100644 gating.yaml diff --git a/.gitignore b/.gitignore index b58b8f2..02a416a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -SOURCES/PyYAML-3.12.tar.gz +PyYAML-3.09.tar.gz +/PyYAML-3.10.tar.gz +/PyYAML-3.11.tar.gz +/PyYAML-3.12.tar.gz diff --git a/PyYAML-CVE-2014-9130.patch b/PyYAML-CVE-2014-9130.patch new file mode 100644 index 0000000..c47a9b5 --- /dev/null +++ b/PyYAML-CVE-2014-9130.patch @@ -0,0 +1,35 @@ +# HG changeset patch +# User Kirill Simonov +# Date 1417197216 21600 +# Node ID ddf211a41bb231c365fece5599b7e484e6dc33fc +# Parent 263dff6f9664ccdc532283ba5c7b282c0e436a7b +Removed invalid simple key assertion. + +diff --git a/lib/yaml/scanner.py b/lib/yaml/scanner.py +--- a/lib/yaml/scanner.py ++++ b/lib/yaml/scanner.py +@@ -297,10 +297,6 @@ + # Check if a simple key is required at the current position. + required = not self.flow_level and self.indent == self.column + +- # A simple key is required only if it is the first token in the current +- # line. Therefore it is always allowed. +- assert self.allow_simple_key or not required +- + # The next token might be a simple key. Let's save it's number and + # position. + if self.allow_simple_key: +diff --git a/lib3/yaml/scanner.py b/lib3/yaml/scanner.py +--- a/lib3/yaml/scanner.py ++++ b/lib3/yaml/scanner.py +@@ -297,10 +297,6 @@ + # Check if a simple key is required at the current position. + required = not self.flow_level and self.indent == self.column + +- # A simple key is required only if it is the first token in the current +- # line. Therefore it is always allowed. +- assert self.allow_simple_key or not required +- + # The next token might be a simple key. Let's save it's number and + # position. + if self.allow_simple_key: diff --git a/debian-big-endian-fix.patch b/debian-big-endian-fix.patch new file mode 100644 index 0000000..7991005 --- /dev/null +++ b/debian-big-endian-fix.patch @@ -0,0 +1,73 @@ +pyyaml FTBFS on the s390x buildd. It seems this is due to using int +where the libyaml API uses size_t. I tested the attached patch in +zelenka.d.o's sid chroot, and at least the python2 build/test worked (it +failed with the same error as the buildd pre-patching). +Patch by Julien Cristau +Add to the pyyaml package by Scott Kitterman +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676536 + +Index: pyyaml-3.10/ext/_yaml.pxd +=================================================================== +--- pyyaml-3.10.orig/ext/_yaml.pxd 2011-05-29 23:31:01.000000000 -0400 ++++ pyyaml-3.10/ext/_yaml.pxd 2012-06-08 16:33:54.309407701 -0400 +@@ -86,15 +86,15 @@ + YAML_MAPPING_END_EVENT + + ctypedef int yaml_read_handler_t(void *data, char *buffer, +- int size, int *size_read) except 0 ++ size_t size, size_t *size_read) except 0 + + ctypedef int yaml_write_handler_t(void *data, char *buffer, +- int size) except 0 ++ size_t size) except 0 + + ctypedef struct yaml_mark_t: +- int index +- int line +- int column ++ size_t index ++ size_t line ++ size_t column + ctypedef struct yaml_version_directive_t: + int major + int minor +@@ -113,7 +113,7 @@ + char *suffix + ctypedef struct _yaml_token_scalar_data_t: + char *value +- int length ++ size_t length + yaml_scalar_style_t style + ctypedef struct _yaml_token_version_directive_data_t: + int major +@@ -152,7 +152,7 @@ + char *anchor + char *tag + char *value +- int length ++ size_t length + int plain_implicit + int quoted_implicit + yaml_scalar_style_t style +Index: pyyaml-3.10/ext/_yaml.pyx +=================================================================== +--- pyyaml-3.10.orig/ext/_yaml.pyx 2011-05-29 23:31:01.000000000 -0400 ++++ pyyaml-3.10/ext/_yaml.pyx 2012-06-08 16:33:54.313409701 -0400 +@@ -905,7 +905,7 @@ + raise error + return 1 + +-cdef int input_handler(void *data, char *buffer, int size, int *read) except 0: ++cdef int input_handler(void *data, char *buffer, size_t size, size_t *read) except 0: + cdef CParser parser + parser = data + if parser.stream_cache is None: +@@ -1515,7 +1515,7 @@ + self.ascend_resolver() + return 1 + +-cdef int output_handler(void *data, char *buffer, int size) except 0: ++cdef int output_handler(void *data, char *buffer, size_t size) except 0: + cdef CEmitter emitter + emitter = data + if emitter.dump_unicode == 0: diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index c190bde..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/sources b/sources index ed2352a..a74856a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyYAML-3.12.tar.gz) = e16d8b7f4f026b6a95b11fb59c54ec5f114f6f516294eaa95e718abdf5d37c17a9c4b5e0a0a61fca04e801792d9b7fb801087cf849ff22b9581f6af204b1883a +4c129761b661d181ebf7ff4eb2d79950 PyYAML-3.12.tar.gz