From 011faf76282b0ca56a84db8407727beb67d097d6 Mon Sep 17 00:00:00 2001 From: Andrey Borodin Date: Tue, 2 Jun 2026 18:07:05 +0500 Subject: [PATCH] Remove unmanagable extensions --- contrib/Makefile | 7 ------- contrib/bool_plperl/Makefile | 4 ++-- contrib/hstore_plperl/Makefile | 4 ++-- contrib/jsonb_plperl/Makefile | 4 ++-- src/pl/Makefile | 6 +----- src/pl/plperl/GNUmakefile | 3 +-- src/pl/plpython/Makefile | 5 +---- 7 files changed, 9 insertions(+), 24 deletions(-) diff --git a/contrib/Makefile b/contrib/Makefile index b14600e3557..62d50faf782 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -22,7 +22,6 @@ SUBDIRS = \ dblink \ dict_int \ dict_xsyn \ - file_fdw \ fuzzystrmatch \ hstore \ intagg \ @@ -92,12 +91,6 @@ else ALWAYS_SUBDIRS += bool_plperl hstore_plperl jsonb_plperl endif -ifeq ($(with_python),yes) -SUBDIRS += hstore_plpython jsonb_plpython ltree_plpython -else -ALWAYS_SUBDIRS += hstore_plpython jsonb_plpython ltree_plpython -endif - ifeq ($(enable_pax),yes) SUBDIRS += pax_storage else diff --git a/contrib/bool_plperl/Makefile b/contrib/bool_plperl/Makefile index efe1de986b2..d8f6d710c97 100644 --- a/contrib/bool_plperl/Makefile +++ b/contrib/bool_plperl/Makefile @@ -8,8 +8,8 @@ PGFILEDESC = "bool_plperl - bool transform for plperl" PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl -EXTENSION = bool_plperlu bool_plperl -DATA = bool_plperlu--1.0.sql bool_plperl--1.0.sql +EXTENSION = bool_plperl +DATA = bool_plperl--1.0.sql REGRESS = bool_plperl bool_plperlu diff --git a/contrib/hstore_plperl/Makefile b/contrib/hstore_plperl/Makefile index 3d25ad5b3d0..21fa367a5c8 100644 --- a/contrib/hstore_plperl/Makefile +++ b/contrib/hstore_plperl/Makefile @@ -7,8 +7,8 @@ OBJS = \ PGFILEDESC = "hstore_plperl - hstore transform for plperl" -EXTENSION = hstore_plperl hstore_plperlu -DATA = hstore_plperl--1.0.sql hstore_plperlu--1.0.sql +EXTENSION = hstore_plperl +DATA = hstore_plperl--1.0.sql REGRESS = hstore_plperl hstore_plperlu create_transform EXTRA_INSTALL = contrib/hstore diff --git a/contrib/jsonb_plperl/Makefile b/contrib/jsonb_plperl/Makefile index ba9480e819b..b547ff8c804 100644 --- a/contrib/jsonb_plperl/Makefile +++ b/contrib/jsonb_plperl/Makefile @@ -8,8 +8,8 @@ PGFILEDESC = "jsonb_plperl - jsonb transform for plperl" PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl -EXTENSION = jsonb_plperlu jsonb_plperl -DATA = jsonb_plperlu--1.0.sql jsonb_plperl--1.0.sql +EXTENSION = jsonb_plperl +DATA = jsonb_plperl--1.0.sql REGRESS = jsonb_plperl jsonb_plperlu diff --git a/src/pl/Makefile b/src/pl/Makefile index c4a0d1cd07a..1cecb1000ed 100644 --- a/src/pl/Makefile +++ b/src/pl/Makefile @@ -20,11 +20,7 @@ else ALWAYS_SUBDIRS += plperl endif -ifeq ($(with_python), yes) -SUBDIRS += plpython -else -ALWAYS_SUBDIRS += plpython -endif +# plpython3u is untrusted-only; omitted from product build ifeq ($(with_tcl), yes) SUBDIRS += tcl diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index 06a6c1d57c1..ed2345d3bde 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -27,8 +27,7 @@ NAME = plperl OBJS = plperl.o SPI.o Util.o $(WIN32RES) -DATA = plperl.control plperl--1.0.sql \ - plperlu.control plperlu--1.0.sql +DATA = plperl.control plperl--1.0.sql PERLCHUNKS = plc_perlboot.pl plc_trusted.pl diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile index 69fb30b711a..2d9ca8d1322 100644 --- a/src/pl/plpython/Makefile +++ b/src/pl/plpython/Makefile @@ -38,10 +38,7 @@ OBJS = \ plpy_typeio.o \ plpy_util.o -DATA = $(NAME)u.control $(NAME)u--1.0.sql -ifeq ($(python_majorversion),2) -DATA += plpythonu.control plpythonu--1.0.sql -endif +# plpython*u extensions omitted from product build (untrusted only) # header files to install - it's not clear which of these might be needed # so install them all.