From 64d802bbdefee4b43489a9ed09bc99b61807d0fb Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Sat, 20 Mar 2021 17:42:20 +0800 Subject: [PATCH] Enable Full RELRO --- xorg-x11-server.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 14a4c8c..d03df87 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -16,7 +16,7 @@ Name: xorg-x11-server Version: 1.20.10 -Release: 1 +Release: 2 Summary: X.Org X11 X server License: MIT and GPLv2 URL: https://www.x.org @@ -102,7 +102,7 @@ Requires: pixman >= 0.30.0 xkeyboard-config xkbcomp Requires: system-setup-keyboard xorg-x11-drv-libinput libEGL Requires: xorg-x11-xauth -Obsoletes: %{name}-common < %{version}-%{release} %{name}-Xorg < %{version}-%{release} %{name}-Xnest < %{version}-%{release} %{name}-source %{name}-Xdmx < %{version}-%{release} %{name}-Xvfb < %{version}-%{release} %{name}-Xwayland < %{version}-%{release} +Obsoletes: %{name}-common < %{version}-%{release} %{name}-Xorg < %{version}-%{release} %{name}-Xnest < %{version}-%{release} %{name}-source < %{version}-%{release} %{name}-Xdmx < %{version}-%{release} %{name}-Xvfb < %{version}-%{release} %{name}-Xwayland < %{version}-%{release} Provides: %{name}-common = %{version}-%{release} %{name}-Xorg = %{version}-%{release} %{name}-Xorg%{?_isa} = %{version}-%{release} %{name}-Xnest = %{version}-%{release} %{name}-source = %{version}-%{release} %{name}-Xdmx = %{version}-%{release} %{name}-Xvfb = %{version}-%{release} %{name}-Xwayland = %{version}-%{release} %{name}-Xwayland%{?_isa} = %{version}-%{release} Provides: Xorg = %{version}-%{release} @@ -187,7 +187,7 @@ test `getminor extension` == %{extension_minor} %build -export LDFLAGS="$RPM_LD_FLAGS -specs=/usr/lib/rpm/%{_vendor}/%{_vendor}-hardened-ld" +export LDFLAGS="$RPM_LD_FLAGS -Wl,-z,now -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" @@ -320,6 +320,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %{_libdir}/xorg/protocol.txt %changelog +* Sat Mar 20 2021 Dehui Fan - 1.20.10-2 +- Enable Full RELRO + * Sat Jan 30 2021 jinzhimin - 1.20.10-1 - Upgrade to 1.20.10 -- Gitee