Bump PostgreSQL 14/15 to latest

edgedbpkg/edgedb/__init__.py

@@ -83,8 +83,8 @@ class EdgeDB(packages.BundledPythonPackage):
     ]
 
     bundle_deps = [
-        postgresql.PostgreSQL(version="14.10"),
-        postgresql.PostgreSQL(version="15.5"),
+        postgresql.PostgreSQL(version="14.11"),
+        postgresql.PostgreSQL(version="15.6"),
         python_bundle.Python(version="3.10.11"),
         python_bundle.Python(version="3.11.8"),
         pyentrypoint.PyEntryPoint(version="1.0.0"),

edgedbpkg/postgresql/patches/postgresql-edgedb__no_env_clobbering-14.patch

@@ -1,4 +1,4 @@
-From bb1115b2926b3eb24ed8700ce62999e248dcdcc9 Mon Sep 17 00:00:00 2001
+From 1109e1c6beb04011bfba44b6951b1f330076d876 Mon Sep 17 00:00:00 2001
 From: Elvis Pranskevichus <elvis@edgedb.com>
 Date: Tue, 16 Aug 2022 22:00:31 -0700
 Subject: [PATCH 3/5] Add an envvar escape hatch to disable argv clobbering
@@ -83,5 +83,5 @@ index bad8afb1b2..9455f292eb 100644
  	/* If ps_buffer is a pointer, it might still be null */
  	if (!ps_buffer)
 -- 
-2.39.3
+2.43.0
 

edgedbpkg/postgresql/patches/postgresql-edgedb__no_env_clobbering-15.patch

@@ -1,4 +1,4 @@
-From c1b5c305fe46593a78cc0a75758aebf68aecd2e1 Mon Sep 17 00:00:00 2001
+From b6d8a9561ea36246fceeb8eb12127b15cd42a93a Mon Sep 17 00:00:00 2001
 From: Elvis Pranskevichus <elvis@edgedb.com>
 Date: Tue, 16 Aug 2022 22:00:31 -0700
 Subject: [PATCH 3/5] Add an envvar escape hatch to disable argv clobbering
@@ -83,5 +83,5 @@ index ec314c03f5..bb88570af0 100644
  	/* If ps_buffer is a pointer, it might still be null */
  	if (!ps_buffer)
 -- 
-2.39.3
+2.43.0
 

edgedbpkg/postgresql/patches/postgresql-edgedb__pkgconfig-14.patch

@@ -1,4 +1,4 @@
-From 0f85fcc4d607a78ff4513da70a68a5bfb24d7277 Mon Sep 17 00:00:00 2001
+From 7f2bec0b331a82092a18ec7649752b9dd7fc7e0c Mon Sep 17 00:00:00 2001
 From: Elvis Pranskevichus <elvis@magic.io>
 Date: Mon, 11 Feb 2019 20:28:00 -0500
 Subject: [PATCH 5/5] Use pkg-config for libuuid, openssl and zlib
@@ -19,7 +19,7 @@ Subject: [PATCH 5/5] Use pkg-config for libuuid, openssl and zlib
  12 files changed, 755 insertions(+), 35 deletions(-)
 
 diff --git a/configure b/configure
-index 513c1133e7..9d4f77c00a 100755
+index f80b4f5c6e..da70b68200 100755
 --- a/configure
 +++ b/configure
 @@ -651,9 +651,14 @@ CFLAGS_SSE42
@@ -65,7 +65,7 @@ index 513c1133e7..9d4f77c00a 100755
    MSGFMT      msgfmt program for NLS
    TCLSH       Tcl interpreter program (tclsh)
 
-@@ -12638,7 +12657,74 @@ Use --without-readline to disable readline support." "$LINENO" 5
+@@ -12640,7 +12659,74 @@ Use --without-readline to disable readline support." "$LINENO" 5
  fi
 
  if test "$with_zlib" = yes; then
@@ -141,7 +141,7 @@ index 513c1133e7..9d4f77c00a 100755
  $as_echo_n "checking for inflate in -lz... " >&6; }
  if ${ac_cv_lib_z_inflate+:} false; then :
    $as_echo_n "(cached) " >&6
-@@ -12675,19 +12761,105 @@ fi
+@@ -12677,19 +12763,105 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
  $as_echo "$ac_cv_lib_z_inflate" >&6; }
  if test "x$ac_cv_lib_z_inflate" = xyes; then :
@@ -252,7 +252,7 @@ index 513c1133e7..9d4f77c00a 100755
  fi
 
  if test "$enable_spinlocks" = yes; then
-@@ -12835,10 +13007,108 @@ if test "$with_openssl" = yes ; then
+@@ -12837,10 +13009,108 @@ if test "$with_openssl" = yes ; then
  fi
 
  if test "$with_ssl" = openssl ; then
@@ -362,7 +362,7 @@ index 513c1133e7..9d4f77c00a 100755
    if test "$PORTNAME" != "win32"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_new_ex_data in -lcrypto" >&5
  $as_echo_n "checking for CRYPTO_new_ex_data in -lcrypto... " >&6; }
-@@ -13110,6 +13380,10 @@ done
+@@ -13112,6 +13382,10 @@ done
 
  $as_echo "#define USE_OPENSSL 1" >>confdefs.h
 
@@ -373,7 +373,7 @@ index 513c1133e7..9d4f77c00a 100755
  elif test "$with_ssl" != no ; then
    as_fn_error $? "--with-ssl must specify openssl" "$LINENO" 5
  fi
-@@ -13558,14 +13832,85 @@ else
+@@ -13560,14 +13834,85 @@ else
  fi
 
  elif test "$with_uuid" = e2fs ; then
@@ -466,7 +466,7 @@ index 513c1133e7..9d4f77c00a 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -13579,34 +13924,279 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -13581,34 +13926,279 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -755,7 +755,7 @@ index 513c1133e7..9d4f77c00a 100755
  elif test "$with_uuid" = ossp ; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_export in -lossp-uuid" >&5
  $as_echo_n "checking for uuid_export in -lossp-uuid... " >&6; }
-@@ -14016,6 +14606,8 @@ done
+@@ -14018,6 +14608,8 @@ done
  fi
 
  if test "$with_zlib" = yes; then
@@ -764,15 +764,15 @@ index 513c1133e7..9d4f77c00a 100755
    ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
  if test "x$ac_cv_header_zlib_h" = xyes; then :
 
-@@ -14027,6 +14619,7 @@ Use --without-zlib to disable zlib support." "$LINENO" 5
+@@ -14029,6 +14621,7 @@ Use --without-zlib to disable zlib support." "$LINENO" 5
  fi
 
 
 +  CPPFLAGS="$pgac_save_CPPFLAGS"
  fi
 
  if test "$with_lz4" = yes; then
-@@ -14077,6 +14670,8 @@ done
+@@ -14079,6 +14672,8 @@ done
  fi
 
  if test "$with_ssl" = openssl ; then
@@ -781,15 +781,15 @@ index 513c1133e7..9d4f77c00a 100755
    ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
  if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
 
-@@ -14093,6 +14688,7 @@ else
+@@ -14095,6 +14690,7 @@ else
  fi
 
 
 +  CPPFLAGS="$pgac_save_CPPFLAGS"
  fi
 
  if test "$with_pam" = yes ; then
-@@ -14258,6 +14854,9 @@ fi
+@@ -14260,6 +14856,9 @@ fi
 
  fi
 
@@ -799,7 +799,7 @@ index 513c1133e7..9d4f77c00a 100755
  # for contrib/uuid-ossp
  if test "$with_uuid" = bsd ; then
    for ac_header in uuid.h
-@@ -14392,6 +14991,8 @@ done
+@@ -14394,6 +14993,8 @@ done
 
  fi
 
@@ -808,7 +808,7 @@ index 513c1133e7..9d4f77c00a 100755
  if test "$PORTNAME" = "win32" ; then
     for ac_header in crtdefs.h
  do :
-@@ -15286,6 +15887,8 @@ if test "$with_zlib" = yes; then
+@@ -15288,6 +15889,8 @@ if test "$with_zlib" = yes; then
    # Check that <zlib.h> defines z_streamp (versions before about 1.0.4
    # did not).  While we could work around the lack of z_streamp, it
    # seems unwise to encourage people to use such old zlib versions...
@@ -817,7 +817,7 @@ index 513c1133e7..9d4f77c00a 100755
    ac_fn_c_check_type "$LINENO" "z_streamp" "ac_cv_type_z_streamp" "#include <zlib.h>
  "
  if test "x$ac_cv_type_z_streamp" = xyes; then :
-@@ -15295,6 +15898,7 @@ else
+@@ -15297,6 +15900,7 @@ else
  Use --without-zlib to disable zlib support." "$LINENO" 5
  fi
 
@@ -826,7 +826,7 @@ index 513c1133e7..9d4f77c00a 100755
 
  case $host_cpu in
 diff --git a/configure.ac b/configure.ac
-index c8b788b1b5..02d8da499e 100644
+index 70e16d7041..9fa9ffa020 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1248,11 +1248,39 @@ Use --without-readline to disable readline support.])
@@ -1043,7 +1043,7 @@ index dd1ff83b16..20a4615287 100644
 +
  SHLIB_LINK += $(filter -lssl -lcrypto -lssleay32 -leay32, $(LIBS))
 diff --git a/src/Makefile.global.in b/src/Makefile.global.in
-index 26e0d63b28..eb634a27a6 100644
+index ddd444c5f9..de1e92c7fb 100644
 --- a/src/Makefile.global.in
 +++ b/src/Makefile.global.in
 @@ -190,6 +190,13 @@ krb_srvtab = @krb_srvtab@
@@ -1138,10 +1138,10 @@ index 60c3018fa7..885e745494 100644
  OBJS_COMMON += \
  	cryptohash.o \
 diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
-index ffedf453f5..50a462cb61 100644
+index 0f773b2e76..e58ae96377 100644
 --- a/src/include/pg_config.h.in
 +++ b/src/include/pg_config.h.in
-@@ -357,7 +357,7 @@
+@@ -354,7 +354,7 @@
  /* Define to 1 if you have the `xslt' library (-lxslt). */
  #undef HAVE_LIBXSLT
 
@@ -1163,5 +1163,5 @@ index 43682574b2..555858c617 100644
 
  ifeq ($(with_gssapi),yes)
 -- 
-2.39.3
+2.43.0
 

edgedbpkg/postgresql/patches/postgresql-edgedb__pkgconfig-15.patch

@@ -1,4 +1,4 @@
-From 79f5a1c98674eb5f715a9264ea01e7b2402b5ee9 Mon Sep 17 00:00:00 2001
+From fe8faec35803dc3311ceba774bb173d3181e9649 Mon Sep 17 00:00:00 2001
 From: Elvis Pranskevichus <elvis@magic.io>
 Date: Mon, 11 Feb 2019 20:28:00 -0500
 Subject: [PATCH 5/5] Use pkg-config for libuuid, openssl and zlib
@@ -19,7 +19,7 @@ Subject: [PATCH 5/5] Use pkg-config for libuuid, openssl and zlib
  12 files changed, 755 insertions(+), 35 deletions(-)
 
 diff --git a/configure b/configure
-index 08c30d9931..9da42eca0b 100755
+index 67349836a9..38f032cedc 100755
 --- a/configure
 +++ b/configure
 @@ -653,9 +653,14 @@ LIBOBJS
@@ -65,7 +65,7 @@ index 08c30d9931..9da42eca0b 100755
    MSGFMT      msgfmt program for NLS
    TCLSH       Tcl interpreter program (tclsh)
 
-@@ -12806,7 +12825,74 @@ Use --without-readline to disable readline support." "$LINENO" 5
+@@ -12808,7 +12827,74 @@ Use --without-readline to disable readline support." "$LINENO" 5
  fi
 
  if test "$with_zlib" = yes; then
@@ -141,7 +141,7 @@ index 08c30d9931..9da42eca0b 100755
  $as_echo_n "checking for inflate in -lz... " >&6; }
  if ${ac_cv_lib_z_inflate+:} false; then :
    $as_echo_n "(cached) " >&6
-@@ -12843,19 +12929,105 @@ fi
+@@ -12845,19 +12931,105 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
  $as_echo "$ac_cv_lib_z_inflate" >&6; }
  if test "x$ac_cv_lib_z_inflate" = xyes; then :
@@ -252,7 +252,7 @@ index 08c30d9931..9da42eca0b 100755
  fi
 
  if test "$enable_spinlocks" = yes; then
-@@ -13003,10 +13175,108 @@ if test "$with_openssl" = yes ; then
+@@ -13005,10 +13177,108 @@ if test "$with_openssl" = yes ; then
  fi
 
  if test "$with_ssl" = openssl ; then
@@ -362,7 +362,7 @@ index 08c30d9931..9da42eca0b 100755
    if test "$PORTNAME" != "win32"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_new_ex_data in -lcrypto" >&5
  $as_echo_n "checking for CRYPTO_new_ex_data in -lcrypto... " >&6; }
-@@ -13278,6 +13548,10 @@ done
+@@ -13280,6 +13550,10 @@ done
 
  $as_echo "#define USE_OPENSSL 1" >>confdefs.h
 
@@ -373,7 +373,7 @@ index 08c30d9931..9da42eca0b 100755
  elif test "$with_ssl" != no ; then
    as_fn_error $? "--with-ssl must specify openssl" "$LINENO" 5
  fi
-@@ -13776,14 +14050,85 @@ else
+@@ -13778,14 +14052,85 @@ else
  fi
 
  elif test "$with_uuid" = e2fs ; then
@@ -466,7 +466,7 @@ index 08c30d9931..9da42eca0b 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -13797,34 +14142,279 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -13799,34 +14144,279 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -755,7 +755,7 @@ index 08c30d9931..9da42eca0b 100755
  elif test "$with_uuid" = ossp ; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_export in -lossp-uuid" >&5
  $as_echo_n "checking for uuid_export in -lossp-uuid... " >&6; }
-@@ -14234,6 +14824,8 @@ done
+@@ -14236,6 +14826,8 @@ done
  fi
 
  if test "$with_zlib" = yes; then
@@ -764,15 +764,15 @@ index 08c30d9931..9da42eca0b 100755
    ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
  if test "x$ac_cv_header_zlib_h" = xyes; then :
 
-@@ -14245,6 +14837,7 @@ Use --without-zlib to disable zlib support." "$LINENO" 5
+@@ -14247,6 +14839,7 @@ Use --without-zlib to disable zlib support." "$LINENO" 5
  fi
 
 
 +  CPPFLAGS="$pgac_save_CPPFLAGS"
  fi
 
  if test -z "$LZ4"; then
-@@ -14408,6 +15001,8 @@ done
+@@ -14410,6 +15003,8 @@ done
  fi
 
  if test "$with_ssl" = openssl ; then
@@ -781,15 +781,15 @@ index 08c30d9931..9da42eca0b 100755
    ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
  if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
 
-@@ -14424,6 +15019,7 @@ else
+@@ -14426,6 +15021,7 @@ else
  fi
 
 
 +  CPPFLAGS="$pgac_save_CPPFLAGS"
  fi
 
  if test "$with_pam" = yes ; then
-@@ -14589,6 +15185,9 @@ fi
+@@ -14591,6 +15187,9 @@ fi
 
  fi
 
@@ -799,7 +799,7 @@ index 08c30d9931..9da42eca0b 100755
  # for contrib/uuid-ossp
  if test "$with_uuid" = bsd ; then
    for ac_header in uuid.h
-@@ -14723,6 +15322,8 @@ done
+@@ -14725,6 +15324,8 @@ done
 
  fi
 
@@ -808,7 +808,7 @@ index 08c30d9931..9da42eca0b 100755
  if test "$PORTNAME" = "win32" ; then
     for ac_header in crtdefs.h
  do :
-@@ -15628,6 +16229,8 @@ if test "$with_zlib" = yes; then
+@@ -15630,6 +16231,8 @@ if test "$with_zlib" = yes; then
    # Check that <zlib.h> defines z_streamp (versions before about 1.0.4
    # did not).  While we could work around the lack of z_streamp, it
    # seems unwise to encourage people to use such old zlib versions...
@@ -817,7 +817,7 @@ index 08c30d9931..9da42eca0b 100755
    ac_fn_c_check_type "$LINENO" "z_streamp" "ac_cv_type_z_streamp" "#include <zlib.h>
  "
  if test "x$ac_cv_type_z_streamp" = xyes; then :
-@@ -15637,6 +16240,7 @@ else
+@@ -15639,6 +16242,7 @@ else
  Use --without-zlib to disable zlib support." "$LINENO" 5
  fi
 
@@ -826,7 +826,7 @@ index 08c30d9931..9da42eca0b 100755
 
  case $host_cpu in
 diff --git a/configure.ac b/configure.ac
-index c1202d1b86..a8b1ef108e 100644
+index ac49379795..2b418ddd79 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1284,11 +1284,39 @@ Use --without-readline to disable readline support.])
@@ -1043,7 +1043,7 @@ index dd1ff83b16..20a4615287 100644
 +
  SHLIB_LINK += $(filter -lssl -lcrypto -lssleay32 -leay32, $(LIBS))
 diff --git a/src/Makefile.global.in b/src/Makefile.global.in
-index 520c905418..de367447de 100644
+index d937c7b1bd..8d7e4ed884 100644
 --- a/src/Makefile.global.in
 +++ b/src/Makefile.global.in
 @@ -190,6 +190,13 @@ krb_srvtab = @krb_srvtab@
@@ -1138,10 +1138,10 @@ index 15c12eec6b..a5a2cb10e1 100644
  OBJS_COMMON += \
  	cryptohash.o \
 diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
-index c456566fae..66fce473ce 100644
+index 2add1b0f7b..5dc9b0fbb8 100644
 --- a/src/include/pg_config.h.in
 +++ b/src/include/pg_config.h.in
-@@ -355,7 +355,7 @@
+@@ -352,7 +352,7 @@
  /* Define to 1 if you have the `xslt' library (-lxslt). */
  #undef HAVE_LIBXSLT
 
@@ -1163,5 +1163,5 @@ index 8abdb092c2..5bbfdff72e 100644
 
  ifeq ($(with_gssapi),yes)
 -- 
-2.39.3
+2.43.0