From 822e5bb994405dfa3e79f57693b231615e4b4deb49194f11cbccd718d75ca2f6 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Tue, 16 Jun 2020 09:26:34 +0000 Subject: [PATCH] Accepting request 814848 from home:jsegitz:branches:security:SELinux - Disabled LTO again. This breaks e.g. shadow and also other packages in security:SELinux - Disabled LTO again. This breaks e.g. shadow and also other packages in security:SELinux OBS-URL: https://build.opensuse.org/request/show/814848 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libsemanage?expand=0&rev=83 --- libsemanage.changes | 6 ++++++ libsemanage.spec | 9 +++++---- python-semanage.changes | 6 ++++++ python-semanage.spec | 5 +++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/libsemanage.changes b/libsemanage.changes index 36fce4c..07afb42 100644 --- a/libsemanage.changes +++ b/libsemanage.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 16 07:08:59 UTC 2020 - Johannes Segitz + +- Disabled LTO again. This breaks e.g. shadow and also other packages + in security:SELinux + ------------------------------------------------------------------- Fri Jun 12 09:07:31 UTC 2020 - Pedro Monreal Gonzalez diff --git a/libsemanage.spec b/libsemanage.spec index cb56a99..f736440 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -27,7 +27,8 @@ Source: https://github.com/SELinuxProject/selinux/releases/download/2019 Source1: baselibs.conf Source2: semanage.conf # PATCH-FIX-UPSTREAM bsc#1133102 LTO: Update map file to include new symbols and remove wildcards -Patch0: libsemanage-update-map-file.patch +# For now we need to disable this. This breaks e.g. shadow and also other packages in security:SELinux +#Patch0: libsemanage-update-map-file.patch BuildRequires: audit-devel BuildRequires: bison BuildRequires: fdupes @@ -92,14 +93,14 @@ stores must be migrated before any commands that modify or use the store %prep %setup -q -%patch0 -p2 # Replace /usr/libexec with whatever the distro defines as libexecdir - across all files grep /usr/libexec . -rl | xargs sed -i "s|/usr/libexec|%{_libexecdir}|g" %build +%define _lto_cflags %{nil} make %{?_smp_mflags} clean -make -j1 CFLAGS="%{optflags} -ffat-lto-objects" CC="gcc" -make -j1 CFLAGS="%{optflags} -ffat-lto-objects" LIBDIR="%{_libdir}" LIBEXECDIR="%{_libexecdir}" SHLIBDIR="%{_lib}" CC="gcc" all +make -j1 CFLAGS="%{optflags}" CC="gcc" +make -j1 CFLAGS="%{optflags}" LIBDIR="%{_libdir}" LIBEXECDIR="%{_libexecdir}" SHLIBDIR="%{_lib}" CC="gcc" all %install mkdir -p %{buildroot}/%{_lib} diff --git a/python-semanage.changes b/python-semanage.changes index 892ba80..f3fca2a 100644 --- a/python-semanage.changes +++ b/python-semanage.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 16 07:08:59 UTC 2020 - Johannes Segitz + +- Disabled LTO again. This breaks e.g. shadow and also other packages + in security:SELinux + ------------------------------------------------------------------- Fri Jun 12 09:07:31 UTC 2020 - Pedro Monreal Gonzalez diff --git a/python-semanage.spec b/python-semanage.spec index fac8297..de3d649 100644 --- a/python-semanage.spec +++ b/python-semanage.spec @@ -27,7 +27,8 @@ URL: https://github.com/SELinuxProject/selinux Source: https://github.com/SELinuxProject/selinux/releases/download/20191204/libsemanage-%{version}.tar.gz Source1: baselibs.conf # PATCH-FIX-UPSTREAM bsc#1133102 LTO: Update map file to include new symbols and remove wildcards -Patch0: libsemanage-update-map-file.patch +# For now we need to disable this. This breaks e.g. shadow and also other packages in security:SELinux +# Patch0: libsemanage-update-map-file.patch BuildRequires: %{python_module devel} BuildRequires: audit-devel BuildRequires: bison @@ -48,11 +49,11 @@ SELinux policy management applications. %prep %setup -q -n libsemanage-%{version} -%patch0 -p2 # Replace /usr/libexec with whatever the distro defines as libexecdir - across all files grep /usr/libexec . -rl | xargs sed -i "s|/usr/libexec|%{_libexecdir}|g" %build +%define _lto_cflags %{nil} make %{?_smp_mflags} clean %{python_expand # loop over possible pythons make -j1 PYTHON=$python CFLAGS="%{optflags}" swigify