diff --git a/postgresql.spec b/postgresql.spec index 471e2459652e464bcc37cfc151bb2b84dba26054..2ed0778266a562f80402ff01611755c6d2137489 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -34,18 +34,18 @@ %undefine _package_note_file %global prevmajorversion 14 -%global prevversion %{prevmajorversion}.9 +%global prevversion %{prevmajorversion}.10 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %version-%release -%global setup_version 8.8 +%global setup_version 8.9 %global service_name postgresql.service Summary: PostgreSQL client programs Name: postgresql -Version: 15.4 -Release: 3%{?dist} +Version: 15.5 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 @@ -55,7 +55,6 @@ Source3: Makefile.regress Source4: postgresql.tmpfiles.d Source5: postgresql.pam Source6: postgresql-bashprofile -Source7: postgresql.sysusers Patch3001: rpm-pgsql.patch Patch3002: postgresql-logging.patch @@ -69,7 +68,7 @@ Patch3032: postgresql-no-libecpg.patch BuildRequires: make gcc bison flex m4 gawk glibc-devel elinks BuildRequires: perl(ExtUtils::MakeMaker) perl(ExtUtils::Embed) perl(Opcode) -BuildRequires: perl-FindBin perl-generators perl-devel +BuildRequires: perl-generators perl-devel BuildRequires: readline-devel zlib-devel lz4-devel BuildRequires: systemd systemd-devel util-linux BuildRequires: docbook-style-xsl docbook-utils help2man @@ -165,10 +164,8 @@ will interact with a PostgreSQL server. %package server Summary: The programs needed to create and run a PostgreSQL server BuildRequires: util-linux -# User and group creation with sysusers -BuildRequires: systemd-rpm-macros -%{?sysusers_requires_compat} Requires: %{name} = %precise_version +Requires(pre): /usr/sbin/useradd Requires: util-linux Requires: systemd %{?systemd_requires} @@ -313,6 +310,7 @@ Install this if you want to write database functions in Tcl. Summary: The test suite distributed with PostgreSQL Requires: %{name}-server = %precise_version Requires: %{name}-server-devel = %precise_version +Requires: %{name}-contrib = %precise_version %description test The postgresql-test package contains files needed for various tests for the @@ -341,9 +339,9 @@ goal of accelerating analytics queries. %setup -q -a 2 -n postgresql-%{version} %autopatch -p1 -M 3030 %if %external_libpq -%patch3031 -p1 +%patch -P 3031 -p1 %else -%patch3032 -p1 +%patch -P 3032 -p1 %endif @@ -595,9 +593,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{?_localstatedir}/run/postgresql mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir} install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf -# sysusers config for postgres user/group -install -p -D -m 0644 %{SOURCE7} %{buildroot}%{_sysusersdir}/postgresql.conf - install -d -m 700 $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/data install -d -m 700 $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/backups @@ -653,7 +648,11 @@ EOF mkdir -p $RPM_BUILD_ROOT%{_libdir}/pgsql/test cp -a src/test/regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/pg_regress + rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/refint.so + rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/autoinc.so ln -sf ../../pgxs/src/test/regress/pg_regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/pg_regress + ln -sf ../../autoinc.so $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/autoinc.so + ln -sf ../../refint.so $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/refint.so pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress rm -f GNUmakefile Makefile *.o chmod 0755 pg_regress regress.so @@ -711,7 +710,9 @@ find_lang_bins pltcl.lst pltcl %endif %pre server -%sysusers_create_compat %{SOURCE7} +/usr/sbin/groupadd -g 26 -o -r postgres >/dev/null 2>&1 || : +/usr/sbin/useradd -M -N -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \ + -c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || : %post server %systemd_post %service_name @@ -986,7 +987,6 @@ make -C postgresql-setup-%{setup_version} check %{_mandir}/man1/postmaster.* %{_sbindir}/postgresql-new-systemd-unit %{_tmpfilesdir}/postgresql.conf -%{_sysusersdir}/postgresql.conf %{_unitdir}/*postgresql*.service %attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql %attr(644,postgres,postgres) %config(noreplace) %{?_localstatedir}/lib/pgsql/.bash_profile @@ -1093,6 +1093,10 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Tue Dec 05 2023 Upgrade Robot - 15.5-1 +- Upgrade to version 15.5 +- CVEs fixed: CVE-2023-5868 CVE-2023-5869 CVE-2023-5870 + * Tue Sep 19 2023 OpenCloudOS Release Engineering - 15.4-3 - Rebuilt for python 3.11 diff --git a/postgresql.sysusers b/postgresql.sysusers deleted file mode 100644 index afc7799214656dda329e151a8688a0012a3ba8de..0000000000000000000000000000000000000000 --- a/postgresql.sysusers +++ /dev/null @@ -1 +0,0 @@ -u postgres 26 "PostgreSQL Server" /var/lib/pgsql /bin/bash diff --git a/sources b/sources index fb6cb446210860447ad645d3ab17ad109bd05730..d45c3a611c98002e6b8dca4812d1d082d571616f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (postgresql-15.4.tar.bz2) = 37dd3e8b644d10c4f55963e07344ff4b0079adbae60052306f230f15e4ef4662b89e84a63dacc87cbf926c80b186d064a391283dd16e29ab47f7acc8a9860d0b -SHA512 (postgresql-14.9.tar.bz2) = 8a7f74c5fd1ec5339085f357b3044dd0d763e3368bd42b5d68497eba5cbf71e9c76a329580d8aa3145aa98a157f28df548c4a6dc2d880db5c0156baa231f5d24 -SHA512 (postgresql-setup-8.8.tar.gz) = 4569e5ba83b16556312b89cd6762eb55902eb9265ce9ceb0e0fe18755e1ab7217ea748df465c4402e24d19b55b25702deab92030510dc722db8fcbc0cb639053 +SHA512 (postgresql-15.5.tar.bz2) = 9ed9d160b3cef99954ccd47a970c107b7e3b0196a7d848f740bf3c52a1c626f6f457814c97f37b9f0467bb07734e19806a15bd9cf3c39445e1d89e75b37064cc +SHA512 (postgresql-14.10.tar.bz2) = f546e62eb158efdeecf091271ee60945604ca7f3683f0b259ee18eb682431158e282bf4f81d8df304c956919788f8077e72aa47c467d32d6aef1ccfe470862a5 +SHA512 (postgresql-setup-8.9.tar.gz) = 118e9ebf858722a38b0e90324bc1b49fc7058cda601ca0a7e78c94e7b95e89d6dbbc46f377626364b068614ced3cde3cb4733973ad2d71bf17892ad773657ef7