SLFO-pool/json-c
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main json-c revision d502e0b9d48a1edc1fd758f7cd007df1

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-03 14:05:54 +02:00
commit f851f62ae1
5 changed files with 554 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
baselibs.conf Normal file
View File

@ -0,0 +1 @@
libjson-c5

BIN
json-c-0.16-20220414.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

389
json-c.changes Normal file
View File

@ -0,0 +1,389 @@
-------------------------------------------------------------------
Wed Apr 20 06:29:21 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
- Update to 0.16:
+ Deprecated and removed features:
* JSON_C_OBJECT_KEY_IS_CONSTANT is deprecated in favor of
JSON_C_OBJECT_ADD_CONSTANT_KEY
* Direct access to lh_table and lh_entry structure members is deprecated.
Use access functions instead, lh_table_head(), lh_entry_next(), etc...
* Drop REFCOUNT_DEBUG code.
+ Changes and bug fixes
* Cap string length at INT_MAX to avoid various issues with very long strings.
* json_object_deep_copy: fix deep copy of strings containing '\0'
* Fix read past end of buffer in the "json_parse" command
* Avoid out of memory accesses in the locally provided vasprintf() function
(for those platforms that use it)
* Handle allocation failure in json_tokener_new_ex
* Fix use-after-free in json_tokener_new_ex() in the event of printbuf_new() returning NULL
* printbuf_memset(): set gaps to zero - areas within the print buffer which
have not been initialized by using printbuf_memset
* printbuf: return -1 on invalid arguments (len < 0 or total buffer > INT_MAX)
* sprintbuf(): propagate printbuf_memappend errors back to the caller
* Validate size arguments in arraylist functions.
* Use getrandom() if available; with GRND_NONBLOCK to allow use of json-c
very early during boot, such as part of cryptsetup.
* Use arc4random() if it's available.
* random_seed: on error, continue to next method instead of exiting the process
* Close file when unable to read from /dev/urandom in get_dev_random_seed()
* Speed up parsing by replacing ctype functions with simplified, faster
non-locale-sensitive ones in json_tokener and json_object_to_json_string.
* Neither vertical tab nor formfeed are considered whitespace per the JSON spec
* json_object: speed up creation of objects, calloc() -> malloc() + set fields
* Avoid needless extra strlen() call in json_c_shallow_copy_default() and
json_object_equal() when the object is known to be a json_type_string.
-------------------------------------------------------------------
Wed May 19 15:04:03 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Add -std=gnu99 to fix build with some gcc versions
-------------------------------------------------------------------
Mon Aug 17 10:02:27 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- update to 0.15:
* Deprecate `array_list_new()` in favor of `array_list_new2()`
* Remove the THIS_FUNCTION_IS_DEPRECATED define.
* Remove config.h.win32
* Add a `JSON_TOKENER_ALLOW_TRAILING_CHARS` flag to allow multiple objects
to be parsed even when `JSON_TOKENER_STRICT` is set.
* Add `json_object_new_array_ext(int)` and `array_list_new_2(int)` to allow
arrays to be allocated with the exact size needed, when known.
* Add `json_object_array_shrink()` (and `array_list_shrink()`) and use it in
json_tokener to minimize the amount of memory used.
* Add a json_parse binary, for use in testing changes (not installed, but
available in the apps directory).
* Split the internal json_object structure into several sub-types, one for
each json_type (json_object_object, json_object_string, etc...).
This improves memory usage and speed, with the benchmark under
bench/ report 5.8% faster test time and 6%(max RSS)-12%(peak heap)
less memory usage.
Memory used just for json_object structures decreased 27%, so use cases
with fewer arrays and/or strings would benefit more.
* Minimize memory usage in array handling in json_tokener by shrinking
arrays to the exact number of elements parsed. On bench/ benchmark:
9% faster test time, 39%(max RSS)-50%(peak heap) less memory usage.
Add json_object_array_shrink() and array_list_shrink() functions.
* #616 - Parsing of surrogate pairs in unicode escapes now properly handles
incremental parsing.
* Fix incremental parsing of numbers, especially those with exponents, e.g.
so parsing "[0", "e+", "-]" now properly returns an error.
Strict mode now rejects missing exponents ("0e").
* Successfully return number objects at the top level even when they are
followed by a "-", "." or "e". This makes parsing things like "123-45"
behave consistently with things like "123xyz".
* #589 - Detect broken RDRAND during initialization; also, fix segfault
in the CPUID check.
* #592 - Fix integer overflows to prevert out of bounds write on large input.
* Protect against division by zero in linkhash, when creaed with zero size.
* #602 - Fix json_parse_uint64() internal error checking, leaving the retval
untouched in more failure cases.
* #614 - Prevent truncation when custom double formatters insert extra \0's
- remove 0001-Detect-broken-RDRAND-during-initialization.patch (upstream)
-------------------------------------------------------------------
Wed Jun 17 08:04:43 UTC 2020 - Dan Čermák <dcermak@suse.com>
- Add upstream fix for boo#1173022
* Added patch 0001-Detect-broken-RDRAND-during-initialization.patch
* use URL from the releases page on github
* run spec-cleaner over the spec file
-------------------------------------------------------------------
Tue Apr 28 07:45:45 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
- json-c 0.14:
* bits.h has been removed
* lh_abort() has been removed
* lh_table_lookup() has been removed, use lh_table_lookup_ex() instead.
* Remove TRUE and FALSE defines, use 1 and 0 instead.
* Switch to cmake
* Build fixes
* Doc updates
* Added a json_tokener_get_parse_end() function to replace
direct access of tok->char_offset
* json_tokener_parse_ex() now accepts a new JSON_TOKENER_VALIDATE_UTF8 flag
to validate that input is UTF8
* Add support for unsigned 64-bit integers
* A total of 7 new functions were added:
* json_object_get_uint64 ( struct json_object const* jso )
* json_object_new_uint64 ( uint64_t i )
* json_object_set_uint64 ( struct json_object* jso, uint64_t new_value )
* json_parse_uint64 ( char const* buf, uint64_t* retval )
* See description of uint64 support, above.
* json_tokener_get_parse_end ( struct json_tokener* tok )
* See details under "json_tokener changes", above.
* json_object_from_fd_ex ( int fd, int in_depth )
* Allows the max nesting depth to be specified.
* json_object_new_null ( )
* Simply returns NULL. Its use is not recommended.
* The size of struct json_object has decreased from 96 bytes to 88 bytes.
-------------------------------------------------------------------
Tue Mar 13 01:21:57 UTC 2018 - avindra@opensuse.org
- json-c 0.13.1
* Add const size_t json_c_object_sizeof()
* Avoid invalid free (and thus a segfault) when ref_count gets < 0
* Fix handling of custom double formats that include a ".0"
* Avoid uninitialized variable warnings in json_object_object_foreach
* Add a top level fuzz directory for fuzzers run by OSS-Fuzz
* Fix build for certain uClibc based systems.
* Bump sonum to 4.0 to avoid conflicts because some packagers made
their own bump to ".so.3" for the older 0.12 release
-------------------------------------------------------------------
Thu Dec 28 05:17:43 UTC 2017 - avindra@opensuse.org
- json-c 0.13
+ Deprecated and removed features:
* Internal use of bits.h has been eliminated.
* lh_abort() is deprecated
+ Behavior changes:
* Tighten the number parsing algorithm to raise errors instead
of truncating the results. For example 12.3.4 or 2015-01-15,
which now return null.
* Use size_t for array length and size. Platforms where
sizeof(size_t) != sizeof(int) may not be backwards compatible
* Check for failue when allocating memory, returning NULL and
errno=ENOMEM.
* Change json_object_object_add() return type from void to int,
and will return -1 on failures, instead of exiting. (Note:
this is not an ABI change)
+ New features:
* Aiming to follow RFC 7159 now.
* Support for JSON pointer, RFC 6901 (see json_pointer.h)
* Add a couple of additional option to json_object_to_json_string_ext:
JSON_C_TO_STRING_PRETTY_TAB
JSON_C_TO_STRING_NOSLASHESCAPE
* json_object_object_add_ex() - better perf when certain
constraints are known to be true
* Serialization format of doubles now configurable
* New functions
- json_object_equal() - utility function for comparing
json_objects
- json_object_deep_copy() - a way to copy entire object
trees
- json_object_set_<type>() - modify the value of
existing json_object's without the need to recreate them.
Also add a json_object_int_inc function to adjust an int's'
value.
- json_util_get_last_err() - retrieve the string describing
the cause of errors, instead of printing to stderr.
- perllike hash function for strings
* json_global_set_string_hash()
* json_c_visit() - a way to iterate over a tree of json-c
objects.
+ Notable bug fixes and other improvements:
* Make reference increment and decrement atomic to allow
passing json objects between threads.
* Fix json_object_object_foreach to avoid uninitialized
variable warnings.
* Improve performance by removing unneeded data items from
hashtable code and reducing duplicate hash computation.
* Performance: store small strings inside json_object
* Performance: of json_object_to_json_string by removing
variadic printf
* Fix parsing of "-Infinity", and avoid needlessly copying the
input when doing so.
* Fix stack buffer overflow in json_object_double_to_json_string_format()
* Fix various potential null ptr deref and int32 overflows
* Fix a long-standing bug in array_list_put_idx() where it
would attempt to free previously free'd entries due to not
checking the current array length.
* use uselocale() instead of setlocale() in json_tokener to
behave better in threaded environments.
* Fix out of bounds read when handling unicode surrogate pairs.
* Ensure doubles that happen to be a whole number are emitted
with ".0"
* Visual Studio: use a snprintf/vsnprintf wrapper that ensures
the string is terminated.
* Fix double to int cast overflow in json_object_get_int64.
* Clamp double to int32 when narrowing in json_object_get_int.
* Use strtoll() to parse ints - instead of sscanf
* usual code linting
+ Build changes:
* Add Appveyor and Travis build support
* Support for MacOS and Windows through CMake
* Silent build by default
* Link against libm when needed
* Add support for building with AddressSanitizer
* Add support for building with Clang
* Add a --enable-threading configure option, and only use the
(slower) __sync_add_and_fetch()/__sync_sub_and_fetch()
function when it is specified.
- cleanup with spec-cleaner
- remove fix-set-but-not-used.patch
+ fixed: https://github.com/json-c/json-c/issues/240
- remove gcc7-fix.patch
+ fixed in 014924ba899f659917bb64392bbff7d3c803afc2
-------------------------------------------------------------------
Thu Mar 23 09:29:23 UTC 2017 - mliska@suse.cz
- Added gcc7-fix.patch
-------------------------------------------------------------------
Mon Jul 18 17:39:03 UTC 2016 - rpm@fthiessen.de
- Update to upstream release 0.12.1
- Removed upstream fixed json-c-0.12-unused_variable_size.patch
- Added fix-set-but-not-used.patch
-------------------------------------------------------------------
Sat Sep 20 12:07:25 UTC 2014 - andreas.stieger@gmx.de
- json-c 0.12
Fixes for security issues contained in this release have been
previously patched into this package, but listed for completeness:
* Address security issues:
* CVE-2013-6371: hash collision denial of service
* CVE-2013-6370: buffer overflow if size_t is larger than int
- Further changes:
* Avoid potential overflow in json_object_get_double
* Eliminate the mc_abort() function and MC_ABORT macro.
* Make the json_tokener_errors array local. It has been deprecated for
a while, and json_tokener_error_desc() should be used instead.
* change the floating point output format to %.17g so values with
more than 6 digits show up in the output.
* Remove the old libjson.so name compatibility support. The library is
only created as libjson-c.so now and headers are only installed
into the ${prefix}/json-c directory.
* When supported by the linker, add the -Bsymbolic-functions flag.
* Make strict mode more strict:
* number must not start with 0
* no single-quote strings
* no comments
* trailing char not allowed
* only allow lowercase literals
* Added a json_object_new_double_s() convenience function to allow
an exact string representation of a double to be specified when
creating the object and use it in json_tokener_parse_ex() so
a re-serialized object more exactly matches the input.
* Add support NaN and Infinity
- packaging changes:
* json-c-hash-dos-and-overflow-random-seed-4e.patch is upstream
* Move from json-c-lfs.patch which removed warning errors and
autoconf call to json-c-0.12-unused_variable_size.patch from
upstream which fixes the warning
* except for SLE 11 where autoreconf call is required
* add licence file to main package
-------------------------------------------------------------------
Mon Apr 7 12:22:58 UTC 2014 - idonmez@suse.com
- Add json-c-hash-dos-and-overflow-random-seed-4e.patch to fix
CVE-2013-6370 and CVE-2013-6371 (bnc#870147)
-------------------------------------------------------------------
Tue Feb 4 14:54:51 UTC 2014 - jengelh@inai.de
- Update metadata (description, RPM groups), and remove .la file
in %install, not %check.
-------------------------------------------------------------------
Mon Jan 6 13:09:45 UTC 2014 - fstrba@suse.com
- Upgrade to 0.11 version:
- SONAME change.
- Fix provides and obsoletes accordingly
- symlink the .pc file to the oldname for software that needs it
- Remove json-c-fix-headers.patch integrated upstream
-------------------------------------------------------------------
Sun Mar 10 08:38:30 UTC 2013 - coolo@suse.com
- add json-c-fix-headers.patch from master branch to fix compilation
of apps using the lib
-------------------------------------------------------------------
Thu Mar 7 09:43:30 UTC 2013 - bruno@ioda-net.ch
- Update to 0.10 version :
* Add a json_object_to_json_string_ext() function to allow output
to be formatted in a more human readable form.
* Add json_object_object_get_ex(), a NULL-safe get object method,
to be able to distinguish between a key not present and the value
being NULL.
* Add an alternative iterator implementation, see json_object_iterator.h
* Make json_object_iter public to enable external use of the
json_object_object_foreachC macro.
* Add a printbuf_memset() function to provide an effecient way to set and
append things like whitespace indentation.
* Adjust json_object_is_type and json_object_get_type so they return
json_type_null for NULL objects and handle NULL passed to
json_objct_object_get().
* Rename boolean type to json_bool.
* Fix various compile issues for Visual Studio and MinGW.
* Allow json_tokener_parse_ex() to be re-used to parse multiple object.
Also, fix some parsing issues with capitalized hexadecimal numbers and
number in E notation.
* Add json_tokener_get_error() and json_tokener_error_desc() to better
encapsulate the process of retrieving errors while parsing.
* Various improvements to the documentation of many functions.
* Add new json_object_array_sort() function.
* Fix a bug in json_object_get_int(), which would incorrectly return 0
when called on a string type object.
Eric Haszlakiewicz
* Add a json_type_to_name() function.
Eric Haszlakiewicz
* Add a json_tokener_parse_verbose() function.
Jehiah Czebotar
* Improve support for null bytes within JSON strings.
Jehiah Czebotar
* Fix file descriptor leak if memory allocation fails in json_util
Zachary Blair, zack_blair at hotmail dot com
* Add int64 support. Two new functions json_object_net_int64 and
json_object_get_int64. Binary compatibility preserved.
Eric Haszlakiewicz, EHASZLA at transunion com
Rui Miguel Silva Seabra, rms at 1407 dot org
* Fix subtle bug in linkhash where lookup could hang after all slots
were filled then successively freed.
Spotted by Jean-Marc Naud, j dash m at newtraxtech dot com
* Make json_object_from_file take const char *filename
Spotted by Vikram Raj V, vsagar at attinteractive dot com
* Add handling of surrogate pairs (json_tokener.c, test4.c, Makefile.am)
Brent Miller, bdmiller at yahoo dash inc dot com
* Correction to comment describing printbuf_memappend in printbuf.h
Brent Miller, bdmiller at yahoo dash inc dot com
- Packaging :
* upgrade upstream location https://gitub.com/json-c/json-c/wiki
* cleanup old patches included now upstream
. json-c-0.9-linkhash.patch
. json-c-0.9-json_tokener.patch
. json-c-0.9-json_object_from_file.patch
. json-c-0.9-base.patch
* Redone lfs patch against new 0.10 release
* Removed empty NEWS file
-------------------------------------------------------------------
Sun Apr 22 00:34:03 UTC 2012 - crrodriguez@opensuse.org
- Fix LFS support in x86.
- Do not build with -Werror
- Remove "la" files
- tune up autotools scripts as well ensure config.h is included
everywhere
-------------------------------------------------------------------
Sun Nov 13 13:50:27 UTC 2011 - jengelh@medozas.de
- Remove redundant/unwanted tags/section (cf. specfile guidelines)
-------------------------------------------------------------------
Sun Nov 13 09:11:46 UTC 2011 - coolo@suse.com
- add libtool as explicit buildrequire to avoid implicit dependency from prjconf
-------------------------------------------------------------------
Mon Aug 29 08:01:40 UTC 2011 - coolo@novell.com
- add baselibs.conf for pulseaudio to use
- use original sources
-------------------------------------------------------------------
Thu Nov 4 17:22:27 UTC 2010 - chris@computersalat.de
- initial pkg 0.9

138
json-c.spec Normal file
View File

@ -0,0 +1,138 @@
#
# spec file for package json-c
#
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define libname libjson-c
%define libsoname %{libname}5
%define oldlibname libjson
%define version_date 20220414
Name: json-c
Version: 0.16
Release: 0
Summary: JSON implementation in C
License: MIT
Group: Development/Libraries/C and C++
URL: https://github.com/json-c/json-c
Source0: https://github.com/json-c/json-c/archive/json-c-%{version}-%{version_date}.tar.gz
Source1: baselibs.conf
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: libtool
BuildRequires: pkgconfig
%description
JSON-C implements a reference counting object model that allows you to
easily construct JSON objects in C, output them as JSON formatted
strings and parse JSON formatted strings back into the C
representation of JSON objects.
%package -n %{libsoname}
Summary: JSON-C shared library
Group: System/Libraries
%description -n %{libsoname}
JSON-C implements a reference counting object model that allows you to
easily construct JSON objects in C, output them as JSON formatted
strings and parse JSON formatted strings back into the C
representation of JSON objects.
This package includes the JSON library.
%package -n %{libname}-devel
Summary: Development headers and libraries for json-c
Group: Development/Libraries/C and C++
Requires: %{libsoname} = %{version}
Provides: %{oldlibname}-devel = %{version}
Obsoletes: %{oldlibname}-devel < %{version}
%description -n %{libname}-devel
JSON-C implements a reference counting object model that allows you to
easily construct JSON objects in C, output them as JSON formatted
strings and parse JSON formatted strings back into the C
representation of JSON objects.
This package includes header files and scripts needed for developers
using the json-c library
%package -n %{libname}-doc
Summary: Documentation files
Group: Documentation/Other
Provides: %{oldlibname}-doc = %{version}
Obsoletes: %{oldlibname}-doc < %{version}
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%description -n %{libname}-doc
JSON-C implements a reference counting object model that allows you to
easily construct JSON objects in C, output them as JSON formatted
strings and parse JSON formatted strings back into the C
representation of JSON objects.
This package includes the json-c documentation.
%prep
%autosetup -p1 -n %{name}-json-c-%{version}-%{version_date}
%build
%if 0%{?suse_version} <= 1110
sed -i 's/-Werror //g' Makefile.am.inc
autoreconf -fiv
%endif
%cmake \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \
-DCMAKE_C_FLAGS=-std=gnu99 \
-DENABLE_THREADING=ON \
-DENABLE_RDRAND=ON
%check
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
%ctest
%install
%cmake_install
find %{buildroot} -type f -name "*.la" -delete -print
# create a compatibilty pkg-config file for software needing it
(cd %{buildroot}%{_libdir}/pkgconfig && ln -s json-c.pc json.pc)
mkdir -p "%{buildroot}%{_docdir}/%{name}-doc"
cp -R doc/html "%{buildroot}%{_docdir}/%{name}-doc"
%fdupes %{buildroot}%{_docdir}
%post -n %{libsoname} -p /sbin/ldconfig
%postun -n %{libsoname} -p /sbin/ldconfig
%files -n %{libsoname}
%{_libdir}/%{libname}.so.*
%license COPYING
%files -n %{libname}-devel
%{_libdir}/%{libname}.so
%{_includedir}/json-c
%{_libdir}/pkgconfig/*.pc
%dir %{_libdir}/cmake/json-c
%{_libdir}/cmake/json-c/json-c-config.cmake
%{_libdir}/cmake/json-c/json-c-targets-none.cmake
%{_libdir}/cmake/json-c/json-c-targets.cmake
%files -n %{libname}-doc
%license COPYING
%doc AUTHORS ChangeLog README README.html
%doc %{_docdir}/%{name}-doc
%changelog