Bump third-party json-c to 0.16

Recent json-c versions solved calloc-transposed-args related warnings
which started showing in Fedora 40.

Note that the latest json-c version is 0.17 and requires cmake 3.9 or
higher for building, which complicates the CentOS 7 support.

.gitignore

@@ -28,8 +28,8 @@
 /third-party/zlib-1.2.13/
 /third-party/autoconf-2.69.tar.gz
 /third-party/autoconf-2.69/
-/third-party/json-c-0.13.1.tar.gz
-/third-party/json-c-0.13.1/
+/third-party/json-c-0.16.tar.gz
+/third-party/json-c-0.16/
 /third-party/openssl-1.1.1w.tar.gz
 /third-party/openssl-1.1.1w
 /third-party/m4-1.4.19.tar.xz

docs/install.rst

@@ -64,7 +64,7 @@ versions are listed):
  - intltool-0.51.0
  - selinux-2.7
  - curl-7.68.0
- - json-c-0.13.1
+ - json-c-0.16
  - openssl-1.1.1w
 
 

restraint.spec

@@ -36,7 +36,7 @@ Source108:      xz-5.2.4.tar.gz
 Source109:      sqlite-autoconf-3310100.tar.gz
 Source110:      intltool-0.51.0.tar.gz
 Source111:      libsoup-2.52.2.tar.xz
-Source112:      json-c-0.13.1.tar.gz
+Source112:      json-c-0.16.tar.gz
 Source114:      openssl-1.1.1w.tar.gz
 Source115:      autoconf-2.69.tar.gz
 Source116:      m4-1.4.19.tar.xz
@@ -111,6 +111,8 @@ BuildRequires:  tar
 %{?with_static:BuildRequires: meson}
 # OpenSSL
 %{?with_static:BuildRequires: perl(FindBin), perl(lib)}
+# json-c
+%{?with_static:BuildRequires: cmake}
 # libselinux Requires.private
 %{?with_static:BuildRequires: libsepol-static}
 %if 0%{?rhel} < 8 || 0%{?centos}

third-party/Makefile

@@ -11,7 +11,7 @@ LIBSOUP = libsoup-2.52.2
 OPENSSL = openssl-1.1.1w
 SQLITE = sqlite-autoconf-3310100
 INTLTOOL = intltool-0.51.0
-LIBJSONC = json-c-0.13.1
+LIBJSONC = json-c-0.16
 AUTOCONF = autoconf-2.69
 M4 = m4-1.4.19
 
@@ -64,9 +64,10 @@ tree/bin/autoheader: tree/bin/m4 $(AUTOCONF) $(AUTOCONF)/.patches-done
 	$(MAKE) -C $(AUTOCONF) install
 
 tree/lib/pkgconfig/libjson-c.pc: tree/bin/autoheader $(LIBJSONC)
-	( cd $(LIBJSONC) && ./configure --prefix=$(CURDIR)/tree --enable-shared=no )
-	( PATH=$(CURDIR)/tree/bin:$(PATH) $(MAKE) -C $(LIBJSONC) )
-	$(MAKE) -C $(LIBJSONC) install
+	( mkdir -p $(LIBJSONC)/build && cd $(LIBJSONC)/build && cmake ../ -DCMAKE_INSTALL_PREFIX=$(CURDIR)/tree -DBUILD_SHARED_LIBS=OFF \
+		-DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_LIBDIR=lib )
+	( PATH=$(CURDIR)/tree/bin:$(PATH) $(MAKE) -C $(LIBJSONC)/build )
+	$(MAKE) -C $(LIBJSONC)/build install
 
 tree/lib/pkgconfig/openssl.pc: $(OPENSSL)
     ifeq ("$(arch)", "ppc64")