diff --git a/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile b/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile index d919e3ed..6fd9a8eb 100644 --- a/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile @@ -25,6 +25,8 @@ RUN dnf install -y \ systemd-rpm-macros \ protobuf-c-devel \ cmake-rpm-macros \ + json-c-devel \ + protobuf-c-devel \ perl \ && dnf config-manager --set-enabled powertools \ && dnf install -y \ diff --git a/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/portfile.cmake b/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/portfile.cmake new file mode 100644 index 00000000..0015715f --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/vcpkg.json b/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/vcpkg.json new file mode 100644 index 00000000..ab78d592 --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "json-c", + "version": "0" +} \ No newline at end of file diff --git a/.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile b/.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile index b017598f..b8305d43 100644 --- a/.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile @@ -22,6 +22,7 @@ RUN dnf install -y \ zlib-devel \ systemd-rpm-macros \ cmake-rpm-macros \ + json-c-devel \ protobuf-c-devel \ perl-FindBin perl-IPC-Cmd perl-File-Compare perl-File-Copy \ libatomic \ diff --git a/.github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/json-c/portfile.cmake b/.github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/json-c/portfile.cmake new file mode 100644 index 00000000..0015715f --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/json-c/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/.github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/json-c/vcpkg.json b/.github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/json-c/vcpkg.json new file mode 100644 index 00000000..ab78d592 --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/json-c/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "json-c", + "version": "0" +} \ No newline at end of file diff --git a/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile index 6b665293..d1b8d04c 100644 --- a/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile @@ -27,6 +27,7 @@ RUN apt-get update \ doxygen \ git \ graphviz \ + libjson-c-dev \ libprotobuf-c-dev \ libsystemd-dev \ libtool \ @@ -41,6 +42,8 @@ RUN sed -Ei 's/^deb/deb [arch=amd64]/g' /etc/apt/sources.list RUN dpkg --add-architecture arm64 && dpkg --add-architecture armhf RUN apt-get update \ && apt-get -y install \ + libjson-c-dev:arm64 \ + libjson-c-dev:armhf \ libprotobuf-c-dev:arm64 \ libprotobuf-c-dev:armhf \ zlib1g-dev:arm64 \ diff --git a/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/json-c/portfile.cmake b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/json-c/portfile.cmake new file mode 100644 index 00000000..0015715f --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/json-c/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/json-c/vcpkg.json b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/json-c/vcpkg.json new file mode 100644 index 00000000..ab78d592 --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/json-c/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "json-c", + "version": "0" +} \ No newline at end of file diff --git a/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/Dockerfile b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/Dockerfile index 44ae2b43..a3bfa004 100644 --- a/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/Dockerfile @@ -27,6 +27,7 @@ RUN apt-get update \ doxygen \ git \ graphviz \ + libjson-c-dev \ libprotobuf-c-dev \ libsystemd-dev \ libtool \ @@ -41,6 +42,8 @@ RUN sed -Ei 's/^deb/deb [arch=amd64]/g' /etc/apt/sources.list RUN dpkg --add-architecture arm64 && dpkg --add-architecture armhf RUN apt-get update \ && apt-get -y install \ + libjson-c-dev:arm64 \ + libjson-c-dev:armhf \ libprotobuf-c-dev:arm64 \ libprotobuf-c-dev:armhf \ zlib1g-dev:arm64 \ diff --git a/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/json-c/portfile.cmake b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/json-c/portfile.cmake new file mode 100644 index 00000000..0015715f --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/json-c/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/json-c/vcpkg.json b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/json-c/vcpkg.json new file mode 100644 index 00000000..ab78d592 --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/json-c/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "json-c", + "version": "0" +} \ No newline at end of file diff --git a/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake b/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake index a7cc6c0e..b16e1d16 100644 --- a/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake +++ b/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake @@ -1,12 +1,12 @@ cmake_policy(SET CMP0057 NEW) if(CPACK_GENERATOR MATCHES "RPM") - set(CPACK_RPM_BUILDREQUIRES "cmake >= ${CMAKE_MINIMUM_REQUIRED_VERSION}, systemd-devel, gawk, gcc-c++ >= 4.9, protobuf-c, python3, openssl-devel, zlib-devel") + set(CPACK_RPM_BUILDREQUIRES "cmake >= ${CMAKE_MINIMUM_REQUIRED_VERSION}, systemd-devel, gawk, gcc-c++ >= 4.9, json-c-devel, protobuf-c-devel, python3, openssl-devel, zlib-devel") if(CPACK_OS_RELEASE_NAME IN_LIST CPACK_RPM_DISTRIBUTIONS AND CPACK_OS_RELEASE_VERSION VERSION_GREATER "7") list(APPEND CPACK_RPM_BUILDREQUIRES "systemd-rpm-macros") endif() set(CPACK_RPM_PACKAGE_SOURCES OFF) - set(CPACK_RPM_PACKAGE_REQUIRES "iproute, gawk, systemd, libatomic, openssl-libs, zlib, polkit") + set(CPACK_RPM_PACKAGE_REQUIRES "iproute, gawk, systemd, libatomic, json-c, protobuf-c, openssl-libs, zlib, polkit") set(CPACK_RPM_CHANGELOG_FILE "${CMAKE_CURRENT_LIST_DIR}/RPM_CHANGELOG") set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") set(CPACK_RPM_PACKAGE_DESCRIPTION "The OpenZiti Edge Tunnel is a zero-trust tunneling software client.")