From e5d4c1a8276e66096956b08aff98cce26cb4eeef Mon Sep 17 00:00:00 2001 From: linker Date: Thu, 29 Apr 2021 15:55:41 +0800 Subject: [PATCH 1/2] Compilationoptimization --- xorg-x11-server.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 9bfd9bc..7771850 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -16,7 +16,7 @@ Name: xorg-x11-server Version: 1.20.8 -Release: 4 +Release: 5 Summary: X.Org X11 X server License: MIT and GPLv2 URL: https://www.x.org @@ -194,9 +194,9 @@ test `getminor extension` == %{extension_minor} %build -export LDFLAGS="$RPM_LD_FLAGS -specs=/usr/lib/rpm/%{_vendor}/%{_vendor}-hardened-ld" -export CXXFLAGS="$RPM_OPT_FLAGS -specs=/usr/lib/rpm/%{_vendor}/%{_vendor}-hardened-cc1" -export CFLAGS="$RPM_OPT_FLAGS -specs=/usr/lib/rpm/%{_vendor}/%{_vendor}-hardened-cc1" +export LDFLAGS="$RPM_LD_FLAGS -specs=/usr/lib/rpm/generic-hardened-ld" +export CXXFLAGS="$RPM_OPT_FLAGS -specs=/usr/lib/rpm/generic-hardened-cc1" +export CFLAGS="$RPM_OPT_FLAGS -specs=/usr/lib/rpm/generic-hardened-cc1" %ifnarch %{ix86} x86_64 %global no_int10 --disable-vbe --disable-int10-module @@ -327,6 +327,11 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %{_libdir}/xorg/protocol.txt %changelog +* Thu Apr 29 2021 wangkerong - 1.20.8-5 +- Type:BugFix +- Id:NA +- SUG:Compilation optimization + * Mon Feb 01 2020 yeah_wang - 1.20.8-4 - Type:CVE - Id:CVE-2020-14347 CVE-2020-14360 CVE-2020-25712 -- Gitee From 544859c09b1a8fdb3466bc58b2b0cf6d3fc4c57d Mon Sep 17 00:00:00 2001 From: linker Date: Thu, 29 Apr 2021 16:27:48 +0800 Subject: [PATCH 2/2] change to changelog --- xorg-x11-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 7771850..dfec021 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -332,7 +332,7 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete - Id:NA - SUG:Compilation optimization -* Mon Feb 01 2020 yeah_wang - 1.20.8-4 +* Mon Feb 01 2021 yeah_wang - 1.20.8-4 - Type:CVE - Id:CVE-2020-14347 CVE-2020-14360 CVE-2020-25712 - SUG:NA -- Gitee