diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index 9090289b1..726883a5d 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postgresql -PKG_VERSION:=12.4 +PKG_VERSION:=13.0 PKG_RELEASE:=1 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=PostgreSQL @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=\ http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \ ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION) -PKG_HASH:=bee93fbe2c32f59419cb162bcc0145c58da9a8644ee154a30b9a5ce47de606cc +PKG_HASH:=80e750be8d436b54197636a02636f8fd3263ba6779bf865b04832495ea592296 PKG_USE_MIPS16:=0 PKG_FIXUP:=autoreconf diff --git a/libs/postgresql/patches/001-configure_fixes.patch b/libs/postgresql/patches/001-configure_fixes.patch deleted file mode 100644 index 02d345fdf..000000000 --- a/libs/postgresql/patches/001-configure_fixes.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -2317,36 +2317,6 @@ if test "$with_python" = yes; then - CPPFLAGS=$ac_save_CPPFLAGS - fi - --# --# Check for DocBook and tools --# --PGAC_PATH_XMLLINT --PGAC_CHECK_DOCBOOK(4.2) --PGAC_PATH_PROGS(DBTOEPUB, dbtoepub) --PGAC_PATH_PROGS(XSLTPROC, xsltproc) --PGAC_PATH_PROGS(FOP, fop) -- --# --# Check for test tools --# --if test "$enable_tap_tests" = yes; then -- # Check for necessary modules, unless user has specified the "prove" to use; -- # in that case it's her responsibility to have a working configuration. -- # (prove might be part of a different Perl installation than perl, eg on -- # MSys, so the result of AX_PROG_PERL_MODULES could be irrelevant anyway.) -- if test -z "$PROVE"; then -- # Test::More and Time::HiRes are supposed to be part of core Perl, -- # but some distros omit them in a minimal installation. -- AX_PROG_PERL_MODULES([IPC::Run Test::More=0.87 Time::HiRes], , -- [AC_MSG_ERROR([Additional Perl modules are required to run TAP tests])]) -- fi -- # Now make sure we know where prove is -- PGAC_PATH_PROGS(PROVE, prove) -- if test -z "$PROVE"; then -- AC_MSG_ERROR([prove not found]) -- fi --fi -- - # Thread testing - - # We have to run the thread test near the end so we have all our symbols diff --git a/libs/postgresql/patches/200-ranlib.patch b/libs/postgresql/patches/200-ranlib.patch index 19d9357d3..35ce44f05 100644 --- a/libs/postgresql/patches/200-ranlib.patch +++ b/libs/postgresql/patches/200-ranlib.patch @@ -1,6 +1,6 @@ --- a/src/port/Makefile +++ b/src/port/Makefile -@@ -63,6 +63,7 @@ uninstall: +@@ -82,6 +82,7 @@ uninstall: libpgport.a: $(OBJS) rm -f $@ $(AR) $(AROPT) $@ $^ diff --git a/libs/postgresql/patches/300-fix-pc-file.patch b/libs/postgresql/patches/300-fix-pc-file.patch index 21ae33191..413844cc6 100644 --- a/libs/postgresql/patches/300-fix-pc-file.patch +++ b/libs/postgresql/patches/300-fix-pc-file.patch @@ -1,6 +1,6 @@ --- a/src/Makefile.shlib +++ b/src/Makefile.shlib -@@ -396,14 +396,27 @@ endif # PORTNAME == cygwin || PORTNAME = +@@ -387,14 +387,27 @@ endif # PORTNAME == cygwin || PORTNAME = %.pc: $(MAKEFILE_LIST) @@ -20,7 +20,7 @@ + echo >>$@ + echo 'Name: lib$(NAME)' >>$@ echo 'Description: PostgreSQL lib$(NAME) library' >>$@ - echo 'Url: http://www.postgresql.org/' >>$@ + echo 'Url: $(PACKAGE_URL)' >>$@ echo 'Version: $(VERSION)' >>$@ echo 'Requires: ' >>$@ echo 'Requires.private: $(PKG_CONFIG_REQUIRES_PRIVATE)' >>$@ diff --git a/libs/postgresql/patches/800-busybox-default-pager.patch b/libs/postgresql/patches/800-busybox-default-pager.patch index f6af04ed8..b1222cbd0 100644 --- a/libs/postgresql/patches/800-busybox-default-pager.patch +++ b/libs/postgresql/patches/800-busybox-default-pager.patch @@ -1,6 +1,6 @@ --- a/src/include/fe_utils/print.h +++ b/src/include/fe_utils/print.h -@@ -17,11 +17,7 @@ +@@ -19,11 +19,7 @@ /* This is not a particularly great place for this ... */ diff --git a/libs/postgresql/patches/900-pg_ctl-setuid.patch b/libs/postgresql/patches/900-pg_ctl-setuid.patch index 48575777c..8203fbf1d 100644 --- a/libs/postgresql/patches/900-pg_ctl-setuid.patch +++ b/libs/postgresql/patches/900-pg_ctl-setuid.patch @@ -1,6 +1,6 @@ --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c -@@ -93,6 +93,7 @@ static char *event_source = NULL; +@@ -94,6 +94,7 @@ static char *event_source = NULL; static char *register_servicename = "PostgreSQL"; /* FIXME: + version ID? */ static char *register_username = NULL; static char *register_password = NULL; @@ -8,7 +8,7 @@ static char *argv0 = NULL; static bool allow_core_files = false; static time_t start_time; -@@ -2082,6 +2083,9 @@ do_help(void) +@@ -2055,6 +2056,9 @@ do_help(void) #endif printf(_(" -s, --silent only print errors, no informational messages\n")); printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n")); @@ -18,7 +18,7 @@ printf(_(" -V, --version output version information, then exit\n")); printf(_(" -w, --wait wait until operation completes (default)\n")); printf(_(" -W, --no-wait do not wait until operation completes\n")); -@@ -2294,6 +2298,7 @@ main(int argc, char **argv) +@@ -2267,6 +2271,7 @@ main(int argc, char **argv) {"options", required_argument, NULL, 'o'}, {"silent", no_argument, NULL, 's'}, {"timeout", required_argument, NULL, 't'}, @@ -26,7 +26,7 @@ {"core-files", no_argument, NULL, 'c'}, {"wait", no_argument, NULL, 'w'}, {"no-wait", no_argument, NULL, 'W'}, -@@ -2334,20 +2339,6 @@ main(int argc, char **argv) +@@ -2307,20 +2312,6 @@ main(int argc, char **argv) } } @@ -47,7 +47,7 @@ env_wait = getenv("PGCTLTIMEOUT"); if (env_wait != NULL) -@@ -2434,11 +2425,15 @@ main(int argc, char **argv) +@@ -2407,11 +2398,15 @@ main(int argc, char **argv) wait_seconds_arg = true; break; case 'U': @@ -63,7 +63,7 @@ break; case 'w': do_wait = true; -@@ -2520,6 +2515,41 @@ main(int argc, char **argv) +@@ -2493,6 +2488,41 @@ main(int argc, char **argv) exit(1); }