From 869d8de649bb70f90b618ac21e96f5ce12459589 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 17:35:59 +0000 Subject: [PATCH] import UBI python-ruamel-yaml-clib-0.2.7-8.el10 --- .gitignore | 2 +- .python-ruamel-yaml-clib.metadata | 1 - SOURCES/LICENSE-libyaml => LICENSE-libyaml | 0 SOURCES/fix-typecasts-s390x.patch | 38 ---------- fix-typecasts-s390x.patch | 74 +++++++++++++++++++ ...-clib.spec => python-ruamel-yaml-clib.spec | 22 +++++- sources | 1 + 7 files changed, 95 insertions(+), 43 deletions(-) delete mode 100644 .python-ruamel-yaml-clib.metadata rename SOURCES/LICENSE-libyaml => LICENSE-libyaml (100%) delete mode 100644 SOURCES/fix-typecasts-s390x.patch create mode 100644 fix-typecasts-s390x.patch rename SPECS/python-ruamel-yaml-clib.spec => python-ruamel-yaml-clib.spec (87%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index 3959729..6dde2f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ruamel-yaml-clib-code-fdd42e838e4d5199b0277fc21a920a744cdd5c9d.zip +ruamel-yaml-clib-code-fdd42e838e4d5199b0277fc21a920a744cdd5c9d.zip diff --git a/.python-ruamel-yaml-clib.metadata b/.python-ruamel-yaml-clib.metadata deleted file mode 100644 index 3e5045f..0000000 --- a/.python-ruamel-yaml-clib.metadata +++ /dev/null @@ -1 +0,0 @@ -ff23dd8a8266f256987fc42e1d7e88260409efc6 SOURCES/ruamel-yaml-clib-code-fdd42e838e4d5199b0277fc21a920a744cdd5c9d.zip diff --git a/SOURCES/LICENSE-libyaml b/LICENSE-libyaml similarity index 100% rename from SOURCES/LICENSE-libyaml rename to LICENSE-libyaml diff --git a/SOURCES/fix-typecasts-s390x.patch b/SOURCES/fix-typecasts-s390x.patch deleted file mode 100644 index 0a38063..0000000 --- a/SOURCES/fix-typecasts-s390x.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pxd.s390x ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pxd ---- ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pxd.s390x 2022-05-11 17:33:41.727476439 +0200 -+++ ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pxd 2022-05-11 17:34:34.197700039 +0200 -@@ -86,10 +86,10 @@ cdef extern from "_ruamel_yaml.h": - 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 -diff -up ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pyx.s390x ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pyx ---- ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pyx.s390x 2022-05-12 13:05:17.540913818 +0200 -+++ ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/_ruamel_yaml.pyx 2022-05-12 13:06:38.211269280 +0200 -@@ -904,7 +904,7 @@ cdef class CParser: - 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: -@@ -1514,7 +1514,7 @@ cdef class CEmitter: - 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 -up ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/yaml.h.s390x ruamel-yaml-clib-code-85e484db2b7c37107e4edd2ae6fc380877bbc08e/yaml.h diff --git a/fix-typecasts-s390x.patch b/fix-typecasts-s390x.patch new file mode 100644 index 0000000..a206278 --- /dev/null +++ b/fix-typecasts-s390x.patch @@ -0,0 +1,74 @@ +diff --git a/_ruamel_yaml.pxd b/_ruamel_yaml.pxd +index d8dc3c6bdaa27055..9e63ba7e4be3e4af 100644 +--- a/_ruamel_yaml.pxd ++++ b/_ruamel_yaml.pxd +@@ -1,16 +1,16 @@ + + cdef extern from "_ruamel_yaml.h": + +- void malloc(int l) +- void memcpy(char *d, char *s, int l) +- int strlen(char *s) ++ void malloc(size_t l) ++ void memcpy(void *d, const void *s, size_t l) ++ size_t strlen(const char *s) + int PyString_CheckExact(object o) + int PyUnicode_CheckExact(object o) + char *PyString_AS_STRING(object o) +- int PyString_GET_SIZE(object o) +- object PyString_FromStringAndSize(char *v, int l) +- object PyUnicode_FromString(char *u) +- object PyUnicode_DecodeUTF8(char *u, int s, char *e) ++ Py_ssize_t PyString_GET_SIZE(object o) ++ object PyString_FromStringAndSize(char *v, Py_ssize_t l) ++ object PyUnicode_FromString(const char *u) ++ object PyUnicode_DecodeUTF8(const char *u, size_t s, const char *e) + object PyUnicode_AsUTF8String(object o) + int PY_MAJOR_VERSION + +@@ -85,11 +85,11 @@ cdef extern from "_ruamel_yaml.h": + YAML_MAPPING_START_EVENT + YAML_MAPPING_END_EVENT + +- ctypedef int yaml_read_handler_t(void *data, char *buffer, +- int size, int *size_read) except 0 ++ ctypedef int yaml_read_handler_t(void *data, unsigned char *buffer, ++ size_t size, size_t *size_read) except 0 + +- ctypedef int yaml_write_handler_t(void *data, char *buffer, +- int size) except 0 ++ ctypedef int yaml_write_handler_t(void *data, unsigned char *buffer, ++ size_t size) except 0 + + ctypedef struct yaml_mark_t: + int index +diff --git a/_ruamel_yaml.pyx b/_ruamel_yaml.pyx +index 4fd50e207b8d5100..20a796a30662c890 100644 +--- a/_ruamel_yaml.pyx ++++ b/_ruamel_yaml.pyx +@@ -904,7 +904,7 @@ cdef class CParser: + raise error + return 1 + +-cdef int input_handler(void *data, char *buffer, int size, int *read) except 0: ++cdef int input_handler(void *data, unsigned char *buffer, size_t size, size_t *read) except 0: + cdef CParser parser + parser = data + if parser.stream_cache is None: +@@ -1514,13 +1514,13 @@ cdef class CEmitter: + self.ascend_resolver() + return 1 + +-cdef int output_handler(void *data, char *buffer, int size) except 0: ++cdef int output_handler(void *data, unsigned char *buffer, size_t size) except 0: + cdef CEmitter emitter + emitter = data + if emitter.dump_unicode == 0: +- value = PyString_FromStringAndSize(buffer, size) ++ value = PyString_FromStringAndSize(buffer, size) + else: +- value = PyUnicode_DecodeUTF8(buffer, size, 'strict') ++ value = PyUnicode_DecodeUTF8(buffer, size, 'strict') + emitter.stream.write(value) + return 1 + diff --git a/SPECS/python-ruamel-yaml-clib.spec b/python-ruamel-yaml-clib.spec similarity index 87% rename from SPECS/python-ruamel-yaml-clib.spec rename to python-ruamel-yaml-clib.spec index a0ba5d2..aacc597 100644 --- a/SPECS/python-ruamel-yaml-clib.spec +++ b/python-ruamel-yaml-clib.spec @@ -2,7 +2,7 @@ Name: python-ruamel-yaml-clib Version: 0.2.7 -Release: 3%{?dist} +Release: 8%{?dist} Summary: C version of reader, parser and emitter for ruamel.yaml derived from libyaml # SPDX @@ -13,7 +13,7 @@ Source0: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml-clib/ # https://sourceforge.net/p/ruamel-yaml-clib/tickets/16/ # This should be fixed upstream in a future ruamel.yaml.clib release >0.2.7 Source1: https://github.com/yaml/libyaml/raw/0.1.7/LICENSE#/LICENSE-libyaml -Patch: fix-typecasts-s390x.patch +Patch1: fix-typecasts-s390x.patch BuildRequires: gcc @@ -55,7 +55,7 @@ Provides: bundled(libyaml) = 0.1.7 %description -n python3-ruamel-yaml-clib %{_description} %prep -%autosetup -n ruamel-yaml-clib-code-%{commit} +%autosetup -p1 -n ruamel-yaml-clib-code-%{commit} # Force regenerating C files from Cython sources rm -v $(grep -rl '/\* Generated by Cython') cp -p '%{SOURCE1}' . @@ -95,6 +95,22 @@ rmdir ruamel.yaml.clib %doc README.rst %changelog +* Tue Oct 29 2024 Troy Dawson - 0.2.7-8 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 0.2.7-7 +- Bump release for June 2024 mass rebuild + +* Thu Feb 01 2024 Florian Weimer - 0.2.7-6 +- Update fix-typecasts-s390x.patch for GCC 14 compatibility (#2042422) + +* Fri Jan 26 2024 Fedora Release Engineering - 0.2.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.2.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 0.2.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources new file mode 100644 index 0000000..605a509 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (ruamel-yaml-clib-code-fdd42e838e4d5199b0277fc21a920a744cdd5c9d.zip) = 7040eacf8028e0a8ffb189f32f6f1e591223c46f5bcc16638d336ef9bd51c4a06e4e7aac63499fcccf35f63b211323ce279a21d6188ca9307e137786b34b7d66