Revert OL changes

This commit is contained in:
eabdullin 2023-12-21 12:36:26 +03:00
parent 55240a7cc3
commit cae5e8066a
4 changed files with 8 additions and 51 deletions

6
.gitignore vendored
View File

@ -1,4 +1,4 @@
SOURCES/postgresql-10.23.tar.bz2
SOURCES/postgresql-12.15-US.pdf
SOURCES/postgresql-12.15.tar.bz2
SOURCES/postgresql-setup-8.6.tar.gz
SOURCES/postgresql-12.17-US.pdf
SOURCES/postgresql-12.17.tar.bz2
SOURCES/postgresql-setup-8.7.tar.gz

View File

@ -1,4 +1,4 @@
2df7b4b3751112f3cb543c3ea81e45531bebc7a1 SOURCES/postgresql-10.23.tar.bz2
76418f35de2b232cdd807bd3e6a7595136a161a0 SOURCES/postgresql-12.15-US.pdf
7c643aa8a57b8926158345da9881fc2cb0fd2d1f SOURCES/postgresql-12.15.tar.bz2
9e12ee26bf41d3831f83049b51ae5da76de2ce12 SOURCES/postgresql-setup-8.6.tar.gz
7cc63d1d9c026cd0b5731f5e015c63c611ed5388 SOURCES/postgresql-12.17-US.pdf
2fc3eda69a9d4b4f215428b77d70da0b83586f0d SOURCES/postgresql-12.17.tar.bz2
fb97095dc9648f9c31d58fcb406831da5e419ddf SOURCES/postgresql-setup-8.7.tar.gz

View File

@ -1,38 +0,0 @@
From df5ba865eb8a42147d23100b37322921ad98248a Mon Sep 17 00:00:00 2001
From: sagar sagar <sagar.sagar@oracle.com>
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 <sagar.sagar@oracle.com>
---
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

View File

@ -60,7 +60,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 12
Version: %{majorversion}.17
Release: 1.0.1%{?dist}
Release: 1%{?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.
@ -110,9 +110,6 @@ Patch8: postgresql-external-libpq.patch
Patch9: postgresql-server-pg_config.patch
Patch10: postgresql-12.5-contrib-dblink-expected-out.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
@ -374,8 +371,6 @@ benchmarks.
%patch9 -p1
%patch10 -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.
@ -1230,7 +1225,7 @@ make -C postgresql-setup-%{setup_version} check
%changelog
* Fri Dec 15 2023 Tianyue Lan <tianyue.lan@oracle.com> - 12.17-1.0.1
* Fri Dec 15 2023 Tianyue Lan <tianyue.lan@oracle.com> - 12.17-1
- Update to version 12.17
- Resolves: Fix: CVE-2023-5868, CVE-2023-5869, CVE-2023-5870, CVE-2023-39417