diff --git a/.gitignore b/.gitignore index 3a5af79..d2de33f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/libfastjson-0.99.9.tar.gz -/libfastjson-0.99.9.tar.gz +libfastjson-1.2304.0.tar.gz diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index eb7c84f..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/libfastjson-CVE-2020-12762.patch b/libfastjson-CVE-2020-12762.patch deleted file mode 100644 index 9c8ce74..0000000 --- a/libfastjson-CVE-2020-12762.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/printbuf.c b/printbuf.c -index e9cde11..b02a363 100644 ---- a/printbuf.c -+++ b/printbuf.c -@@ -13,6 +13,7 @@ - - #include "config.h" - -+#include - #include - #include - #include -@@ -68,9 +69,16 @@ static int printbuf_extend(struct printbuf *p, int min_size) - if (p->size >= min_size) - return 0; - -- new_size = p->size * 2; -- if (new_size < min_size + 8) -- new_size = min_size + 8; -+ /* Prevent signed integer overflows with large buffers. */ -+ if (min_size > INT_MAX - 8) -+ return -1; -+ if (p->size > INT_MAX / 2) -+ new_size = min_size + 8; -+ else { -+ new_size = p->size * 2; -+ if (new_size < min_size + 8) -+ new_size = min_size + 8; -+ } - #ifdef PRINTBUF_DEBUG - MC_DEBUG("printbuf_memappend: realloc " - "bpos=%d min_size=%d old_size=%d new_size=%d\n", -@@ -85,6 +93,9 @@ static int printbuf_extend(struct printbuf *p, int min_size) - - int printbuf_memappend(struct printbuf *p, const char *buf, int size) - { -+ /* Prevent signed integer overflows with large buffers. */ -+ if (size > INT_MAX - p->bpos - 1) -+ return -1; - if (p->size <= p->bpos + size + 1) { - if (printbuf_extend(p, p->bpos + size + 1) < 0) - return -1; -@@ -136,6 +147,9 @@ int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len) - - if (offset == -1) - offset = pb->bpos; -+ /* Prevent signed integer overflows with large buffers. */ -+ if (len > INT_MAX - offset) -+ return -1; - size_needed = offset + len; - if (pb->size < size_needed) - { diff --git a/libfastjson.spec b/libfastjson.spec index b74cf99..4e469c4 100644 --- a/libfastjson.spec +++ b/libfastjson.spec @@ -1,13 +1,13 @@ Name: libfastjson -Version: 0.99.9 -Release: 2%{?dist} +Version: 1.2304.0 +Release: 6%{?dist} Summary: A JSON implementation in C License: MIT URL: https://github.com/rsyslog/libfastjson Source0: http://download.rsyslog.com/libfastjson/libfastjson-%{version}.tar.gz BuildRequires: autoconf automake libtool -Patch0: libfastjson-CVE-2020-12762.patch +BuildRequires: make %description LIBFASTJSON implements a reference counting object @@ -18,7 +18,6 @@ C representation of JSON objects. %package devel Summary: Development files for libfastjson -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -27,7 +26,6 @@ developing applications that use libfastjson. %prep %setup -q -%patch0 -p1 -b .CVE-2020-12762 for doc in ChangeLog; do iconv -f iso-8859-1 -t utf8 $doc > $doc.new && @@ -47,9 +45,7 @@ find %{buildroot} -name '*.la' -delete -print %check make V=1 check -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %{!?_licensedir:%global license %%doc} @@ -63,13 +59,61 @@ make V=1 check %{_libdir}/pkgconfig/libfastjson.pc %changelog -* Tue May 16 2023 Attila Lakatos - 0.99.9-2 -- Address CVE-2020-12762 -Resolves: rhbz#2203171 +* Tue Oct 29 2024 Troy Dawson - 1.2304.0-6 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Thu Apr 22 2021 Attila Lakatos - 0.99.9-1 +* Mon Jun 24 2024 Troy Dawson - 1.2304.0-5 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.2304.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.2304.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.2304.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue May 16 2023 Attila Lakatos - 1.2304.0-1 +- Rebase to 1.2304.0 (new release number scheme, now like rsyslog) +Resolves: rhbz#2183193 +- Address CVE-2020-12762 +Resolves: rhbz#2203170 + +* Thu Jan 19 2023 Fedora Release Engineering - 0.99.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.99.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.99.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.99.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Mar 08 2021 Attila Lakatos - 0.99.9-1 - rebase to v0.99.9 -Resolves: rhbz#1936807 +Resolves: rhbz#1920145 + +* Tue Jan 26 2021 Fedora Release Engineering - 0.99.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.99.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.99.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0.99.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.99.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.99.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Wed Feb 07 2018 Fedora Release Engineering - 0.99.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index e3acacf..29ae41f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfastjson-0.99.9.tar.gz) = 90505fba033179aa92f12ac5dbbb071f69f3491de5bbbbb46d553b08ac325448459c9e33ba22ef4f9db0bae4496cca60046eebf6325d70b045c1a0a9845b0d48 +SHA512 (libfastjson-1.2304.0.tar.gz) = befc1b3474b7b8a763b9808f003d3bc3caec2bc75f6b3060f7d7b6071fbd0e2cf60ad91f3647e8a1b2e3bcf843bc0d32684d96225b8de2ceda01482ae23f20f5