diff mbox series

[PATCH/next,1/2] package/postgresql: security bump version to 13.5

Message ID 20211113170403.2795532-1-bernd.kuhls@t-online.de
State Superseded
Headers show
Series [PATCH/next,1/2] package/postgresql: security bump version to 13.5 | expand

Commit Message

Bernd Kuhls Nov. 13, 2021, 5:04 p.m. UTC
Release notes:
https://www.postgresql.org/about/news/postgresql-141-135-129-1114-1019-and-9624-released-2349/

Fixes CVE-2021-23214 and CVE-2021-23222.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
Added this patch for master branch to next branch for easier merging.

 package/postgresql/postgresql.hash | 4 ++--
 package/postgresql/postgresql.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni Nov. 13, 2021, 5:08 p.m. UTC | #1
On Sat, 13 Nov 2021 18:04:02 +0100
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Release notes:
> https://www.postgresql.org/about/news/postgresql-141-135-129-1114-1019-and-9624-released-2349/
> 
> Fixes CVE-2021-23214 and CVE-2021-23222.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> Added this patch for master branch to next branch for easier merging.

Sorry, but I don't understand what you mean here. You're using the past
tense "Added", which I don't really understand. This commit is a
security bump, so why would it go to "next" as specified in your patch
title?

Thomas
Bernd Kuhls Nov. 13, 2021, 6:50 p.m. UTC | #2
Am Sat, 13 Nov 2021 18:08:46 +0100 schrieb Thomas Petazzoni:

>> Added this patch for master branch to next branch for easier merging.
> 
> Sorry, but I don't understand what you mean here. You're using the past
> tense "Added", which I don't really understand. This commit is a
> security bump, so why would it go to "next" as specified in your patch
> title?

Hi Thomas,

this patch is the security bump for the master branch:
http://patchwork.ozlabs.org/project/buildroot/patch/
20211113170147.2795149-1-bernd.kuhls@t-online.de/

I cherry-picked that patch mentioned above to the -next branch which is 
the patch I am here replying to:
http://patchwork.ozlabs.org/project/buildroot/patch/
20211113170403.2795532-1-bernd.kuhls@t-online.de/

On top of the security bump for the -next branch I sent the bump to 14.1:
http://patchwork.ozlabs.org/project/buildroot/patch/
20211113170403.2795532-2-bernd.kuhls@t-online.de/

The two patches for the -next branch should avoid a merge conflict when 
the -next branch is merged back to the master branch.

Regards, Bernd
Thomas Petazzoni Nov. 14, 2021, 1:54 p.m. UTC | #3
Hello Bernd,

On Sat, 13 Nov 2021 19:50:46 +0100
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> this patch is the security bump for the master branch:
> http://patchwork.ozlabs.org/project/buildroot/patch/
> 20211113170147.2795149-1-bernd.kuhls@t-online.de/
> 
> I cherry-picked that patch mentioned above to the -next branch which is 
> the patch I am here replying to:
> http://patchwork.ozlabs.org/project/buildroot/patch/
> 20211113170403.2795532-1-bernd.kuhls@t-online.de/
> 
> On top of the security bump for the -next branch I sent the bump to 14.1:
> http://patchwork.ozlabs.org/project/buildroot/patch/
> 20211113170403.2795532-2-bernd.kuhls@t-online.de/
> 
> The two patches for the -next branch should avoid a merge conflict when 
> the -next branch is merged back to the master branch.

Thanks for the additional explanation! I've applied the series for next
to the next branch :)

Thomas
diff mbox series

Patch

diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash
index 2dcc1823d6..7e25c08aad 100644
--- a/package/postgresql/postgresql.hash
+++ b/package/postgresql/postgresql.hash
@@ -1,5 +1,5 @@ 
-# From https://ftp.postgresql.org/pub/source/v13.4/postgresql-13.4.tar.bz2.sha256
-sha256  ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd  postgresql-13.4.tar.bz2
+# From https://ftp.postgresql.org/pub/source/v13.5/postgresql-13.5.tar.bz2.sha256
+sha256  9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3  postgresql-13.5.tar.bz2
 
 # License file, Locally calculated
 sha256  31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105  COPYRIGHT
diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk
index 3b6c6e21e7..e40ab45c20 100644
--- a/package/postgresql/postgresql.mk
+++ b/package/postgresql/postgresql.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-POSTGRESQL_VERSION = 13.4
+POSTGRESQL_VERSION = 13.5
 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2
 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)
 POSTGRESQL_LICENSE = PostgreSQL