postgres.git / summary / log / commit / refs

commit    0bd9560d964abc09e446e4c5e264bb7a0886e5ea
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Mon Nov 11 18:57:21 2024 +0000
First released in: 18.0, 12.21, 13.17, 14.14, 15.9, 16.5, 17.1

    Fix cross-version upgrade tests.
    
    TestUpgradeXversion knows how to make the main regression database's
    references to pg_regress.so be version-independent.  But it doesn't
    do that for plperl's database, so that the C function added by
    commit b7e3a52a8 is causing cross-version upgrade test failures.
    Path of least resistance is to just drop the function at the end
    of the new test.
    
    In <= v14, also take the opportunity to clean up the generated
    test files.
    
    Security: CVE-2024-10979


 src/pl/plperl/GNUmakefile              | 1 +
 src/pl/plperl/input/plperl_env.source  | 3 +++
 src/pl/plperl/output/plperl_env.source | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 01588d016a0..61376cdde73 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -124,6 +124,7 @@ submake:
 
 clean distclean maintainer-clean: clean-lib
 	rm -f SPI.c Util.c $(OBJS) perlchunks.h plperl_opmask.h
+	rm -f sql/plperl_env.sql expected/plperl_env.out
 	rm -rf $(pg_regress_clean_files)
 ifeq ($(PORTNAME), win32)
 	rm -f $(perlwithver).def
diff --git a/src/pl/plperl/input/plperl_env.source b/src/pl/plperl/input/plperl_env.source
index 8fe526e1b8b..49f03acb1dc 100644
--- a/src/pl/plperl/input/plperl_env.source
+++ b/src/pl/plperl/input/plperl_env.source
@@ -50,3 +50,6 @@ $$
    }
 
 $$ LANGUAGE plperl;
+
+-- clean up to simplify cross-version upgrade testing
+DROP FUNCTION get_environ();
diff --git a/src/pl/plperl/output/plperl_env.source b/src/pl/plperl/output/plperl_env.source
index 37b7e23d5ce..ef75d5d5556 100644
--- a/src/pl/plperl/output/plperl_env.source
+++ b/src/pl/plperl/output/plperl_env.source
@@ -47,3 +47,5 @@ $$
 $$ LANGUAGE plperl;
 WARNING:  attempted alteration of $ENV{TEST_PLPERL_ENV_FOO} at line 12.
 NOTICE:  environ unaffected
+-- clean up to simplify cross-version upgrade testing
+DROP FUNCTION get_environ();


[parent: 9f97c31c26a9]