json-c: 0.13.1 -> 0.14

[mmilata]

Changes: https://github.com/json-c/json-c/blob/json-c-0.14-20200419/ChangeLog

Not really sure how to do library upgrade where some packages depend on the old version (until upstream fixes it). Most packages need no changes, I've included patches for those that have them in master, and made the rest to depend on the old version. Let me know is some other structure is preferred.

Motivation for this change

New version of popular library.

Things done

• Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
• Built on platform(s)
  • NixOS
  • macOS
  • other Linux distributions
• Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
• Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
• Tested execution of all binary files (usually in ./result/bin/)
• Determined the impact on package closure size (by running nix path-info -S before and after)
• Ensured that relevant documentation is up to date
• Fits CONTRIBUTING.md.

[mmilata]

@ofborg build freeradius ttyd drm_info tpm2-tss opae libvmi libmypaint libubox libndctl liblognorm google-compute-engine-oslogin hubicfuse snapper yubikey-personalization zmap mpw syslogng rsyslog uqmi ntopng fastd netifd nfstrace solvespace mypaint sway ptask pianobar girara fwts bluez health-check multipath-tools shogun postgis kernelshark

rpm-ostree was broken already

[jtojnar]

rpm-ostree should be fixed by 508a132

[mmilata]

Thanks, with 508a132 rpm-ostree builds fine against json-c-0.14.

[jtojnar]

Looks great.

• Checked the changes.
• Checked the diffs of old and new directory trees, looking fine.
• Checked that .pc file looks okay.

Some extra patches:

• Cryptsetup: https://gitlab.com/cryptsetup/cryptsetup/-/issues/556#note_334458143
• multipath-tools: https://www.redhat.com/archives/dm-devel/2020-May/msg00381.html or better https://www.redhat.com/archives/dm-devel/2020-May/msg00261.html
• zmap is weird:

/nix/store/bh3r88sv8wckwmfyhjxbqmxcha0hrm8h-binutils-2.31.1/bin/ld: /nix/store/c2rlh7xa8fcgg7qz8pl76ipvvb172c6k-glibc-2.30/lib/crt1.o: in function `_start':
/build/glibc-2.30/csu/../sysdeps/x86_64/start.S:104: undefined reference to `main'
collect2: error: ld returned 1 exit status
/nix/store/5hplxs3kprdp6v62qk3di6a1m1s1paiq-bash-4.4-p23/bin/bash: -I/nix/store/10wxs7b7pl3fi1z9byn87r0lf3wcnvqv-json-c-0.14-dev/include/json-c: No such file or directory
make[2]: *** [lib/CMakeFiles/zmaplib.dir/build.make:109: lib/CMakeFiles/zmaplib.dir/logger.c.o] Error 127
make[2]: *** Waiting for unfinished jobs....
/nix/store/bh3r88sv8wckwmfyhjxbqmxcha0hrm8h-binutils-2.31.1/bin/ld: /nix/store/c2rlh7xa8fcgg7qz8pl76ipvvb172c6k-glibc-2.30/lib/crt1.o: in function `_start':
/build/glibc-2.30/csu/../sysdeps/x86_64/start.S:104: undefined reference to `main'
collect2: error: ld returned 1 exit status
/nix/store/5hplxs3kprdp6v62qk3di6a1m1s1paiq-bash-4.4-p23/bin/bash: -I/nix/store/10wxs7b7pl3fi1z9byn87r0lf3wcnvqv-json-c-0.14-dev/include/json-c: No such file or directory
make[2]: *** [lib/CMakeFiles/zmaplib.dir/build.make:83: lib/CMakeFiles/zmaplib.dir/blacklist.c.o] Error 127
/nix/store/bh3r88sv8wckwmfyhjxbqmxcha0hrm8h-binutils-2.31.1/bin/ld: /nix/store/c2rlh7xa8fcgg7qz8pl76ipvvb172c6k-glibc-2.30/lib/crt1.o: in function `_start':
/build/glibc-2.30/csu/../sysdeps/x86_64/start.S:104: undefined reference to `main'
collect2: error: ld returned 1 exit status
/nix/store/5hplxs3kprdp6v62qk3di6a1m1s1paiq-bash-4.4-p23/bin/bash: -I/nix/store/10wxs7b7pl3fi1z9byn87r0lf3wcnvqv-json-c-0.14-dev/include/json-c: No such file or directory
make[2]: *** [lib/CMakeFiles/zmaplib.dir/build.make:122: lib/CMakeFiles/zmaplib.dir/pbm.c.o] Error 127
/nix/store/bh3r88sv8wckwmfyhjxbqmxcha0hrm8h-binutils-2.31.1/bin/ld: /nix/store/c2rlh7xa8fcgg7qz8pl76ipvvb172c6k-glibc-2.30/lib/crt1.o: in function `_start':
/build/glibc-2.30/csu/../sysdeps/x86_64/start.S:104: undefined reference to `main'
collect2: error: ld returned 1 exit status
/nix/store/5hplxs3kprdp6v62qk3di6a1m1s1paiq-bash-4.4-p23/bin/bash: -I/nix/store/10wxs7b7pl3fi1z9byn87r0lf3wcnvqv-json-c-0.14-dev/include/json-c: No such file or directory
make[2]: *** [lib/CMakeFiles/zmaplib.dir/build.make:96: lib/CMakeFiles/zmaplib.dir/constraint.c.o] Error 127
make[1]: *** [CMakeFiles/Makefile2:139: lib/CMakeFiles/zmaplib.dir/all] Error 2

looks like a linking error but Void did not need any patch void-linux/void-packages@701b122

[jtojnar]

Building zmap with ninja gives us more info:

[4/56] Building C object lib/CMakeFiles/zmaplib.dir/pbm.c.o
FAILED: lib/CMakeFiles/zmaplib.dir/pbm.c.o
/nix/store/v1hcd1cswjgd11gan4czq7hada69iqkq-gcc-wrapper-9.3.0/bin/gcc -DJSON -I/nix/store/phl75ffn401sd3zyc4mj8fz4l2p2hmky-json-c-0.14-dev/include/json-c -Ilib -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-all -fwrapv -fPIC --param ssp-buffer-size=1 -O2 -Wall -Wformat=2 -Wno-format-nonliteral -pedantic -fno-strict-aliasing -Wextra -Wfloat-equal -Wundef -Wwrite-strings -Wredundant-decls -Wnested-externs -Wbad-function-cast -Winit-self -Wmissing-noreturn -Wstack-protector /nix/store/phl75ffn401sd3zyc4mj8fz4l2p2hmky-json-c-0.14-dev/include;-I/nix/store/phl75ffn401sd3zyc4mj8fz4l2p2hmky-json-c-0.14-dev/include/json-c -std=gnu99 -O3 -DNDEBUG -MD -MT lib/CMakeFiles/zmaplib.dir/pbm.c.o -MF lib/CMakeFiles/zmaplib.dir/pbm.c.o.d -o lib/CMakeFiles/zmaplib.dir/pbm.c.o   -c lib/pbm.c
/nix/store/bh3r88sv8wckwmfyhjxbqmxcha0hrm8h-binutils-2.31.1/bin/ld: /nix/store/phl75ffn401sd3zyc4mj8fz4l2p2hmky-json-c-0.14-dev/include: file not recognized: Is a directory
collect2: error: ld returned 1 exit status
/bin/sh: -I/nix/store/phl75ffn401sd3zyc4mj8fz4l2p2hmky-json-c-0.14-dev/include/json-c: not found

Looks like the Cflags are joined using semicolong for some reason, curiously causing a linking error.

Removing the -I flag that was not there in 0.13 fixes the build. I wonder why other distros do not see the issue though:

diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix
index 636c913c7d6..2805480588c 100644
--- a/pkgs/development/libraries/json-c/default.nix
+++ b/pkgs/development/libraries/json-c/default.nix
@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  postFixup = ''
+    substituteInPlace "$dev/lib/pkgconfig/json-c.pc" --replace 'Cflags: -I''${includedir}' 'Cflags:'
+  '';
+
   meta = with stdenv.lib; {
     description = "A JSON implementation in C";
     homepage    = "https://github.com/json-c/json-c/wiki";

[mmilata]

Nice, thanks for the clue. Looks like it's a bug in the upstream CMakefile.txt, opened a PR: zmap/zmap#609.

[mmilata]

Only cryptsetup remains on 0.13.1 now. Unfortunately the upstream commits do not apply cleanly to our version. Looking at the difficulties Fedora had I'd suggest waiting for cryptsetup update to 2.3.3 (#91017) which is compatible with json-c-0.14.

[FRidh]

please rebase

[mmilata]

Rebased & dropped the newsboat commit because it's no longer needed.

[mmilata]

Dropped the cryptsetup commit (#91017 is merged) and the json-c 0.13 version because it's no longer needed.

[jtojnar]

Thanks.