Skip to content

Commit

Permalink
Remove maketools and fix frontend tools tde data usage (#362)
Browse files Browse the repository at this point in the history
This commit:
1. Removes autoconf builds for pg_tde so it can be together built with Postgres (now, used would have to go to contrib/pg_tde and build it explicitly after building Postgres) with make. There are still left pg_tde builds in CI tests since this PR depends on percona/postgres#20. So those leftover will be removed after merging PG PR
2. Adds necessary changes regarding new code (like kmip) so frontend tools (pg_waldump et al) can be compiled with pg_tde
2. Get rid of realpath as it has issues with optimised builds

For: PG-1003, PG-1005
  • Loading branch information
dAdAbird authored Nov 30, 2024
1 parent 86f7995 commit e0978a8
Show file tree
Hide file tree
Showing 28 changed files with 59 additions and 8,917 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ jobs:
- name: Configure postgres
run: ./configure

- name: Configure pg_tde
run: ./configure
working-directory: contrib/pg_tde

- name: Install perltidy
run: sudo cpan -T SHANCOCK/Perl-Tidy-20230309.tar.gz

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/postgresql-16-ppg-package-pgxs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ jobs:
- name: Build pg_tde
run: |
sudo -u postgres bash -c './configure'
sudo -u postgres bash -c 'make USE_PGXS=1'
sudo make USE_PGXS=1 install
working-directory: src/pg_tde
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/postgresql-16-src-make-ssl11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ jobs:

- name: Build pg_tde
run: |
./configure
make -j MAJORVERSION=16
sudo make install
working-directory: src/contrib/pg_tde
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/postgresql-16-src-make.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ jobs:

- name: Build pg_tde
run: |
./configure
make -j MAJORVERSION=16
sudo make install
working-directory: src/contrib/pg_tde
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/postgresql-17-src-make.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,13 @@ jobs:

- name: Build postgres
run: |
./configure --with-openssl --enable-tap-tests=no --enable-cassert
./configure --with-openssl --enable-tap-tests=no --enable-cassert
make -j
sudo make install
working-directory: src

- name: Build pg_tde
run: |
./configure
make -j MAJORVERSION=17
sudo make install
working-directory: src/contrib/pg_tde
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/postgresql-pgdg-package-pgxs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ jobs:
env:
POSTGRESQL_VERSION: ${{ matrix.postgresql-version }}
run: |
sudo -u postgres bash -c './configure'
sudo -u postgres bash -c 'make USE_PGXS=1'
sudo make USE_PGXS=1 MAJORVERSION=$POSTGRESQL_VERSION install
working-directory: src/pg_tde
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ __pycache__
/config.cache
/config.log
/config.status
/Makefile
/autom4te.cache
/configure~
t/results
src/include/config.h

# tools files
typedefs-full.list
4 changes: 1 addition & 3 deletions Makefile.in → Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ src/libkmip/libkmip/src/kmip_bio.o \
src/libkmip/libkmip/src/kmip_locate.o \
src/libkmip/libkmip/src/kmip_memset.o

override PG_CPPFLAGS += @tde_CPPFLAGS@

ifdef USE_PGXS
PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
Expand All @@ -79,7 +77,7 @@ include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
endif

override SHLIB_LINK += @tde_LDFLAGS@ -lcrypto -lssl
override SHLIB_LINK += -lcurl -lcrypto -lssl

# Fetches typedefs list for PostgreSQL core and merges it with typedefs defined in this project.
# https://wiki.postgresql.org/wiki/Running_pgindent_on_non-core_code_or_development_code
Expand Down
20 changes: 20 additions & 0 deletions Makefile.tools
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
TDE_OBJS = \
src/access/pg_tde_tdemap.o \
src/access/pg_tde_xlog_encrypt.o \
src/catalog/tde_global_space.o \
src/catalog/tde_keyring.o \
src/catalog/tde_keyring_parse_opts.o \
src/catalog/tde_principal_key.o \
src/common/pg_tde_utils.o \
src/encryption/enc_aes.o \
src/encryption/enc_tde.o \
src/keyring/keyring_api.o \
src/keyring/keyring_curl.o \
src/keyring/keyring_file.o \
src/keyring/keyring_vault.o \
src/keyring/keyring_kmip.o \
src/keyring/keyring_kmip_ereport.o \
src/libkmip/libkmip/src/kmip.o \
src/libkmip/libkmip/src/kmip_bio.o \
src/libkmip/libkmip/src/kmip_locate.o \
src/libkmip/libkmip/src/kmip_memset.o
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ Percona provides binary packages of `pg_tde` extension only for Percona Server f

```sh
cd pg_tde
./configure
make USE_PGXS=1
sudo make USE_PGXS=1 install
```
Expand Down
Loading

0 comments on commit e0978a8

Please sign in to comment.