UP to 11.15.

diff --git a/ac.patch b/ac.patch
index 68873fee310d948ee8a1df975efe5847a8681afd..622c33ea224903aea829322bbaf960f73fb6a3d5 100644 (file)
--- a/ac.patch
+++ b/ac.patch
@@ -2,7 +2,7 @@
 +++ postgresql-11.5/configure.in       2021-05-08 22:50:36.956514091 +0200
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [11.5], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [11.15], [pgsql-bugs@postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not

diff --git a/llvm10.patch b/llvm10.patch
deleted file mode 100644 (file)
index f74c57e..0000000
--- a/llvm10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f493d98c167321e5d5c17dd7d795721045a81c97 Mon Sep 17 00:00:00 2001
-From: Thomas Munro <tmunro@postgresql.org>
-Date: Sun, 25 Aug 2019 13:54:48 +1200
-Subject: [PATCH] Don't rely on llvm::make_unique.
-
-Bleeding-edge LLVM has stopped supplying replacements for various
-C++14 library features, for people on older C++ versions.  Since we're
-not ready to require C++14 yet, just use plain old new instead of
-make_unique.  As revealed by buildfarm animal seawasp.
-
-Back-patch to 11.
-
-Reviewed-by: Andres Freund
-Discussion: https://postgr.es/m/CA%2BhUKGJWG7unNqmkxg7nC5o3o-0p2XP6co4r%3D9epqYMm8UY4Mw%40mail.gmail.com
----
- src/backend/jit/llvm/llvmjit_inline.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/backend/jit/llvm/llvmjit_inline.cpp b/src/backend/jit/llvm/llvmjit_inline.cpp
-index 0513998b02..688edfe525 100644
---- a/src/backend/jit/llvm/llvmjit_inline.cpp
-+++ b/src/backend/jit/llvm/llvmjit_inline.cpp
-@@ -174,7 +174,7 @@ llvm_inline(LLVMModuleRef M)
- static std::unique_ptr<ImportMapTy>
- llvm_build_inline_plan(llvm::Module *mod)
- {
--      std::unique_ptr<ImportMapTy> globalsToInline = llvm::make_unique<ImportMapTy>();
-+      std::unique_ptr<ImportMapTy> globalsToInline(new ImportMapTy());
-       FunctionInlineStates functionStates;
-       InlineWorkList worklist;
- 
--- 
-2.20.1
-

diff --git a/postgresql-disable_horology_test.patch b/postgresql-disable_horology_test.patch
index 636116e2ba8d17973d1fa060f3c81bdc38ecdbdd..8f0c6751266a27c97d8bfd7d375a6a6c8e4febd4 100644 (file)
--- a/postgresql-disable_horology_test.patch
+++ b/postgresql-disable_horology_test.patch
@@ -6,9 +6,9 @@
 --- postgresql-8.3RC1/src/test/regress/expected/horology.out   2007-07-25 18:22:36.000000000 +0100
 +++ postgresql-8.3.0/src/test/regress/expected/horology.out    2008-02-04 20:20:16.091518646 +0000
 @@ -602,30 +602,12 @@
- 
  -- timestamp with time zone, interval arithmetic around DST change
- SET TIME ZONE 'CST7CDT';
+ -- (just for fun, let's use an intentionally nonstandard POSIX zone spec)
+ SET TIME ZONE 'CST7CDT,M4.1.0,M10.5.0';
 -SELECT timestamp with time zone '2005-04-02 12:00-07' + interval '1 day' as "Apr 3, 12:00";
 -         Apr 3, 12:00         
 -------------------------------
@@ -39,9 +39,9 @@
 --- postgresql-8.3RC1/src/test/regress/sql/horology.sql        2007-07-25 18:22:37.000000000 +0100
 +++ postgresql-8.3.0/src/test/regress/sql/horology.sql 2008-02-04 20:20:18.091381199 +0000
 @@ -114,10 +114,7 @@
- 
  -- timestamp with time zone, interval arithmetic around DST change
- SET TIME ZONE 'CST7CDT';
+ -- (just for fun, let's use an intentionally nonstandard POSIX zone spec)
+ SET TIME ZONE 'CST7CDT,M4.1.0,M10.5.0';
 -SELECT timestamp with time zone '2005-04-02 12:00-07' + interval '1 day' as "Apr 3, 12:00";
  SELECT timestamp with time zone '2005-04-02 12:00-07' + interval '24 hours' as "Apr 3, 13:00";
 -SELECT timestamp with time zone '2005-04-03 12:00-06' - interval '1 day' as "Apr 2, 12:00";

diff --git a/postgresql.spec b/postgresql.spec
index 308047045f78dae59b598e0c3035fcf76af0fcbd..ac593b5947d1d8db6215b566cdc0710d21bd26aa 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -35,12 +35,12 @@ Summary(tr.UTF-8):  Veri Tabanı Yönetim Sistemi
 Summary(uk.UTF-8):     PostgreSQL - система керування базами даних
 Summary(zh_CN.UTF-8):  PostgreSQL 客户端程序和库文件
 Name:          postgresql
-Version:       %{mver}.5
-Release:       14
+Version:       %{mver}.15
+Release:       1
 License:       BSD
 Group:         Applications/Databases
 Source0:       http://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 580da94f6d85046ff2a228785ab2cc89
+# Source0-md5: 1536142e72dce4bed5c6f0e79e80f486
 Source1:       %{name}.init
 Source2:       pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5: 5b656ddf1db41965761f85204a14398e
@@ -55,10 +55,8 @@ Patch2:              %{name}-ecpg-includedir.patch
 Patch4:                %{name}-disable_horology_test.patch
 Patch5:                %{name}-heimdal.patch
 Patch6:                %{name}-link.patch
-Patch7:                llvm10.patch
-Patch8:                llvm11.patch
+
 Patch9:                ac.patch
-Patch10:       llvm12.patch
 URL:           http://www.postgresql.org/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake
@@ -795,10 +793,8 @@ Różne moduły dołączone do PostgreSQL-a.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
+
 %patch9 -p1
-%patch10 -p1
 
 # force rebuild of bison/flex files
 find src -name \*.l -o -name \*.y | xargs touch