pool/libselinux
SHA256
2
0
Fork 3
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 879710 from home:dimstar:Factory

Browse Source 
- Switch to pcre2:
  + Replace pcre-devel BuildRequires with pkgconfig(libpcre2-8)
  + Pass USE_PCRE2=y to make.

As we have currently pcre2 AND pcre in the distro bootstrap, I'm trying to clean that up a little bit

Thie will hopefully allow to keep pcre2, but get rid of pcre - making the bootstrap cycle a little bit smaller
(Requires a Preinstall: libprcre2-8-0 in prjconf, which should replace the existing preinstall libpcre0 we already have)

OBS-URL: https://build.opensuse.org/request/show/879710
OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=133
This commit is contained in:
Johannes Segitz 2021-03-18 10:08:18 +00:00 committed by Git OBS Bridge
parent 1d19f598e4
commit 04bc1b7bdc
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libselinux-bindings.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Mar 17 15:17:27 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Switch to pcre2:
+ Replace pcre-devel BuildRequires with pkgconfig(libpcre2-8)
+ Pass USE_PCRE2=y to make.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 9 09:01:15 UTC 2021 - Johannes Segitz <jsegitz@suse.com> Tue Mar 9 09:01:15 UTC 2021 - Johannes Segitz <jsegitz@suse.com>

14
libselinux-bindings.spec
View File

@ -36,11 +36,11 @@ Patch4: readv-proto.patch
Patch5: python3.8-compat.patch Patch5: python3.8-compat.patch
Patch6: swig4_moduleimport.patch Patch6: swig4_moduleimport.patch
BuildRequires: libsepol-devel-static >= %{libsepol_ver} BuildRequires: libsepol-devel-static >= %{libsepol_ver}
BuildRequires: pcre-devel
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: ruby-devel BuildRequires: ruby-devel
BuildRequires: swig BuildRequires: swig
BuildRequires: pkgconfig(libpcre2-8)
%description %description
libselinux provides an interface to get and set process and file libselinux provides an interface to get and set process and file
@ -83,15 +83,13 @@ language.
%build %build
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fno-semantic-interposition" -C src V=1 make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fno-semantic-interposition" swigify V=1 USE_PCRE2=y
make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fno-semantic-interposition" -C src swigify V=1 make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fno-semantic-interposition" pywrap V=1 USE_PCRE2=y
make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fno-semantic-interposition" -C src pywrap V=1 make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fno-semantic-interposition" rubywrap V=1 USE_PCRE2=y
make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fno-semantic-interposition" -C src rubywrap V=1
%install %install
make DESTDIR=%{buildroot} LIBDIR="%{_libdir}" SHLIBDIR="/%{_lib}" LIBSEPOLA=%{_libdir}/libsepol.a -C src install V=1 make DESTDIR=%{buildroot} LIBDIR="%{_libdir}" SHLIBDIR="/%{_lib}" LIBSEPOLA=%{_libdir}/libsepol.a install-pywrap V=1
make DESTDIR=%{buildroot} LIBDIR="%{_libdir}" SHLIBDIR="/%{_lib}" LIBSEPOLA=%{_libdir}/libsepol.a -C src install-pywrap V=1 make DESTDIR=%{buildroot} LIBDIR="%{_libdir}" SHLIBDIR="/%{_lib}" LIBSEPOLA=%{_libdir}/libsepol.a install-rubywrap V=1
make DESTDIR=%{buildroot} LIBDIR="%{_libdir}" SHLIBDIR="/%{_lib}" LIBSEPOLA=%{_libdir}/libsepol.a -C src install-rubywrap V=1
rm -rf %{buildroot}/%{_lib} %{buildroot}%{_libdir}/libselinux.* %{buildroot}%{_libdir}/pkgconfig rm -rf %{buildroot}/%{_lib} %{buildroot}%{_libdir}/libselinux.* %{buildroot}%{_libdir}/pkgconfig
%files -n python3-selinux %files -n python3-selinux

11
libselinux.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Mar 17 15:13:16 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Switch to pcre2:
+ Replace pcre-devel BuildRequires with pkgconfig(libpcre2-8)
+ Pass USE_PCRE2=y to make.
+ Replace pkgconfig(libpcre) Requires in -devel static with
pkgconfig(libpcre2-8).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 9 09:01:15 UTC 2021 - Johannes Segitz <jsegitz@suse.com> Tue Mar 9 09:01:15 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
@ -6,7 +15,7 @@ Tue Mar 9 09:01:15 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
See "KERNEL STATUS PAGE" section in avc_init(3) for more details. See "KERNEL STATUS PAGE" section in avc_init(3) for more details.
* New log callback levels for enforcing and policy load notices - * New log callback levels for enforcing and policy load notices -
SELINUX_POLICYLOAD, SELINUX_SETENFORCE SELINUX_POLICYLOAD, SELINUX_SETENFORCE
* Changed userspace AVC setenforce and policy load messages to audit * Changed userspace AVC setenforce and policy load messages to audit
format. format.
------------------------------------------------------------------- -------------------------------------------------------------------

6
libselinux.spec
View File

@ -32,8 +32,8 @@ Patch4: readv-proto.patch
Patch5: skip_cycles.patch Patch5: skip_cycles.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: libsepol-devel >= %{libsepol_ver} BuildRequires: libsepol-devel >= %{libsepol_ver}
BuildRequires: pcre-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: pkgconfig(libpcre2-8)
%description %description
libselinux provides an interface to get and set process and file libselinux provides an interface to get and set process and file
@ -84,7 +84,7 @@ necessary to develop your own software using libselinux.
Summary: Static archives for the SELinux runtime Summary: Static archives for the SELinux runtime
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libselinux-devel = %{version} Requires: libselinux-devel = %{version}
Requires: pkgconfig(libpcre) Requires: pkgconfig(libpcre2-8)
Requires: pkgconfig(libsepol) Requires: pkgconfig(libsepol)
%description devel-static %description devel-static
@ -101,7 +101,7 @@ necessary to develop your own software using libselinux.
%build %build
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
make %{?_smp_mflags} LIBDIR="%{_libdir}" CC="gcc" CFLAGS="%{optflags} -fno-semantic-interposition" make %{?_smp_mflags} LIBDIR="%{_libdir}" CC="gcc" CFLAGS="%{optflags} -fno-semantic-interposition" USE_PCRE2=y
%install %install
mkdir -p %{buildroot}/%{_lib} mkdir -p %{buildroot}/%{_lib}