From 894d6ab2deb3427f49c86815b093b20fdeb10fbf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 5 Jun 2021 04:50:31 +0200
Subject: [PATCH 1/5] postgresql_13: 13.2 -> 13.3

Fixes: CVE-2021-32027, CVE-2021-32028, CVE-2021-32029
(cherry picked from commit 3318a937ef800d2ba7818dc50be01bc4319dc0ad)
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 63446a684b2..426ff820408 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -233,9 +233,9 @@ in self: {
   };
 
   postgresql_13 = self.callPackage generic {
-    version = "13.2";
+    version = "13.3";
     psqlSchema = "13";
-    sha256 = "1z5d847jnajcfr3wa6jn52a8xjhamvwzmz18xlm5nvxqip8grmsz";
+    sha256 = "18dliq7h2l8irffhyyhdmfwx3si515q6gds3cxdjb9n7m17lbn9w";
     this = self.postgresql_13;
     thisAttr = "postgresql_13";
     inherit self;

From 942a01e232a6be883a4455ace52228ff3f53d2f8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 5 Jun 2021 04:54:33 +0200
Subject: [PATCH 2/5] postgresql_12: 12.6 -> 12.7

Fixes: CVE-2021-32027, CVE-2021-32028, CVE-2021-32029
(cherry picked from commit b786157de875702c9a40b0945597ba25e83d918c)
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 426ff820408..70d272cc554 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -224,9 +224,9 @@ in self: {
   };
 
   postgresql_12 = self.callPackage generic {
-    version = "12.6";
+    version = "12.7";
     psqlSchema = "12";
-    sha256 = "028asz92mi3706zabfs8w9z03mzyx62d1l71qy9zdwfabj6xjzfz";
+    sha256 = "15frsmsl1n2i4p76ji0wng4lvnlzw6f01br4cs5xr3n88wgp9444";
     this = self.postgresql_12;
     thisAttr = "postgresql_12";
     inherit self;

From 8d97696b861f88eb1932d81adcc92f5ebc488e2d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 5 Jun 2021 04:54:53 +0200
Subject: [PATCH 3/5] postgresql_11: 11.11 -> 11.12

Fixes: CVE-2021-32027, CVE-2021-32028, CVE-2021-32029
(cherry picked from commit daedf20fa605c859a3c4b4c60d1ad0ba88261d4e)
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 70d272cc554..9f7646cdda3 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -215,9 +215,9 @@ in self: {
   };
 
   postgresql_11 = self.callPackage generic {
-    version = "11.11";
+    version = "11.12";
     psqlSchema = "11.1"; # should be 11, but changing it is invasive
-    sha256 = "0v0qk298nxmpzpgsxcsxma328hdkyzd7fwjs0zsn6zavl5zpnq20";
+    sha256 = "016bacpmqxc676ipzc1l8zv1jj44mjz7dv7jhqazg3ibdfqxiyc7";
     this = self.postgresql_11;
     thisAttr = "postgresql_11";
     inherit self;

From 731e67c87146fdf826bee1a2fc14d2853f8b9888 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 5 Jun 2021 04:55:13 +0200
Subject: [PATCH 4/5] postgresql_10: 10.16 -> 10.17

Fixes: CVE-2021-32027, CVE-2021-32028
(cherry picked from commit 376197bc5e9501febea4b6ab46b8073374d52c08)
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 9f7646cdda3..1f6d59a5b3e 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -205,9 +205,9 @@ in self: {
   };
 
   postgresql_10 = self.callPackage generic {
-    version = "10.16";
+    version = "10.17";
     psqlSchema = "10.0"; # should be 10, but changing it is invasive
-    sha256 = "1cvv8qw0gkkczqhiwx6ns7w88dwkvdz4cvb2d4ff14363f5p2p53";
+    sha256 = "0v5jahkqm6gkq67s4bac3h7297bscn2ab6y128idi73cc1qq1wjs";
     this = self.postgresql_10;
     thisAttr = "postgresql_10";
     inherit self;

From 4a7770bfd62539cd15570a765496c96210246007 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 5 Jun 2021 04:55:36 +0200
Subject: [PATCH 5/5] postgresql_9_6: 9.6.21 -> 9.6.22

Fixes: CVE-2021-32027, CVE-2021-32028
(cherry picked from commit 062e1e595fe8bde889c73c2954fb2c5617dcf42c)
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 1f6d59a5b3e..6ab4ecbec4b 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -196,9 +196,9 @@ let
 in self: {
 
   postgresql_9_6 = self.callPackage generic {
-    version = "9.6.21";
+    version = "9.6.22";
     psqlSchema = "9.6";
-    sha256 = "0d0ngpadf1i7c0i2psaxcbmiwx8334ibcsn283n9fp4853pyl3wk";
+    sha256 = "0c19kzrj5ib5ygmavf5d6qvxdwrxzzz6jz1r2dl5b815208cscix";
     this = self.postgresql_9_6;
     thisAttr = "postgresql_9_6";
     inherit self;