From 7ac7985efba58aaaa0403bb3423b0fcca42cc944 Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 11:31:15 -0400 Subject: [PATCH 01/14] link with distro's libssl for ubuntu 22 builds --- .../ubuntu-22.04/vcpkg-overlays/openssl/portfile.cmake | 1 + .../ubuntu-22.04/vcpkg-overlays/openssl/vcpkg.json | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/portfile.cmake create mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/vcpkg.json diff --git a/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/portfile.cmake b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/portfile.cmake new file mode 100644 index 000000000..0015715fb --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/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/openssl/vcpkg.json b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/vcpkg.json new file mode 100644 index 000000000..a17e15ea1 --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "openssl", + "version": "0" +} \ No newline at end of file From 3d2c7fd020ac1d1b41fd14fbc53048462a155a2f Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 12:25:31 -0400 Subject: [PATCH 02/14] omit libssl packages on distros with insufficient versions --- programs/ziti-edge-tunnel/package/CPackGenConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake b/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake index 1cf3d4b92..46522ee2b 100644 --- a/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake +++ b/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake @@ -1,7 +1,7 @@ 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, python3, openssl-devel, zlib-devel") + set(CPACK_RPM_BUILDREQUIRES "cmake >= ${CMAKE_MINIMUM_REQUIRED_VERSION}, systemd-devel, gawk, gcc-c++ >= 4.9, python3, openssl-libs, zlib") 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() From 1a897c1a5d43da5b0f72ea79d3924a6964f3e557 Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 12:42:10 -0400 Subject: [PATCH 03/14] revert previous change --- programs/ziti-edge-tunnel/package/CPackGenConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake b/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake index 46522ee2b..1cf3d4b92 100644 --- a/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake +++ b/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake @@ -1,7 +1,7 @@ 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, python3, openssl-libs, zlib") + set(CPACK_RPM_BUILDREQUIRES "cmake >= ${CMAKE_MINIMUM_REQUIRED_VERSION}, systemd-devel, gawk, gcc-c++ >= 4.9, 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() From b4f2adede4c9d3d400020b2d80c9513056d5cd48 Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 14:43:25 -0400 Subject: [PATCH 04/14] fix path --- .../ubuntu-22.04/vcpkg-overlays/openssl/portfile.cmake | 1 - .../ubuntu-22.04/vcpkg-overlays/openssl/vcpkg.json | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/portfile.cmake delete mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/vcpkg.json diff --git a/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/portfile.cmake b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/portfile.cmake deleted file mode 100644 index 0015715fb..000000000 --- a/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -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/openssl/vcpkg.json b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/vcpkg.json deleted file mode 100644 index a17e15ea1..000000000 --- a/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/openssl/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "openssl", - "version": "0" -} \ No newline at end of file From 975e326a09abe46215f631c831a4a1233c47cf4c Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 12:05:23 -0400 Subject: [PATCH 05/14] link with distro's libprotobuf-c --- .../actions/openziti-tunnel-build-action/redhat-8/Dockerfile | 1 + .../redhat-8/vcpkg-overlays/protobuf-c/portfile.cmake | 1 + .../redhat-8/vcpkg-overlays/protobuf-c/vcpkg.json | 4 ++++ .../actions/openziti-tunnel-build-action/redhat-9/Dockerfile | 1 + .../redhat-9/vcpkg-overlays/protobuf-c/portfile.cmake | 1 + .../redhat-9/vcpkg-overlays/protobuf-c/vcpkg.json | 4 ++++ .../openziti-tunnel-build-action/ubuntu-20.04/Dockerfile | 3 +++ .../ubuntu-20.04/vcpkg-overlays/protobuf-c/portfile.cmake | 1 + .../ubuntu-20.04/vcpkg-overlays/protobuf-c/vcpkg.json | 4 ++++ .../openziti-tunnel-build-action/ubuntu-22.04/Dockerfile | 3 +++ .../ubuntu-22.04/vcpkg-overlays/protobuf-c/portfile.cmake | 1 + .../ubuntu-22.04/vcpkg-overlays/protobuf-c/vcpkg.json | 4 ++++ programs/ziti-edge-tunnel/package/CPackGenConfig.cmake | 4 ++-- 13 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 .github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/protobuf-c/portfile.cmake create mode 100644 .github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/protobuf-c/vcpkg.json create mode 100644 .github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/protobuf-c/portfile.cmake create mode 100644 .github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/protobuf-c/vcpkg.json create mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/protobuf-c/portfile.cmake create mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/protobuf-c/vcpkg.json create mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/protobuf-c/portfile.cmake create mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/protobuf-c/vcpkg.json diff --git a/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile b/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile index 3f701fc8e..d919e3ede 100644 --- a/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile @@ -23,6 +23,7 @@ RUN dnf install -y \ systemd-devel \ zlib-devel \ systemd-rpm-macros \ + protobuf-c-devel \ cmake-rpm-macros \ perl \ && dnf config-manager --set-enabled powertools \ diff --git a/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/protobuf-c/portfile.cmake b/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/protobuf-c/portfile.cmake new file mode 100644 index 000000000..0015715fb --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/protobuf-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/protobuf-c/vcpkg.json b/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/protobuf-c/vcpkg.json new file mode 100644 index 000000000..884192320 --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/protobuf-c/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "protobuf-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 ec88913ba..b017598fe 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 \ + protobuf-c-devel \ perl-FindBin perl-IPC-Cmd perl-File-Compare perl-File-Copy \ libatomic \ && dnf config-manager --set-enabled crb \ diff --git a/.github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/protobuf-c/portfile.cmake b/.github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/protobuf-c/portfile.cmake new file mode 100644 index 000000000..0015715fb --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/protobuf-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/protobuf-c/vcpkg.json b/.github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/protobuf-c/vcpkg.json new file mode 100644 index 000000000..884192320 --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/protobuf-c/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "protobuf-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 883ba0d17..6b6652938 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 \ + libprotobuf-c-dev \ libsystemd-dev \ libtool \ pkg-config \ @@ -40,6 +41,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 \ + libprotobuf-c-dev:arm64 \ + libprotobuf-c-dev:armhf \ zlib1g-dev:arm64 \ zlib1g-dev:armhf \ && rm -rf /var/lib/apt/lists/* diff --git a/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/protobuf-c/portfile.cmake b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/protobuf-c/portfile.cmake new file mode 100644 index 000000000..0015715fb --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/protobuf-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/protobuf-c/vcpkg.json b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/protobuf-c/vcpkg.json new file mode 100644 index 000000000..884192320 --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/protobuf-c/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "protobuf-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 d34e0beef..44ae2b439 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 \ + libprotobuf-c-dev \ libsystemd-dev \ libtool \ pkg-config \ @@ -40,6 +41,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 \ + libprotobuf-c-dev:arm64 \ + libprotobuf-c-dev:armhf \ zlib1g-dev:arm64 \ zlib1g-dev:armhf \ && rm -rf /var/lib/apt/lists/* diff --git a/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/protobuf-c/portfile.cmake b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/protobuf-c/portfile.cmake new file mode 100644 index 000000000..0015715fb --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/protobuf-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/protobuf-c/vcpkg.json b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/protobuf-c/vcpkg.json new file mode 100644 index 000000000..884192320 --- /dev/null +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/protobuf-c/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "protobuf-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 1cf3d4b92..a7cc6c0eb 100644 --- a/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake +++ b/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake @@ -1,7 +1,7 @@ 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, python3, openssl-devel, zlib-devel") + set(CPACK_RPM_BUILDREQUIRES "cmake >= ${CMAKE_MINIMUM_REQUIRED_VERSION}, systemd-devel, gawk, gcc-c++ >= 4.9, protobuf-c, 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() @@ -39,6 +39,6 @@ if(CPACK_GENERATOR MATCHES "DEB") # specify "libssl3 if it exists in the repos, or nothing" as a dependency. # systemd package on older distros does not contain `systemd-sysusers`, so include passwd for `useradd`, `groupadd`. # login provides `/usr/sbin/nologin`. - set(CPACK_DEBIAN_PACKAGE_DEPENDS "debconf, iproute2, sed, systemd, libatomic1, libssl3 | libssl1.1 | libssl1.0.0, login, passwd, policykit-1, zlib1g") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "debconf, iproute2, sed, systemd, libatomic1, libprotobuf-c1, libssl3 | libssl1.1 | libssl1.0.0, login, passwd, policykit-1, zlib1g") set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CPACK_DEB_CONFFILES};${CPACK_DEB_PRE_INSTALL};${CPACK_DEB_POST_INSTALL};${CPACK_DEB_PRE_UNINSTALL};${CPACK_DEB_POST_UNINSTALL};${CPACK_DEB_TEMPLATES}") endif(CPACK_GENERATOR MATCHES "DEB") From 5d6fa20e9964977ddcf2d52a0b26ddac09ec7f93 Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 12:39:06 -0400 Subject: [PATCH 06/14] link distro-provided libjson-c --- .../actions/openziti-tunnel-build-action/redhat-8/Dockerfile | 2 ++ .../redhat-8/vcpkg-overlays/json-c/portfile.cmake | 1 + .../redhat-8/vcpkg-overlays/json-c/vcpkg.json | 4 ++++ .../actions/openziti-tunnel-build-action/redhat-9/Dockerfile | 1 + .../redhat-9/vcpkg-overlays/json-c/portfile.cmake | 1 + .../redhat-9/vcpkg-overlays/json-c/vcpkg.json | 4 ++++ .../openziti-tunnel-build-action/ubuntu-20.04/Dockerfile | 3 +++ .../ubuntu-20.04/vcpkg-overlays/json-c/portfile.cmake | 1 + .../ubuntu-20.04/vcpkg-overlays/json-c/vcpkg.json | 4 ++++ .../openziti-tunnel-build-action/ubuntu-22.04/Dockerfile | 3 +++ .../ubuntu-22.04/vcpkg-overlays/json-c/portfile.cmake | 1 + .../ubuntu-22.04/vcpkg-overlays/json-c/vcpkg.json | 4 ++++ programs/ziti-edge-tunnel/package/CPackGenConfig.cmake | 4 ++-- 13 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 .github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/portfile.cmake create mode 100644 .github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/vcpkg.json create mode 100644 .github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/json-c/portfile.cmake create mode 100644 .github/actions/openziti-tunnel-build-action/redhat-9/vcpkg-overlays/json-c/vcpkg.json create mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/json-c/portfile.cmake create mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/json-c/vcpkg.json create mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/json-c/portfile.cmake create mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-22.04/vcpkg-overlays/json-c/vcpkg.json diff --git a/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile b/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile index d919e3ede..6fd9a8eb1 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 000000000..0015715fb --- /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 000000000..ab78d5925 --- /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 b017598fe..b8305d430 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 000000000..0015715fb --- /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 000000000..ab78d5925 --- /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 6b6652938..d1b8d04ce 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 000000000..0015715fb --- /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 000000000..ab78d5925 --- /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 44ae2b439..a3bfa004d 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 000000000..0015715fb --- /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 000000000..ab78d5925 --- /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 a7cc6c0eb..b16e1d162 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.") From 9779866f48463d3031f3c83bf552c1cf495637c4 Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 15:46:40 -0400 Subject: [PATCH 07/14] remove linux-syslibs overlays --- vcpkg-overlays/linux-syslibs/default/openssl/portfile.cmake | 1 - vcpkg-overlays/linux-syslibs/default/openssl/vcpkg.json | 4 ---- vcpkg-overlays/linux-syslibs/default/zlib/portfile.cmake | 1 - vcpkg-overlays/linux-syslibs/default/zlib/vcpkg.json | 4 ---- 4 files changed, 10 deletions(-) delete mode 100644 vcpkg-overlays/linux-syslibs/default/openssl/portfile.cmake delete mode 100644 vcpkg-overlays/linux-syslibs/default/openssl/vcpkg.json delete mode 100644 vcpkg-overlays/linux-syslibs/default/zlib/portfile.cmake delete mode 100644 vcpkg-overlays/linux-syslibs/default/zlib/vcpkg.json diff --git a/vcpkg-overlays/linux-syslibs/default/openssl/portfile.cmake b/vcpkg-overlays/linux-syslibs/default/openssl/portfile.cmake deleted file mode 100644 index 0015715fb..000000000 --- a/vcpkg-overlays/linux-syslibs/default/openssl/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/vcpkg-overlays/linux-syslibs/default/openssl/vcpkg.json b/vcpkg-overlays/linux-syslibs/default/openssl/vcpkg.json deleted file mode 100644 index a17e15ea1..000000000 --- a/vcpkg-overlays/linux-syslibs/default/openssl/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "openssl", - "version": "0" -} \ No newline at end of file diff --git a/vcpkg-overlays/linux-syslibs/default/zlib/portfile.cmake b/vcpkg-overlays/linux-syslibs/default/zlib/portfile.cmake deleted file mode 100644 index 0015715fb..000000000 --- a/vcpkg-overlays/linux-syslibs/default/zlib/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/vcpkg-overlays/linux-syslibs/default/zlib/vcpkg.json b/vcpkg-overlays/linux-syslibs/default/zlib/vcpkg.json deleted file mode 100644 index 03a0aca67..000000000 --- a/vcpkg-overlays/linux-syslibs/default/zlib/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "zlib", - "version": "0" -} \ No newline at end of file From 83b229fe259f18d83e81e3cfd969171d6790b94e Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 16:52:03 -0400 Subject: [PATCH 08/14] get json-c-devel from powertools/crb repo --- .../actions/openziti-tunnel-build-action/redhat-8/Dockerfile | 2 +- .../actions/openziti-tunnel-build-action/redhat-9/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile b/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile index 6fd9a8eb1..46c4eb350 100644 --- a/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile @@ -25,7 +25,6 @@ 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 \ @@ -33,6 +32,7 @@ RUN dnf install -y \ doxygen \ graphviz \ git \ + json-c-devel \ ninja-build \ && dnf clean all diff --git a/.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile b/.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile index b8305d430..b847fb21b 100644 --- a/.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile @@ -22,7 +22,6 @@ 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 \ @@ -31,6 +30,7 @@ RUN dnf install -y \ doxygen \ graphviz \ git \ + json-c-devel \ ninja-build \ && dnf clean all From 39f5fd8419f56b5aefd2754894063b2f48419662 Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 16:54:37 -0400 Subject: [PATCH 09/14] use json-c from vcpkg on focal --- .../ubuntu-20.04/vcpkg-overlays/json-c/portfile.cmake | 1 - .../ubuntu-20.04/vcpkg-overlays/json-c/vcpkg.json | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/json-c/portfile.cmake delete mode 100644 .github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/json-c/vcpkg.json 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 deleted file mode 100644 index 0015715fb..000000000 --- a/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/json-c/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index ab78d5925..000000000 --- a/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/vcpkg-overlays/json-c/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "json-c", - "version": "0" -} \ No newline at end of file From 7693a1f3a9ab5e0fff9eddd0869ed886960fb1c1 Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 17:01:23 -0400 Subject: [PATCH 10/14] til protobuf-c-devel comes from crb on rocky 9 --- .../actions/openziti-tunnel-build-action/redhat-9/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile b/.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile index b847fb21b..04f57c3d6 100644 --- a/.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile @@ -22,7 +22,6 @@ RUN dnf install -y \ zlib-devel \ systemd-rpm-macros \ cmake-rpm-macros \ - protobuf-c-devel \ perl-FindBin perl-IPC-Cmd perl-File-Compare perl-File-Copy \ libatomic \ && dnf config-manager --set-enabled crb \ @@ -31,6 +30,7 @@ RUN dnf install -y \ graphviz \ git \ json-c-devel \ + protobuf-c-devel \ ninja-build \ && dnf clean all From cb383054e9860d99a984edb9bd7e7a9bb3967044 Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 17:10:27 -0400 Subject: [PATCH 11/14] use vcpkg-provided json-c on rocky8 --- .../actions/openziti-tunnel-build-action/redhat-8/Dockerfile | 1 - .../redhat-8/vcpkg-overlays/json-c/portfile.cmake | 1 - .../redhat-8/vcpkg-overlays/json-c/vcpkg.json | 4 ---- .../openziti-tunnel-build-action/ubuntu-20.04/Dockerfile | 1 - 4 files changed, 7 deletions(-) delete mode 100644 .github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/portfile.cmake delete mode 100644 .github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/vcpkg.json diff --git a/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile b/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile index 46c4eb350..4b83eb579 100644 --- a/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile @@ -32,7 +32,6 @@ RUN dnf install -y \ doxygen \ graphviz \ git \ - json-c-devel \ ninja-build \ && dnf clean all 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 deleted file mode 100644 index 0015715fb..000000000 --- a/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index ab78d5925..000000000 --- a/.github/actions/openziti-tunnel-build-action/redhat-8/vcpkg-overlays/json-c/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "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 d1b8d04ce..c46ac0d3e 100644 --- a/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile @@ -27,7 +27,6 @@ RUN apt-get update \ doxygen \ git \ graphviz \ - libjson-c-dev \ libprotobuf-c-dev \ libsystemd-dev \ libtool \ From c47ba68153ad567c56cf6c3a76cb4008b8680eff Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 17:14:55 -0400 Subject: [PATCH 12/14] remove duplicate --- .github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile b/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile index 4b83eb579..722544f13 100644 --- a/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile @@ -23,7 +23,6 @@ RUN dnf install -y \ systemd-devel \ zlib-devel \ systemd-rpm-macros \ - protobuf-c-devel \ cmake-rpm-macros \ protobuf-c-devel \ perl \ From 0712c3cd7cc9ef41fbc6f1e55618a6a8a2acb9ad Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 17:15:18 -0400 Subject: [PATCH 13/14] remove unused packages --- .../openziti-tunnel-build-action/ubuntu-20.04/Dockerfile | 2 -- 1 file changed, 2 deletions(-) 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 c46ac0d3e..6b6652938 100644 --- a/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile +++ b/.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile @@ -41,8 +41,6 @@ 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 \ From bb5f3d7cb1c1b1d01c453894357621b432276958 Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Mon, 14 Oct 2024 17:20:48 -0400 Subject: [PATCH 14/14] include json package dependencies --- programs/ziti-edge-tunnel/package/CPackGenConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake b/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake index b16e1d162..e45cb20c8 100644 --- a/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake +++ b/programs/ziti-edge-tunnel/package/CPackGenConfig.cmake @@ -39,6 +39,6 @@ if(CPACK_GENERATOR MATCHES "DEB") # specify "libssl3 if it exists in the repos, or nothing" as a dependency. # systemd package on older distros does not contain `systemd-sysusers`, so include passwd for `useradd`, `groupadd`. # login provides `/usr/sbin/nologin`. - set(CPACK_DEBIAN_PACKAGE_DEPENDS "debconf, iproute2, sed, systemd, libatomic1, libprotobuf-c1, libssl3 | libssl1.1 | libssl1.0.0, login, passwd, policykit-1, zlib1g") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "debconf, iproute2, sed, systemd, libatomic1, libjson-c3 | libjson-c4 | libjson-c5 , libprotobuf-c1, libssl3 | libssl1.1 | libssl1.0.0, login, passwd, policykit-1, zlib1g") set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CPACK_DEB_CONFFILES};${CPACK_DEB_PRE_INSTALL};${CPACK_DEB_POST_INSTALL};${CPACK_DEB_PRE_UNINSTALL};${CPACK_DEB_POST_UNINSTALL};${CPACK_DEB_TEMPLATES}") endif(CPACK_GENERATOR MATCHES "DEB")