From 0aab0499ee8d7485fc2d60b6c276db48da8733fd Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 21 Dec 2023 12:17:55 +0300 Subject: [PATCH] Revert OL changes --- ...gresql-service-network-binding-issue.patch | 38 ------------------- SPECS/postgresql.spec | 9 +---- 2 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 SOURCES/1001-Fixed-postgresql-service-network-binding-issue.patch diff --git a/SOURCES/1001-Fixed-postgresql-service-network-binding-issue.patch b/SOURCES/1001-Fixed-postgresql-service-network-binding-issue.patch deleted file mode 100644 index deca076..0000000 --- a/SOURCES/1001-Fixed-postgresql-service-network-binding-issue.patch +++ /dev/null @@ -1,38 +0,0 @@ -From df5ba865eb8a42147d23100b37322921ad98248a Mon Sep 17 00:00:00 2001 -From: sagar sagar -Date: Thu, 11 May 2023 15:49:37 +0530 -Subject: [PATCH] Fixed postgresql service network binding issue during bootup - -During the bootup, the postgresql service requires port bind to network -address to assign configured in /var/lib/pgsql/data/postgresql.conf but the -service is not able to do if the network service has not yet assigned an IP -address to the network interface. -By using "network-online.target" parameter in -/usr/lib/systemd/system/postgresql.service we are postponing the postgresql -service to run until we have not got the IP address assinged. - -For more info :- -https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/ -Orabug: 35103668 - -Signed-off-by: sagar sagar ---- - postgresql-setup-8.7/postgresql.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/postgresql-setup-8.7/postgresql.service.in b/postgresql-setup-8.7/postgresql.service.in -index c73c42a..893e6fa 100644 ---- a/postgresql-setup-8.7/postgresql.service.in -+++ b/postgresql-setup-8.7/postgresql.service.in -@@ -6,7 +6,7 @@ - - [Unit] - Description=PostgreSQL database server --After=network.target -+After=network-online.target - - [Service] - Type=notify --- -2.31.1 - diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec index 0dd3286..b8eb540 100644 --- a/SPECS/postgresql.spec +++ b/SPECS/postgresql.spec @@ -59,7 +59,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 10 Version: %{majorversion}.23 -Release: 3.0.1%{?dist} +Release: 3%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -112,9 +112,6 @@ Patch11: postgresql-10.23-CVE-2023-2454.patch Patch12: postgresql-10.23-CVE-2023-2455.patch Patch13: postgresql-10.23-CVE-2023-5869.patch -#Oracle Patches -Patch1001: 1001-Fixed-postgresql-service-network-binding-issue.patch - BuildRequires: gcc BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk BuildRequires: perl(ExtUtils::Embed), perl-devel @@ -377,8 +374,6 @@ benchmarks. %patch12 -p1 %patch13 -p1 -%patch1001 -p1 - # We used to run autoconf here, but there's no longer any real need to, # since Postgres ships with a reasonably modern configure script. @@ -1182,7 +1177,7 @@ make -C postgresql-setup-%{setup_version} check %changelog -* Mon Dec 18 2023 Lubos Kloucek - 10.23-3.0.1 +* Mon Dec 18 2023 Lubos Kloucek - 10.23-3 - Resolves: CVE-2023-5869 * Tue Aug 08 2023 David Sloboda - 10.23-2.0.1