Replace whole repo with latest content from branch stream-3.12-rhel-8.8.0
Content corresponds with RHEL dist-git commit d9b0a81
This commit is contained in:
parent
e364c3e7fd
commit
1b9b18f680
5
.gitignore
vendored
5
.gitignore
vendored
@ -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
|
||||||
|
|||||||
35
PyYAML-CVE-2014-9130.patch
Normal file
35
PyYAML-CVE-2014-9130.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User Kirill Simonov <xi@resolvent.net>
|
||||||
|
# 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:
|
||||||
73
debian-big-endian-fix.patch
Normal file
73
debian-big-endian-fix.patch
Normal file
@ -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 <jcristau@debian.org>
|
||||||
|
Add to the pyyaml package by Scott Kitterman <scott@kitterman.com>
|
||||||
|
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 = <CParser>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 = <CEmitter>data
|
||||||
|
if emitter.dump_unicode == 0:
|
||||||
@ -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}
|
|
||||||
Loading…
Reference in New Issue
Block a user