aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2024-05-15 01:35:34 +0200
committerJakub Jirutka <jakub@jirutka.cz>2024-05-15 10:37:06 +0000
commita38900ea0641bcbdc68e10a70021c016613eb2fa (patch)
tree59faa778da50af0830d9b66bb7cb963550efc739
parent9349aead673779b3cb8dfb9d298fb678f4d9ffea (diff)
main/postgresql16: upgrade to 16.3
-rw-r--r--main/postgresql16/APKBUILD8
-rw-r--r--main/postgresql16/fix-tests-on-musl.patch96
2 files changed, 3 insertions, 101 deletions
diff --git a/main/postgresql16/APKBUILD b/main/postgresql16/APKBUILD
index df55bc89c39..f765d9e31ba 100644
--- a/main/postgresql16/APKBUILD
+++ b/main/postgresql16/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: G.J.R. Timmer <gjr.timmer@gmail.com>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
_pkgname=postgresql
-pkgver=16.2
-pkgrel=4
+pkgver=16.3
+pkgrel=0
_majorver=${pkgver%%[_.]*}
# Should this aport provide libpq* and libecpg*? true/false
# Exactly one postgresql aport must be the default one!
@@ -72,7 +72,6 @@ subpackages="
$pkgname-openrc
"
source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz2
- fix-tests-on-musl.patch
initdb.patch
perl-rpath.patch
per-version-dirs.patch
@@ -491,8 +490,7 @@ _setdiff() {
}
sha512sums="
-3194941cc3f1ec86b6cf4f08c6422d268d99890441f8fc9ab87b6a7fd16c990fa230b544308644cbef54e6960c4984e3703752e40930bdc0537b7bfda3ab7ccf postgresql-16.2.tar.bz2
-e3b05a2df199440cd558cd729aac9ee53cda6dd675f0ecdecda27d6158cc1b2f3f3fdb2b69657adba93886f4331183ec9f63c71868f34020a5ff82575e0a4202 fix-tests-on-musl.patch
+dc1c8d4fbc8e53e9be91dcf1b644b3969bd634f11bf5a1c4fe16619fd386f3349a5509788d43e6a57d099ad75233026d4dd4e0bb180ffc747fd3c1a575c51a5f postgresql-16.3.tar.bz2
73080f61ae274a214966d2d010de49c8c90eb3180e4f56d86a9e23063eaddbe7f8d2c40ed414591c16bc9cfe88577866af2a965c2b6effb54965d19ef96a3fa9 initdb.patch
27e00b58fe5c3899c66fc0dde51846c14701bcfedd132b106d676783ba603e8cbdc6e620f29b52dc892bdaa9302052788cf5e575a1659f61c017a12e0d2ee4d0 perl-rpath.patch
6d992f53bf8b3e914933f89bc3f01591de2b707cf809aeee4210f9d59e2dc11e3fce697f50a7660f54925a2f0a6154eaeab0f59a969f76572dac5ff6f08faa71 per-version-dirs.patch
diff --git a/main/postgresql16/fix-tests-on-musl.patch b/main/postgresql16/fix-tests-on-musl.patch
deleted file mode 100644
index 405ac8fb1a4..00000000000
--- a/main/postgresql16/fix-tests-on-musl.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Patch-Source: https://github.com/postgres/postgres/commit/8a92b70c11ba2b5f0d2b2611d9453dd90f618629
---
-From 8a92b70c11ba2b5f0d2b2611d9453dd90f618629 Mon Sep 17 00:00:00 2001
-From: Tom Lane <tgl@sss.pgh.pa.us>
-Date: Tue, 26 Mar 2024 11:44:49 -0400
-Subject: [PATCH] Allow "make check"-style testing to work with musl C library.
-
-The musl dynamic linker saves a pointer to the process' environment
-value of LD_LIBRARY_PATH very early in startup. When we move/clobber
-the environment to make more room for ps status strings, we clobber
-that value and thereby prevent libraries from being found via
-LD_LIBRARY_PATH, which breaks the use of a temporary installation
-for testing purposes. To fix, stop collecting usable space for
-ps status if we notice that the variable we are about to clobber
-is LD_LIBRARY_PATH. This will result in some reduction in how long
-the ps status can be, but it's only likely to occur in temporary
-test contexts, so it doesn't seem like a big problem. In any case,
-we don't have to do it if we see we are on glibc, which surely is
-where the majority of our Linux testing is done.
-
-Thomas Munro, Bruce Momjian, and Tom Lane, per report from Wolfgang
-Walther. Back-patch to all supported branches, with the hope that
-we'll set up a buildfarm animal to test on this platform.
-
-Discussion: https://postgr.es/m/fddd1cd6-dc16-40a2-9eb5-d7fef2101488@technowledgy.de
----
- src/backend/utils/misc/ps_status.c | 35 ++++++++++++++++++++++++++----
- 1 file changed, 31 insertions(+), 4 deletions(-)
-
-diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c
-index 5d829e6e483a3..9da6377402024 100644
---- a/src/backend/utils/misc/ps_status.c
-+++ b/src/backend/utils/misc/ps_status.c
-@@ -107,7 +107,8 @@ static char **save_argv;
- * (The original argv[] will not be overwritten by this routine, but may be
- * overwritten during init_ps_display. Also, the physical location of the
- * environment strings may be moved, so this should be called before any code
-- * that might try to hang onto a getenv() result.)
-+ * that might try to hang onto a getenv() result. But see hack for musl
-+ * within.)
- *
- * Note that in case of failure this cannot call elog() as that is not
- * initialized yet. We rely on write_stderr() instead.
-@@ -122,7 +123,7 @@ save_ps_display_args(int argc, char **argv)
-
- /*
- * If we're going to overwrite the argv area, count the available space.
-- * Also move the environment to make additional room.
-+ * Also move the environment strings to make additional room.
- */
- {
- char *end_of_area = NULL;
-@@ -151,7 +152,33 @@ save_ps_display_args(int argc, char **argv)
- for (i = 0; environ[i] != NULL; i++)
- {
- if (end_of_area + 1 == environ[i])
-- end_of_area = environ[i] + strlen(environ[i]);
-+ {
-+ /*
-+ * The musl dynamic linker keeps a static pointer to the
-+ * initial value of LD_LIBRARY_PATH, if that is defined in the
-+ * process's environment. Therefore, we must not overwrite the
-+ * value of that setting and thus cannot advance end_of_area
-+ * beyond it. Musl does not define any identifying compiler
-+ * symbol, so we have to do this unless we see a symbol
-+ * identifying a Linux libc we know is safe.
-+ */
-+#if defined(__linux__) && (!defined(__GLIBC__) && !defined(__UCLIBC__))
-+ if (strncmp(environ[i], "LD_LIBRARY_PATH=", 16) == 0)
-+ {
-+ /*
-+ * We can overwrite the name, but stop at the equals sign.
-+ * Future loop iterations will not find any more
-+ * contiguous space, but we don't break early because we
-+ * need to count the total number of environ[] entries.
-+ */
-+ end_of_area = environ[i] + 15;
-+ }
-+ else
-+#endif
-+ {
-+ end_of_area = environ[i] + strlen(environ[i]);
-+ }
-+ }
- }
-
- ps_buffer = argv[0];
-@@ -183,7 +210,7 @@ save_ps_display_args(int argc, char **argv)
- * If we're going to change the original argv[] then make a copy for
- * argument parsing purposes.
- *
-- * (NB: do NOT think to remove the copying of argv[], even though
-+ * NB: do NOT think to remove the copying of argv[], even though
- * postmaster.c finishes looking at argv[] long before we ever consider
- * changing the ps display. On some platforms, getopt() keeps pointers
- * into the argv array, and will get horribly confused when it is