Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove maketools and fix frontend tools tde data usage #362

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
+66 −8,924
Draft

Remove maketools and fix frontend tools tde data usage #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cbe3af
Remove maketools and fix frontend tools tde data usage
dAdAbird Nov 27, 2024
25d619c
Remove configure and macos autotools build
dAdAbird Nov 28, 2024
615b7b7
Remove generation of config.h
dAdAbird Nov 28, 2024
38780ed
Return make of pg_tde until we merge pg changes
dAdAbird Nov 28, 2024
5ed134b
Fix frontend tools w/ kmip
dAdAbird Nov 29, 2024
12a7e81
build w/o pg
dAdAbird Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/check.yaml
View file
Open in desktop
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
View file
Open in desktop
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
5 changes: 2 additions & 3 deletions .github/workflows/postgresql-16-src-make-ssl11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,8 @@ jobs:

- name: Build pg_tde
run: |
./configure
make -j MAJORVERSION=16
sudo make install
make -j MAJORVERSION=16
sudo make install
working-directory: src/contrib/pg_tde

- name: Start postgresql cluster with pg_tde
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/postgresql-16-src-make.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,8 @@ jobs:

- name: Build pg_tde
run: |
./configure
make -j MAJORVERSION=16
sudo make install
make -j MAJORVERSION=16
sudo make install
working-directory: src/contrib/pg_tde

- name: Start postgresql cluster with pg_tde
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/postgresql-17-src-make.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,15 @@ 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
make -j MAJORVERSION=17
sudo make install
working-directory: src/contrib/pg_tde

- name: Start postgresql cluster with pg_tde
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/postgresql-pgdg-package-pgxs.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading