Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package microos-tools for openSUSE:Factory checked in at 2021-06-21 20:34:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/microos-tools (Old) and /work/SRC/openSUSE:Factory/.microos-tools.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "microos-tools" Mon Jun 21 20:34:50 2021 rev:16 rq:900527 version:2.11 Changes: -------- --- /work/SRC/openSUSE:Factory/microos-tools/microos-tools.changes 2021-05-12 19:32:05.391071721 +0200 +++ /work/SRC/openSUSE:Factory/.microos-tools.new.2625/microos-tools.changes 2021-06-21 20:34:52.530574848 +0200 @@ -1,0 +2,6 @@ +Thu Jun 16 17:04:59 UTC 2021 - Ignaz Forster <ifors...@suse.com> + +- Update to version 2.11 + - Fix unwritable /var / /etc after SELinux relabel [bsc#1186563] + +------------------------------------------------------------------- Old: ---- microos-tools-2.10.tar.xz New: ---- microos-tools-2.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ microos-tools.spec ++++++ --- /var/tmp/diff_new_pack.e7FCCM/_old 2021-06-21 20:34:52.950575244 +0200 +++ /var/tmp/diff_new_pack.e7FCCM/_new 2021-06-21 20:34:52.954575248 +0200 @@ -17,7 +17,7 @@ Name: microos-tools -Version: 2.10 +Version: 2.11 Release: 0 Summary: Files and Scripts for openSUSE MicroOS License: GPL-2.0-or-later ++++++ microos-tools-2.10.tar.xz -> microos-tools-2.11.tar.xz ++++++ ++++ 1998 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/microos-tools-2.10/NEWS new/microos-tools-2.11/NEWS --- old/microos-tools-2.10/NEWS 2021-05-10 09:51:35.000000000 +0200 +++ new/microos-tools-2.11/NEWS 2021-06-16 21:36:24.000000000 +0200 @@ -1,3 +1,6 @@ +Version 2.11 +- Fix unwritable /var / /etc after SELinux relabel [bsc#1186563] + Version 2.10 - Fixes and improvements for SELinux support - Add devel tools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/microos-tools-2.10/compile new/microos-tools-2.11/compile --- old/microos-tools-2.10/compile 2021-05-10 09:51:54.000000000 +0200 +++ new/microos-tools-2.11/compile 2021-05-27 19:02:45.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -340,7 +340,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/microos-tools-2.10/configure.ac new/microos-tools-2.11/configure.ac --- old/microos-tools-2.10/configure.ac 2021-05-10 09:51:04.000000000 +0200 +++ new/microos-tools-2.11/configure.ac 2021-06-16 21:36:24.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(microos-tools, 2.10) +AC_INIT(microos-tools, 2.11) AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/microos-tools-2.10/missing new/microos-tools-2.11/missing --- old/microos-tools-2.10/missing 2021-05-10 09:51:54.000000000 +0200 +++ new/microos-tools-2.11/missing 2021-05-27 19:02:45.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/microos-tools-2.10/selinux/98selinux-microos/selinux-microos-relabel.sh new/microos-tools-2.11/selinux/98selinux-microos/selinux-microos-relabel.sh --- old/microos-tools-2.10/selinux/98selinux-microos/selinux-microos-relabel.sh 2021-05-10 09:50:43.000000000 +0200 +++ new/microos-tools-2.11/selinux/98selinux-microos/selinux-microos-relabel.sh 2021-06-16 21:35:46.000000000 +0200 @@ -40,11 +40,15 @@ if [ $ret -eq 0 ]; then #LANG=C /usr/sbin/setenforce 0 info "SELinux: mount root read-write and relabel" - mount -o remount,rw "$NEWROOT" + # Use alternate mount point to prevent overwriting subvolume options (bsc#1186563) + ROOT_SELINUX="${NEWROOT}-selinux" + mkdir -p "${ROOT_SELINUX}" + mount --rbind --make-rslave "${NEWROOT}" "${ROOT_SELINUX}" + mount -o remount,rw "${ROOT_SELINUX}" FORCE= - [ -e "$NEWROOT"/etc/selinux/.autorelabel ] && FORCE="$(cat "$NEWROOT"/etc/selinux/.autorelabel)" - LANG=C chroot "$NEWROOT" /sbin/restorecon $FORCE -R -e /var/lib/overlay -e /sys -e /dev -e /run / - mount -o remount,ro "$NEWROOT" + [ -e "${ROOT_SELINUX}"/etc/selinux/.autorelabel ] && FORCE="$(cat "${ROOT_SELINUX}"/etc/selinux/.autorelabel)" + LANG=C chroot "${ROOT_SELINUX}" /sbin/restorecon $FORCE -R -e /var/lib/overlay -e /sys -e /dev -e /run / + umount -R "${ROOT_SELINUX}" fi fi for sysdir in /proc /sys /dev; do
