From 427a29ad96b92f4733c3f0e5ee3410dce362b608ca2a16824ed876022ed7611f Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Fri, 14 May 2021 11:50:49 +0000
Subject: [PATCH] =?UTF-8?q?-=20Upgrade=20to=20version=2012.7:=20=20=20*=20?=
 =?UTF-8?q?https://www.postgresql.org/docs/12/release-12-7.html=20=20=20*?=
 =?UTF-8?q?=20CVE-2021-32027,=20bsc#1185924:=20=20=20=20=20Prevent=20integ?=
 =?UTF-8?q?er=20overflows=20in=20array=20subscripting=20calculations.=20?=
 =?UTF-8?q?=20=20*=20CVE-2021-32028,=20bsc#1185925:=20Fix=20mishandling=20?=
 =?UTF-8?q?of=20=E2=80=9Cjunk=E2=80=9D=20=20=20=20=20columns=20in=20INSERT?=
 =?UTF-8?q?=20...=20ON=20CONFLICT=20...=20UPDATE=20target=20lists.=20=20?=
 =?UTF-8?q?=20*=20CVE-2021-32029,=20bsc#1185926:=20Fix=20possibly-incorrec?=
 =?UTF-8?q?t=20=20=20=20=20computation=20of=20UPDATE=20...=20RETURNING=20?=
 =?UTF-8?q?=20=20=20=20"pg=5Fpsql=5Ftemporary=5Fsavepoint"=20does=20not=20?=
 =?UTF-8?q?exist=E2=80=9D.=20-=20Don't=20use=20%=5Fstop=5Fon=5Fremoval,=20?=
 =?UTF-8?q?because=20it=20was=20meant=20to=20be=20private=20=20=20and=20go?=
 =?UTF-8?q?t=20removed=20from=20openSUSE.=20%=5Frestart=5Fon=5Fupdate=20is?=
 =?UTF-8?q?=20also=20=20=20private,=20but=20still=20supported=20and=20need?=
 =?UTF-8?q?ed=20for=20now=20(bsc#1183168).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql12?expand=0&rev=41
---
 postgresql-12.6.tar.bz2        |  3 ---
 postgresql-12.6.tar.bz2.sha256 |  1 -
 postgresql-12.7.tar.bz2        |  3 +++
 postgresql-12.7.tar.bz2.sha256 |  1 +
 postgresql12.changes           | 17 +++++++++++++++++
 postgresql12.spec              |  8 ++++----
 6 files changed, 25 insertions(+), 8 deletions(-)
 delete mode 100644 postgresql-12.6.tar.bz2
 delete mode 100644 postgresql-12.6.tar.bz2.sha256
 create mode 100644 postgresql-12.7.tar.bz2
 create mode 100644 postgresql-12.7.tar.bz2.sha256

diff --git a/postgresql-12.6.tar.bz2 b/postgresql-12.6.tar.bz2
deleted file mode 100644
index 20fcdf1..0000000
--- a/postgresql-12.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df7dd98d5ccaf1f693c7e1d0d084e9fed7017ee248bba5be0167c42ad2d70a09
-size 20771172
diff --git a/postgresql-12.6.tar.bz2.sha256 b/postgresql-12.6.tar.bz2.sha256
deleted file mode 100644
index f879b18..0000000
--- a/postgresql-12.6.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-df7dd98d5ccaf1f693c7e1d0d084e9fed7017ee248bba5be0167c42ad2d70a09  postgresql-12.6.tar.bz2
diff --git a/postgresql-12.7.tar.bz2 b/postgresql-12.7.tar.bz2
new file mode 100644
index 0000000..d675d61
--- /dev/null
+++ b/postgresql-12.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+size 20819005
diff --git a/postgresql-12.7.tar.bz2.sha256 b/postgresql-12.7.tar.bz2.sha256
new file mode 100644
index 0000000..229ce01
--- /dev/null
+++ b/postgresql-12.7.tar.bz2.sha256
@@ -0,0 +1 @@
+8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995  postgresql-12.7.tar.bz2
diff --git a/postgresql12.changes b/postgresql12.changes
index 97925e0..cd9b92a 100644
--- a/postgresql12.changes
+++ b/postgresql12.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue May 11 16:19:19 UTC 2021 - Reinhard Max <max@suse.com>
+
+- Upgrade to version 12.7:
+  * https://www.postgresql.org/docs/12/release-12-7.html
+  * CVE-2021-32027, bsc#1185924:
+    Prevent integer overflows in array subscripting calculations.
+  * CVE-2021-32028, bsc#1185925: Fix mishandling of “junk”
+    columns in INSERT ... ON CONFLICT ... UPDATE target lists.
+  * CVE-2021-32029, bsc#1185926: Fix possibly-incorrect
+    computation of UPDATE ... RETURNING
+    "pg_psql_temporary_savepoint" does not exist”.
+
+- Don't use %_stop_on_removal, because it was meant to be private
+  and got removed from openSUSE. %_restart_on_update is also
+  private, but still supported and needed for now (bsc#1183168).
+
 -------------------------------------------------------------------
 Mon Mar 15 19:29:39 UTC 2021 - Reinhard Max <max@suse.com>
 
diff --git a/postgresql12.spec b/postgresql12.spec
index 96d69f4..03ce05b 100644
--- a/postgresql12.spec
+++ b/postgresql12.spec
@@ -16,7 +16,7 @@
 #
 
 
-%define pgversion 12.6
+%define pgversion 12.7
 %define pgmajor 12
 %define pgsuffix %pgmajor
 %define buildlibs 0
@@ -764,10 +764,10 @@ awk -v P=%buildroot '/^(%lang|[^%])/{print P $NF}' libpq.files libecpg.files | x
 %preun server
 # Stop only when we are uninstalling the currently running version
 test -n "$FIRST_ARG" || FIRST_ARG="$1"
-if [ "$FIRST_ARG" -eq 0 -a -x /usr/bin/systemctl ]; then
+if [ "$FIRST_ARG" -eq 0 ]; then
   %if %{with systemd}
-    %define stop %_stop_on_removal postgresql.service
-    eval $(systemctl show postgresql --property=MainPID)
+    %define stop systemctl stop postgresql.service
+    eval $(systemctl show postgresql.service --property=MainPID)
   %else
     %define stop /sbin/init.d postgresql stop
     MainPID=$(pidof -s postgres) || :