diff --git a/libselinux-2.6.tar.gz b/libselinux-2.6.tar.gz deleted file mode 100644 index 7602e2b..0000000 --- a/libselinux-2.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a -size 203119 diff --git a/libselinux-2.8.tar.gz b/libselinux-2.8.tar.gz new file mode 100644 index 0000000..8bfdf6e --- /dev/null +++ b/libselinux-2.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31db96ec7643ce10912b3c3f98506a08a9116dcfe151855fd349c3fda96187e1 +size 187759 diff --git a/libselinux-bindings.changes b/libselinux-bindings.changes index e23b0dc..3838865 100644 --- a/libselinux-bindings.changes +++ b/libselinux-bindings.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Oct 17 11:48:30 UTC 2018 - jsegitz@suse.com + +- Update to version 2.8 (bsc#1111732) + +------------------------------------------------------------------- +Mon May 14 22:50:42 UTC 2018 - mcepl@cepl.eu + +- Update to version 2.7. + * %files needed to be heavily modified + * Based expressly on python3, not just python + ------------------------------------------------------------------- Fri Mar 16 15:25:10 UTC 2018 - jsegitz@suse.com diff --git a/libselinux-bindings.spec b/libselinux-bindings.spec index 29a2990..30b992c 100644 --- a/libselinux-bindings.spec +++ b/libselinux-bindings.spec @@ -18,23 +18,23 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define libsepol_ver 2.6 +%define libsepol_ver 2.8 Name: libselinux-bindings -Version: 2.6 +Version: 2.8 Release: 0 Summary: SELinux runtime library and simple utilities -License: GPL-2.0 and SUSE-Public-Domain +License: GPL-2.0-only AND SUSE-Public-Domain Group: Development/Libraries/C and C++ Url: https://github.com/SELinuxProject/selinux/wiki/Releases # embedded is the MD5 -Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014/libselinux-%{version}.tar.gz +Source: https://github.com/SELinuxProject/selinux/archive/libselinux-%{version}.tar.gz Source1: selinux-ready Source2: baselibs.conf +Patch3: python3.patch # PATCH-FIX-UPSTREAM Include for readv prototype Patch4: readv-proto.patch -Patch5: python3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libsepol-devel-static >= %{libsepol_ver} BuildRequires: pcre-devel @@ -82,25 +82,31 @@ language. %prep %setup -q -n libselinux-%{version} +%patch3 -p1 %patch4 -p1 -%patch5 -p1 %build -make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src -make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src swigify -make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" PYTHON=/usr/bin/python3 -C src pywrap -make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src rubywrap +make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src V=1 +make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src swigify V=1 +make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src pywrap V=1 +make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src rubywrap V=1 %install -make DESTDIR="$RPM_BUILD_ROOT" LIBDIR="$RPM_BUILD_ROOT%{_libdir}" SHLIBDIR="$RPM_BUILD_ROOT/%{_lib}" -C src install -make DESTDIR="$RPM_BUILD_ROOT" LIBDIR="$RPM_BUILD_ROOT%{_libdir}" SHLIBDIR="$RPM_BUILD_ROOT/%{_lib}" -C src install-pywrap -make DESTDIR="$RPM_BUILD_ROOT" LIBDIR="$RPM_BUILD_ROOT%{_libdir}" SHLIBDIR="$RPM_BUILD_ROOT/%{_lib}" -C src install-rubywrap -rm -rf $RPM_BUILD_ROOT/%{_lib} $RPM_BUILD_ROOT%{_libdir}/libselinux.* $RPM_BUILD_ROOT%{_libdir}/pkgconfig +make DESTDIR="$RPM_BUILD_ROOT" LIBDIR="%{_libdir}" \ + SHLIBDIR="/%{_lib}" LIBSEPOLA=%{_libdir}/libsepol.a \ + -C src install V=1 +make DESTDIR="$RPM_BUILD_ROOT" LIBDIR="%{_libdir}" \ + SHLIBDIR="/%{_lib}" LIBSEPOLA=%{_libdir}/libsepol.a \ + -C src install-pywrap V=1 +make DESTDIR="$RPM_BUILD_ROOT" LIBDIR="%{_libdir}" \ + SHLIBDIR="/%{_lib}" LIBSEPOLA=%{_libdir}/libsepol.a \ + -C src install-rubywrap V=1 +rm -rf $RPM_BUILD_ROOT/%{_lib} $RPM_BUILD_ROOT%{_libdir}/libselinux.* \ + $RPM_BUILD_ROOT%{_libdir}/pkgconfig %files -n python3-selinux %defattr(-,root,root,-) -%{python3_sitearch}/selinux/ -%{python3_sitearch}/_selinux.so +%{python3_sitearch}/*selinux* %files -n ruby-selinux %defattr(-,root,root,-) diff --git a/libselinux.changes b/libselinux.changes index fdc217a..3711232 100644 --- a/libselinux.changes +++ b/libselinux.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Oct 17 11:48:30 UTC 2018 - jsegitz@suse.com + +- Update to version 2.8 (bsc#1111732) + +------------------------------------------------------------------- +Mon May 14 22:45:54 UTC 2018 - mcepl@cepl.eu + +- Update to version 2.7. + * %files needed to be heavily modified + * Based expressly on python3, not just python + ------------------------------------------------------------------- Fri Nov 24 09:09:02 UTC 2017 - jsegitz@suse.com diff --git a/libselinux.spec b/libselinux.spec index 08a338e..ef10510 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -16,19 +16,20 @@ # -%define libsepol_ver 2.6 +%define libsepol_ver 2.8 Name: libselinux -Version: 2.6 +Version: 2.8 Release: 0 Summary: SELinux runtime library and utilities -License: GPL-2.0 and SUSE-Public-Domain +License: GPL-2.0-only AND SUSE-Public-Domain Group: Development/Libraries/C and C++ Url: https://github.com/SELinuxProject/selinux/wiki/Releases -Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014/%{name}-%{version}.tar.gz +Source: https://github.com/SELinuxProject/selinux/archive/libselinux-%{version}.tar.gz Source1: selinux-ready Source2: baselibs.conf +Patch3: python3.patch # PATCH-FIX-UPSTREAM Include for readv prototype Patch4: readv-proto.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,6 +37,7 @@ BuildRequires: fdupes BuildRequires: libsepol-devel >= %{libsepol_ver} BuildRequires: pcre-devel BuildRequires: pkg-config +BuildRequires: python3 %description libselinux provides an interface to get and set process and file @@ -97,6 +99,7 @@ necessary to develop your own software using libselinux. %prep %setup -q +%patch3 -p1 %patch4 -p1 %build @@ -107,7 +110,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_lib} mkdir -p $RPM_BUILD_ROOT%{_libdir} mkdir -p $RPM_BUILD_ROOT%{_includedir} mkdir -p $RPM_BUILD_ROOT%{_sbindir} -make DESTDIR="$RPM_BUILD_ROOT" LIBDIR="$RPM_BUILD_ROOT%{_libdir}" SHLIBDIR="$RPM_BUILD_ROOT/%{_lib}" BINDIR="$RPM_BUILD_ROOT%{_sbindir}" install +make DESTDIR="$RPM_BUILD_ROOT" LIBDIR="%{_libdir}" SHLIBDIR="/%{_lib}" BINDIR="%{_sbindir}" install rm -f $RPM_BUILD_ROOT%{_sbindir}/compute_* rm -f $RPM_BUILD_ROOT%{_sbindir}/deftype rm -f $RPM_BUILD_ROOT%{_sbindir}/execcon @@ -139,6 +142,7 @@ install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/selinux-ready %{_sbindir}/matchpathcon %{_sbindir}/selabel_digest %{_sbindir}/selabel_lookup +%{_sbindir}/selinux_check_access %{_sbindir}/selabel_lookup_best_match %{_sbindir}/selabel_partial_match %{_sbindir}/selinuxconlist @@ -146,7 +150,7 @@ install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/selinux-ready %{_sbindir}/selinuxenabled %{_sbindir}/setenforce %{_sbindir}/togglesebool -%{_sbindir}/selinux_restorecon +#%#{_sbindir}/selinux_restorecon %{_sbindir}/selinux-ready %{_sbindir}/selinuxexeccon %{_sbindir}/sefcontext_compile diff --git a/python3.patch b/python3.patch index ae023b5..58a2136 100644 --- a/python3.patch +++ b/python3.patch @@ -1,13 +1,13 @@ -Index: libselinux-2.6/src/Makefile +Index: libselinux-2.7/src/Makefile =================================================================== ---- libselinux-2.6.orig/src/Makefile 2016-10-14 17:31:26.000000000 +0200 -+++ libselinux-2.6/src/Makefile 2018-03-22 11:33:36.527385495 +0100 +--- libselinux-2.7.orig/src/Makefile ++++ libselinux-2.7/src/Makefile @@ -1,7 +1,7 @@ # Support building the Python bindings multiple times, against various Python # runtimes (e.g. Python 2 vs Python 3) by optionally prefixing the build # targets with "PYPREFIX": -PYTHON ?= python +PYTHON ?= python3 - PYPREFIX ?= $(notdir $(PYTHON)) + PYPREFIX ?= $(shell $(PYTHON) -c 'import sys;print("python-%d.%d" % sys.version_info[:2])') RUBY ?= ruby RUBYPREFIX ?= $(notdir $(RUBY))