From 536e7a260401cbd80e85e0d27435a7ea95d3510a Mon Sep 17 00:00:00 2001 From: rdobuilder Date: Nov 10 2022 11:39:33 +0000 Subject: Update to 5.5.0 Related-to: https://review.rdoproject.org/r/q/I221d73f1e47b760312c0f7da649b0327a9a96661 --- diff --git a/.python-ujson.metadata b/.python-ujson.metadata new file mode 100644 index 0000000..37e6a26 --- /dev/null +++ b/.python-ujson.metadata @@ -0,0 +1,3 @@ +ed6764f21c0f41f4a8e502c99a6d6d7c6dba80b8 SOURCES/ujson-5.5.0.tar.gz +c3af79968c6f985649529d5e3a15d3f1fcd3f526 SOURCES/LICENSE-MODP_ASCII +2f233722e862a7f8a7aadbfe4695bb4be79d0c6d SOURCES/LICENSE-TCL diff --git a/SOURCES/0001-Use-double-conversion-from-the-system.patch b/SOURCES/0001-Use-double-conversion-from-the-system.patch new file mode 100644 index 0000000..78b497c --- /dev/null +++ b/SOURCES/0001-Use-double-conversion-from-the-system.patch @@ -0,0 +1,43 @@ +From 91ab320957b15188c63a280133a71ae3fdb2e758 Mon Sep 17 00:00:00 2001 +From: Kushal Das +Date: Sun, 7 Jun 2020 13:11:55 +0530 +Subject: [PATCH] Use double-conversion from the system + +--- + setup.py | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/setup.py b/setup.py +index 87b96fa..47c409c 100644 +--- a/setup.py ++++ b/setup.py +@@ -17,22 +17,20 @@ Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3 :: Only + """ + +-dconv_source_files = glob("./deps/double-conversion/double-conversion/*.cc") +-dconv_source_files.append("./lib/dconv_wrapper.cc") + + module1 = Extension( + "ujson", +- sources=dconv_source_files +- + [ ++ sources=[ ++ "./lib/dconv_wrapper.cc", + "./python/ujson.c", + "./python/objToJSON.c", + "./python/JSONtoObj.c", + "./lib/ultrajsonenc.c", + "./lib/ultrajsondec.c", + ], +- include_dirs=["./python", "./lib", "./deps/double-conversion/double-conversion"], ++ include_dirs=["./python", "./lib", "/usr/include/double-conversion"], + extra_compile_args=["-D_GNU_SOURCE"], +- extra_link_args=["-lstdc++", "-lm"], ++ extra_link_args=["-lstdc++", "-lm", "-ldouble-conversion"], + ) + + +-- +2.26.2 + diff --git a/SPECS/python-ujson.spec b/SPECS/python-ujson.spec new file mode 100644 index 0000000..20fc8c7 --- /dev/null +++ b/SPECS/python-ujson.spec @@ -0,0 +1,213 @@ +Name: python-ujson +Version: 5.5.0 +Release: 1%{?dist} +Summary: Ultra fast JSON encoder and decoder written in pure C + +# The entire source is BSD-3-Clause, except: +# +# ---- +# +# Portions of code from MODP_ASCII - Ascii transformations (upper/lower, etc) +# https://github.com/client9/stringencoders +# Copyright (c) 2007 Nick Galbreath -- nickg [at] modp [dot] com. All rights reserved. +# +# While the linked GitHub repository is currently under the MIT license, +# analysis of the history of both https://github.com/ultrajson/ultrajson and +# https://github.com/client9/stringencoders shows that it was under a +# BSD-3-Clause license at the time the code was included in UltraJSON. The code +# in question may be present in python/objToJSON.c, python/ujson.c, and/or +# python/JSONtoObj.c. +# +# ---- +# +# Numeric decoder derived from from TCL library +# https://opensource.apple.com/source/tcl/tcl-14/tcl/license.terms +# * Copyright (c) 1988-1993 The Regents of the University of California. +# * Copyright (c) 1994 Sun Microsystems, Inc. +# +# Based on the linked license text, this code is under the TCL license. It may +# be present in python/objToJSON.c, python/ujson.c, and/or python/JSONtoObj.c. +# +# ---- +# +# Filed upstream: +# Please consider including other licenses mentioned in LICENSE.txt +# https://github.com/ultrajson/ultrajson/issues/565 +License: BSD-3-Clause AND TCL +URL: https://github.com/ultrajson/ultrajson +Source0: %{pypi_source ujson} +Source1: https://github.com/client9/stringencoders/raw/cfd5c1507325ae497ea9bacdacba12c0ffd79d30/COPYING#/LICENSE-MODP_ASCII +Source2: https://opensource.apple.com/source/tcl/tcl-14/tcl/license.terms#/LICENSE-TCL + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: double-conversion-devel + +BuildRequires: python3-devel +BuildRequires: python3dist(pytest) +BuildRequires: pyproject-rpm-macros + +%global _description %{expand: +UltraJSON is an ultra fast JSON encoder and decoder written in pure C with +bindings for Python.} + +%description %{_description} + +%package -n python3-ujson +Summary: %{summary} + +%description -n python3-ujson %{_description} + +%prep +%autosetup -n ujson-%{version} -p1 +# Remove bundled double-conversion +rm -vrf deps +cp -p '%{SOURCE1}' '%{SOURCE2}' . + +%generate_buildrequires +%pyproject_buildrequires + +%build +export UJSON_BUILD_NO_STRIP=1 +export UJSON_BUILD_DC_INCLUDES='%{_includedir}/double-conversion' +export UJSON_BUILD_DC_LIBS='-ldouble-conversion' +%pyproject_wheel + +%install +%pyproject_install +%pyproject_save_files ujson + +%check +%pytest -v + +%files -n python3-ujson -f %{pyproject_files} +# pyproject_files handles LICENSE.txt; verify with “rpm -qL -p …” +# Text for additional licenses mentioned in LICENSE.txt; see +# https://github.com/ultrajson/ultrajson/issues/565 +%license LICENSE-MODP_ASCII LICENSE-TCL +%doc README.md + +%changelog +* Sat Sep 17 2022 Benjamin A. Beasley - 5.5.0-1 +- Update to 5.5.0 (closes RHBZ#2127227) +- Update License to SPDX and include additional license texts + +* Thu Jul 14 2022 Alfredo Moralejo - 5.4.0-1 +- Update to 5.4.0 (closes rhbz#2103379) +- Includes fixes for CVE-2022-31117 and CVE-2022-31116 + +* Fri May 20 2022 Benjamin A. Beasley - 5.3.0-1 +- Update to 5.3.0 (close RHBZ#2088232) + +* Fri Apr 08 2022 Benjamin A. Beasley - 5.2.0-1 +- Update to 5.2.0 (close RHBZ#2072241) +- Migrate to pyproject-rpm-macros (“new Python guidelines”) + +* Sun Mar 06 2022 Benjamin A. Beasley - 5.1.0-1 +- Update to 5.1.0 (close RHBZ#1862763) +- Unbundle double-conversion and prevent debug symbol stripping with separate + patches, both offered upstream +- Drop obsolete %%python_provide macro + +* Fri Jan 21 2022 Fedora Release Engineering - 4.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Jul 31 2021 Kushal Das 4.0.2-1 +- Update to 4.0.2 + +* Tue Jul 27 2021 Fedora Release Engineering - 3.0.0-5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 3.0.0-4 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 3.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun Jun 07 2020 Kushal Das 3.0.0-1 +- Update to 3.0.0 + +* Tue May 26 2020 Miro Hrončok - 2.0.3-2 +- Rebuilt for Python 3.9 + +* Tue May 12 2020 Igor Raits - 2.0.3-1 +- Update to 2.0.3 + +* Thu Jan 30 2020 Fedora Release Engineering - 2.0-0.3.20170206git2f1d487 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Sep 03 2019 Miro Hrončok - 2.0-0.2.20170206git2f1d487 +- Subpackage python2-ujson has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Mon Aug 19 2019 Miro Hrončok - 2.0-0.1.20170206git2f1d487.9 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 2.0-0.1.20170206git2f1d487.8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 2.0-0.1.20170206git2f1d487.7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.0-0.1.20170206git2f1d487.6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 2.0-0.1.20170206git2f1d487.5 +- Rebuilt for Python 3.7 + +* Mon Feb 12 2018 Iryna Shcherbina - 2.0-0.1.20170206git2f1d487.4 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Feb 09 2018 Fedora Release Engineering - 2.0-0.1.20170206git2f1d487.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 2.0-0.1.20170206git2f1d487.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.0-0.1.20170206git2f1d487.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Adam Williamson - 2.0-0.1.20170206git2f1d487 +- Update to pre-2.0 git snapshot, removes non-standard serialization behaviour + +* Sun Jan 01 2017 Igor Gnatenko - 1.35-1 +- Update to 1.35 +- Run test suite +- Spec cleanups + +* Mon Dec 19 2016 Miro Hrončok - 1.33-5 +- Rebuild for Python 3.6 + +* Tue Jul 19 2016 Fedora Release Engineering - 1.33-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Thu Feb 04 2016 Fedora Release Engineering - 1.33-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Nov 06 2015 Robert Kuska - 1.33-2 +- Rebuilt for Python3.5 rebuild + +* Sat Aug 1 2015 Julien Enselme - 1.33-1 +- Update to 1.33 +- Enable python3 subpackage +- Update SPEC to match packaging guidelines + +* Thu Jun 18 2015 Fedora Release Engineering - 1.23-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 1.23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Dec 19 2012 Kushal Das 1.23-1 +- Intial package