Merge pull request #614 from bcressey/libjansson

enable JSON output for nftables

Author: koooosh

Cargo.lock

@@ -65,6 +65,7 @@ members = [
   "packages/libglib",
   "packages/libinih",
   "packages/libisal",
+  "packages/libjansson",
   "packages/libmnl",
   "packages/libncurses",
   "packages/libnetfilter_conntrack",

Cargo.toml

@@ -76,6 +76,7 @@ libgcc = { path = "../../packages/libgcc" }
 libglib = { path = "../../packages/libglib" }
 libinih = { path = "../../packages/libinih" }
 libisal = { path = "../../packages/libisal" }
+libjansson = { path = "../../packages/libjansson" }
 libmnl = { path = "../../packages/libmnl" }
 libncurses = { path = "../../packages/libncurses" }
 libnetfilter_conntrack = { path = "../../packages/libnetfilter_conntrack" }

kits/bottlerocket-core-kit/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "libjansson"
+version = "2.14.1"
+edition = "2021"
+publish = false
+build = "../build.rs"
+
+[lib]
+path = "../packages.rs"
+
+[package.metadata.build-package]
+releases-url = "https://github.com/akheron/jansson/releases"
+
+[[package.metadata.build-package.external-files]]
+url = "https://github.com/akheron/jansson/archive/v2.14.1.tar.gz"
+sha512 = "7d3a01566cf42a2d8f1ddca12bfb04a93a11ad30bcccb7d5f862015d9a59f8376b2ed46026aa0f0828acc4b74f4537cae5a1874ab81b83b8638d75ad0c94e243"
+path = "jansson-2.14.1.tar.gz"
+
+[build-dependencies]
+glibc = { path = "../glibc" }

packages/libjansson/Cargo.toml

@@ -0,0 +1,44 @@
+Name: %{_cross_os}libjansson
+Version: 2.14.1
+Release: 1%{?dist}
+Summary: Library for encoding, decoding and manipulating JSON data
+License: MIT
+URL: https://github.com/akheron/jansson
+Source0: https://github.com/akheron/jansson/archive/v%{version}.tar.gz#/jansson-%{version}.tar.gz
+BuildRequires: %{_cross_os}glibc-devel
+
+%description
+%{summary}.
+
+%package devel
+Summary: Files for development using the library for encoding, decoding and manipulating JSON data
+Requires: %{name}
+
+%description devel
+%{summary}.
+
+%prep
+%autosetup -n jansson-%{version} -p1
+
+%build
+autoreconf -fiv
+
+%cross_configure \
+  --disable-static \
+  --disable-dtoa \
+  %{nil}
+
+%make_build
+
+%install
+%make_install
+
+%files
+%license LICENSE
+%{_cross_attribution_file}
+%{_cross_libdir}/*.so.*
+
+%files devel
+%{_cross_includedir}/*.h
+%{_cross_libdir}/*.so
+%{_cross_pkgconfigdir}/*.pc

packages/libjansson/libjansson.spec

@@ -22,6 +22,7 @@ sha512 = "7aa972c146e0dfaacc8faaef9b9ebbe419f7cbc5814d1fb978b35a4972d384aabe2e6e
 [build-dependencies]
 glibc = { path = "../glibc" }
 iptables = { path = "../iptables" }
+libjansson = { path = "../libjansson" }
 libmnl = { path = "../libmnl" }
 libnftnl = { path = "../libnftnl" }
 readline = { path = "../readline" }

packages/nftables/Cargo.toml

@@ -11,10 +11,12 @@ Source10: nftables-tmpfiles.conf
 
 BuildRequires: %{_cross_os}glibc-devel
 BuildRequires: %{_cross_os}iptables-devel
+BuildRequires: %{_cross_os}libjansson-devel
 BuildRequires: %{_cross_os}libmnl-devel
 BuildRequires: %{_cross_os}libnftnl-devel
 BuildRequires: %{_cross_os}readline-devel
 Requires: %{_cross_os}iptables
+Requires: %{_cross_os}libjansson
 Requires: %{_cross_os}libmnl
 Requires: %{_cross_os}libnftnl
 Requires: %{_cross_os}readline
@@ -39,8 +41,8 @@ Requires: %{name}
   --enable-debug \
   --with-cli=readline \
   --with-mini-gmp \
+  --with-json \
   --with-xtables \
-  --without-json \
   %{nil}
 
 %force_disable_rpath