Remove remaining json-c dependency from keyring vault (#138)

* Remove remaining json-c dependency from keyring vault After this change, pg_tde no longer needs json-c as a dependency.
percona · Mar 15, 2024 · d91c629 · d91c629
1 parent 0d832d1
commit d91c629
Show file tree

Hide file tree

Showing 17 changed files with 330 additions and 567 deletions.
diff --git a/.github/workflows/postgresql-16-pgdg-package-pgxs.yml b/.github/workflows/postgresql-16-pgdg-package-pgxs.yml
@@ -24,7 +24,7 @@ jobs:
         run: |
           sudo apt-get install -y libreadline6-dev systemtap-sdt-dev wget \
             zlib1g-dev libssl-dev libpam0g-dev bison flex libipc-run-perl \
-            libjson-c-dev libcurl4-openssl-dev
+            libcurl4-openssl-dev
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
           sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
           wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg

diff --git a/.github/workflows/postgresql-16-src-make-macos.yml b/.github/workflows/postgresql-16-src-make-macos.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: macos-12
     steps:
       - name: Install dependencies
-        run: brew install json-c vault gnu-sed # All other required deps already installed in this image.
+        run: brew install vault gnu-sed # All other required deps already installed in this image.
 
       - name: Clone postgres repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/postgresql-16-src-make-ssl11.yml b/.github/workflows/postgresql-16-src-make-ssl11.yml
@@ -26,7 +26,7 @@ jobs:
             libxml2-dev libxslt-dev xsltproc libkrb5-dev libldap2-dev \
             libsystemd-dev gettext tcl-dev libperl-dev pkg-config \
             libselinux1-dev python3-dev \
-            uuid-dev liblz4-dev libjson-c-dev libcurl4-openssl-dev
+            uuid-dev liblz4-dev libcurl4-openssl-dev
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
           sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
           wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg

diff --git a/.github/workflows/postgresql-16-src-make.yml b/.github/workflows/postgresql-16-src-make.yml
@@ -26,7 +26,7 @@ jobs:
             libxml2-dev libxslt-dev xsltproc libkrb5-dev libldap2-dev \
             libsystemd-dev gettext tcl-dev libperl-dev pkg-config clang-11 \
             llvm-11 llvm-11-dev libselinux1-dev python3-dev \
-            uuid-dev liblz4-dev libjson-c-dev libcurl4-openssl-dev
+            uuid-dev liblz4-dev libcurl4-openssl-dev
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
           sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
           wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg

diff --git a/.github/workflows/postgresql-16-src-meson-macos.yml b/.github/workflows/postgresql-16-src-meson-macos.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: macos-12
     steps:
       - name: Install dependencies
-        run: brew install json-c meson vault gnu-sed # All other required deps already installed in this image.
+        run: brew install meson vault gnu-sed # All other required deps already installed in this image.
 
       - name: Clone postgres repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/postgresql-16-src-meson-perf.yml b/.github/workflows/postgresql-16-src-meson-perf.yml
@@ -29,7 +29,7 @@ jobs:
             libxml2-dev libxslt-dev xsltproc libkrb5-dev libldap2-dev \
             libsystemd-dev gettext tcl-dev libperl-dev pkg-config clang-11 \
             llvm-11 llvm-11-dev libselinux1-dev python3-dev \
-            uuid-dev liblz4-dev meson ninja-build libjson-c-dev \
+            uuid-dev liblz4-dev meson ninja-build \
             sysbench libcurl4-openssl-dev
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
           sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'

diff --git a/.github/workflows/postgresql-16-src-meson.yml b/.github/workflows/postgresql-16-src-meson.yml
@@ -26,7 +26,7 @@ jobs:
             libxml2-dev libxslt-dev xsltproc libkrb5-dev libldap2-dev \
             libsystemd-dev gettext tcl-dev libperl-dev pkg-config clang-11 \
             llvm-11 llvm-11-dev libselinux1-dev python3-dev \
-            uuid-dev liblz4-dev meson ninja-build libjson-c-dev \
+            uuid-dev liblz4-dev meson ninja-build  \
             gpg wget libcurl4-openssl-dev
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
           sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'

diff --git a/README.md b/README.md
@@ -79,12 +79,12 @@ You are all set to create encrypted tables using `pg_tde`.
 
 * On Debian and Ubuntu:
 ```sh
-sudo apt install make gcc autoconf libjson-c-dev libcurl4-openssl-dev postgresql-server-dev-16
+sudo apt install make gcc autoconf libcurl4-openssl-dev postgresql-server-dev-16
 ```
 
 * On MacOS:
 ```sh
-brew install make autoconf curl json-c gettext postresql@16
+brew install make autoconf curl gettext postresql@16
 ```
 
 2. Install or build postgresql 16 [(see reference commit below)](#base-commit)