diff --git a/postgresql.spec b/postgresql.spec index 3aa69de..639ec8a 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -4,7 +4,7 @@ Name: postgresql Version: 10.5 -Release: 16 +Release: 17 Summary: PostgreSQL client programs License: PostgreSQL URL: http://www.postgresql.org/ @@ -23,19 +23,21 @@ Source11: macros.postgresql Source12: macros.postgresql-test Source13: postgresql_pkg_tests.sh -Patch0000: 0000-postgresql-var-run-socket.patch -Patch0001: 0000-rpm-pgsql.patch - -Patch6000: 6000-CVE-2019-10164-1.patch -Patch6001: 6001-CVE-2019-10164-2.patch -Patch6002: CVE-2019-10208.patch -Patch6003: CVE-2018-16850.patch -Patch6004: CVE-2019-10130.patch -Patch6005: CVE-2020-1720.patch +Patch1: 0001-postgresql-var-run-socket.patch +Patch2: 0002-rpm-pgsql.patch +Patch3: 0003-CVE-2019-10164-1.patch +Patch4: 0004-CVE-2019-10164-2.patch +Patch5: 0005-CVE-2019-10208.patch +Patch6: 0006-CVE-2018-16850.patch +Patch7: 0007-CVE-2019-10130.patch +Patch8: 0008-CVE-2020-1720.patch +Patch9: 0009-CVE-2020-14349-1.patch +Patch10: 0010-CVE-2020-14349-2.patch +Patch11: 0011-CVE-2020-14350.patch BuildRequires: gcc perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk perl(ExtUtils::Embed) BuildRequires: perl-devel perl-generators readline-devel zlib-devel systemd systemd-devel -BuildRequires: util-linux m4 elinks docbook-utils help2man +BuildRequires: util-linux m4 elinks docbook-utils help2man docbook-style-xsl BuildRequires: python3 python3-devel tcl-devel openssl-devel krb5-devel openldap-devel gettext >= 0.10.35 BuildRequires: uuid-devel libxml2-devel libxslt-devel pam-devel systemtap-sdt-devel libselinux-devel Requires: %{name}-libs = %{version}-%{release} @@ -158,14 +160,17 @@ that want to run build-time testsuite against running PostgreSQL server. sha256sum -c %{SOURCE3} ) %setup -q -%patch0000 -p1 -%patch0001 -p1 -%patch6000 -p1 -%patch6001 -p1 -%patch6002 -p1 -%patch6003 -p1 -%patch6004 -p1 -%patch6005 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 %build if [ x"`id -u`" = x0 ]; then @@ -430,6 +435,9 @@ find_lang_bins pltcl.lst pltcl %attr(-,postgres,postgres) %{_libdir}/pgsql/test %changelog +* Web Sep 9 2020 yanglongkang - 10.5-18 +- Fix CVE-2020-14349 CVE-2020-14350 + * Fri Jun 19 2020 cuibaobao - 10.5-16 - Type: enhancement - DESC: delete all about residual parse_upgrade_setup in postgresql-setup