commit lxc for openSUSE:Factory
Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2018-09-26 14:24:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxc (Old) and /work/SRC/openSUSE:Factory/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxc" Wed Sep 26 14:24:09 2018 rev:81 rq:638264 version:2.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2018-09-17 14:26:32.443777411 +0200 +++ /work/SRC/openSUSE:Factory/.lxc.new/lxc.changes 2018-09-26 14:24:35.273810535 +0200 @@ -1,0 +2,7 @@ +Sat Sep 15 19:36:52 UTC 2018 - Johannes Kastl <kastl@b1-systems.de> + +- fix for bsc#988348 (lxc: enable setuid bit on lxc-user-nic) + - do not remove setuid bit for lxc-user-nic on releases with suse_version >=1550 + - remove setuid stuff from README.SUSE on releases with suse_version >=1550 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.zxZ5Ff/_old 2018-09-26 14:24:35.949809461 +0200 +++ /var/tmp/diff_new_pack.zxZ5Ff/_new 2018-09-26 14:24:35.949809461 +0200 @@ -85,6 +85,7 @@ separate kernel. %package -n liblxc%{shlib_version} +PreReq: permissions Summary: LXC container runtime library License: LGPL-2.1 Group: System/Libraries @@ -123,6 +124,10 @@ --with-systemdsystemunitdir=%{_unitdir} make %{?_smp_mflags} cp %{SOURCE4} . +# remove lxc-user-nic from README as it is not longer necessary in Tumbleweed +%if 0%{?suse_version} >= 1550 +sed -i '/=== lxc-user-nic ===/,+4d' ./README.SUSE +%endif cp %{SOURCE5} . rm -rf .doc mkdir -p .doc/examples @@ -132,7 +137,9 @@ %make_install install -d -m 755 %{buildroot}/var/lib/lxc find %buildroot -type f -name '*.la' -delete +%if 0%{?suse_version} <= 1550 chmod u-s %{buildroot}/%{_libexecdir}/%{name}/lxc-user-nic +%endif ./config.status --file=%{buildroot}%{_bindir}/lxc-createconfig:%{S:3} chmod a+x %{buildroot}%{_bindir}/lxc-createconfig ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rclxc @@ -158,9 +165,15 @@ %postun %service_del_postun lxc@.service lxc.service lxc-net.service -%post -n liblxc%{shlib_version} -p /sbin/ldconfig +%post -n liblxc%{shlib_version} +/sbin/ldconfig +%set_permissions /usr/lib/lxc/lxc-user-nic + %postun -n liblxc%{shlib_version} -p /sbin/ldconfig +%verifyscript -n liblxc%{shlib_version} +%verify_permissions -e /usr/lib/lxc/lxc-user-nic + %files %defattr(-,root,root) %doc README doc/FAQ.txt @@ -218,7 +231,7 @@ %config %{_sysconfdir}/apparmor.d/usr.bin.lxc-start %{_libexecdir}/%{name}/lxc-apparmor-load %{_libexecdir}/%{name}/lxc-monitord -%{_libexecdir}/%{name}/lxc-user-nic +%attr(-,root,kvm)%{_libexecdir}/%{name}/lxc-user-nic %files -n liblxc-devel %defattr(-,root,root)
participants (1)
-
root