Hello community,
here is the log from the commit of package libselinux for openSUSE:Factory
checked in at 2020-06-05 20:04:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libselinux (Old)
and /work/SRC/openSUSE:Factory/.libselinux.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libselinux"
Fri Jun 5 20:04:37 2020 rev:61 rq:810880 version:3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libselinux/libselinux.changes 2020-03-11
18:31:20.706861808 +0100
+++ /work/SRC/openSUSE:Factory/.libselinux.new.3606/libselinux.changes
2020-06-05 20:08:29.885403395 +0200
@@ -1,0 +2,6 @@
+Thu Mar 26 15:43:41 UTC 2020 - Johannes Segitz <jseg...@suse.de>
+
+- Added skip_cycles.patch to skip directory cycles and not error
+ out
+
+-------------------------------------------------------------------
New:
----
skip_cycles.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libselinux-bindings.spec ++++++
--- /var/tmp/diff_new_pack.3fnrpa/_old 2020-06-05 20:08:34.001417121 +0200
+++ /var/tmp/diff_new_pack.3fnrpa/_new 2020-06-05 20:08:34.005417134 +0200
@@ -89,17 +89,10 @@
make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="%{optflags}" -C src rubywrap
V=1
%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 \
- -C src install-pywrap 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
+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 -C src install-pywrap 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
%files -n python3-selinux
%{python3_sitearch}/*selinux*
++++++ libselinux.spec ++++++
--- /var/tmp/diff_new_pack.3fnrpa/_old 2020-06-05 20:08:34.021417188 +0200
+++ /var/tmp/diff_new_pack.3fnrpa/_new 2020-06-05 20:08:34.025417201 +0200
@@ -29,6 +29,7 @@
Source2: baselibs.conf
# PATCH-FIX-UPSTREAM Include <sys/uio.h> for readv prototype
Patch4: readv-proto.patch
+Patch5: skip_cycles.patch
BuildRequires: fdupes
BuildRequires: libsepol-devel >= %{libsepol_ver}
BuildRequires: pcre-devel
@@ -95,6 +96,7 @@
%prep
%setup -q
%patch4 -p1
+%patch5 -p1
%build
%define _lto_cflags %{nil}
@@ -106,21 +108,6 @@
mkdir -p %{buildroot}%{_includedir}
mkdir -p %{buildroot}%{_sbindir}
make DESTDIR=%{buildroot} LIBDIR="%{_libdir}" SHLIBDIR="/%{_lib}"
BINDIR="%{_sbindir}" install
-rm -f %{buildroot}%{_sbindir}/compute_*
-rm -f %{buildroot}%{_sbindir}/deftype
-rm -f %{buildroot}%{_sbindir}/execcon
-rm -f %{buildroot}%{_sbindir}/getenforcemode
-rm -f %{buildroot}%{_sbindir}/getfilecon
-rm -f %{buildroot}%{_sbindir}/getpidcon
-rm -f %{buildroot}%{_sbindir}/mkdircon
-rm -f %{buildroot}%{_sbindir}/policyvers
-rm -f %{buildroot}%{_sbindir}/setfilecon
-rm -f %{buildroot}%{_sbindir}/selinuxconfig
-rm -f %{buildroot}%{_sbindir}/selinuxdisable
-rm -f %{buildroot}%{_sbindir}/getseuser
-rm -f %{buildroot}%{_sbindir}/selinux_check_securetty_context
-rm -f %{buildroot}%{_sbindir}/selabel_get_digests_all_partial_matches
-rm -f %{buildroot}%{_sbindir}/validatetrans
mv %{buildroot}%{_sbindir}/getdefaultcon %{buildroot}%{_sbindir}/selinuxdefcon
mv %{buildroot}%{_sbindir}/getconlist %{buildroot}%{_sbindir}/selinuxconlist
install -m 0755 %{SOURCE1} %{buildroot}%{_sbindir}/selinux-ready
@@ -145,10 +132,18 @@
%{_sbindir}/selinuxenabled
%{_sbindir}/setenforce
%{_sbindir}/togglesebool
-#%#{_sbindir}/selinux_restorecon
%{_sbindir}/selinux-ready
%{_sbindir}/selinuxexeccon
%{_sbindir}/sefcontext_compile
+%{_sbindir}/compute_*
+%{_sbindir}/getfilecon
+%{_sbindir}/getpidcon
+%{_sbindir}/policyvers
+%{_sbindir}/setfilecon
+%{_sbindir}/getseuser
+%{_sbindir}/selinux_check_securetty_context
+%{_sbindir}/selabel_get_digests_all_partial_matches
+%{_sbindir}/validatetrans
%{_mandir}/man5/*
%{_mandir}/ru/man5/*
%{_mandir}/man8/*
++++++ skip_cycles.patch ++++++
Index: libselinux-3.0/src/selinux_restorecon.c
===================================================================
--- libselinux-3.0.orig/src/selinux_restorecon.c
+++ libselinux-3.0/src/selinux_restorecon.c
@@ -991,9 +991,8 @@ int selinux_restorecon(const char *pathn
selinux_log(SELINUX_ERROR,
"Directory cycle on %s.\n",
ftsent->fts_path);
- errno = ELOOP;
- error = -1;
- goto out;
+ fts_set(fts, ftsent, FTS_SKIP);
+ continue;
case FTS_DP:
continue;
case FTS_DNR:
