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 2023-03-22 22:29:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/microos-tools (Old)
and /work/SRC/openSUSE:Factory/.microos-tools.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "microos-tools"
Wed Mar 22 22:29:16 2023 rev:26 rq:1072387 version:2.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/microos-tools/microos-tools.changes
2023-03-14 18:15:32.703379133 +0100
+++ /work/SRC/openSUSE:Factory/.microos-tools.new.31432/microos-tools.changes
2023-03-22 22:29:22.065808513 +0100
@@ -1,0 +2,6 @@
+Thu Mar 16 12:06:36 UTC 2023 - Fabian Vogt <fv...@suse.com>
+
+- Update to version 2.20:
+ - 98selinux-microos: don't load the policy to label the system
+
+-------------------------------------------------------------------
Old:
----
microos-tools-2.19.tar.xz
New:
----
microos-tools-2.20.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ microos-tools.spec ++++++
--- /var/tmp/diff_new_pack.0SMvG2/_old 2023-03-22 22:29:22.713811774 +0100
+++ /var/tmp/diff_new_pack.0SMvG2/_new 2023-03-22 22:29:22.717811794 +0100
@@ -19,7 +19,7 @@
%{!?_distconfdir: %global _distconfdir %{_prefix}%{_sysconfdir}}
Name: microos-tools
-Version: 2.19
+Version: 2.20
Release: 0
Summary: Files and Scripts for openSUSE MicroOS
License: GPL-2.0-or-later
++++++ microos-tools-2.19.tar.xz -> microos-tools-2.20.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-2.19/NEWS new/microos-tools-2.20/NEWS
--- old/microos-tools-2.19/NEWS 2023-03-14 11:00:50.000000000 +0100
+++ new/microos-tools-2.20/NEWS 2023-03-16 13:02:46.000000000 +0100
@@ -1,3 +1,6 @@
+Version 2.20:
+- 98selinux-microos: Don't load the policy to label the system
+
Version 2.19:
- Clean up selinux-autorelabel-generator and make it compatible with systemd
253
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-2.19/configure
new/microos-tools-2.20/configure
--- old/microos-tools-2.19/configure 2023-03-14 11:02:04.000000000 +0100
+++ new/microos-tools-2.20/configure 2023-03-16 13:02:54.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for microos-tools 2.19.
+# Generated by GNU Autoconf 2.71 for microos-tools 2.20.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -607,8 +607,8 @@
# Identity of this package.
PACKAGE_NAME='microos-tools'
PACKAGE_TARNAME='microos-tools'
-PACKAGE_VERSION='2.19'
-PACKAGE_STRING='microos-tools 2.19'
+PACKAGE_VERSION='2.20'
+PACKAGE_STRING='microos-tools 2.20'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1285,7 +1285,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures microos-tools 2.19 to adapt to many kinds of systems.
+\`configure' configures microos-tools 2.20 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1352,7 +1352,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of microos-tools 2.19:";;
+ short | recursive ) echo "Configuration of microos-tools 2.20:";;
esac
cat <<\_ACEOF
@@ -1458,7 +1458,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-microos-tools configure 2.19
+microos-tools configure 2.20
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1534,7 +1534,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by microos-tools $as_me 2.19, which was
+It was created by microos-tools $as_me 2.20, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -2794,7 +2794,7 @@
# Define the identity of the package.
PACKAGE='microos-tools'
- VERSION='2.19'
+ VERSION='2.20'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -5051,7 +5051,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by microos-tools $as_me 2.19, which was
+This file was extended by microos-tools $as_me 2.20, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5110,7 +5110,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-microos-tools config.status 2.19
+microos-tools config.status 2.20
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-2.19/configure.ac
new/microos-tools-2.20/configure.ac
--- old/microos-tools-2.19/configure.ac 2023-03-14 11:00:54.000000000 +0100
+++ new/microos-tools-2.20/configure.ac 2023-03-16 13:02:24.000000000 +0100
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([microos-tools], [2.19])
+AC_INIT([microos-tools], [2.20])
AM_INIT_AUTOMAKE
AC_PREFIX_DEFAULT(/usr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-2.19/devel-tools/Makefile.in
new/microos-tools-2.20/devel-tools/Makefile.in
--- old/microos-tools-2.19/devel-tools/Makefile.in 2023-03-14
11:02:02.000000000 +0100
+++ new/microos-tools-2.20/devel-tools/Makefile.in 2023-03-16
13:02:54.000000000 +0100
@@ -313,9 +313,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-tools/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign devel-tools/Makefile';
\
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu devel-tools/Makefile
+ $(AUTOMAKE) --foreign devel-tools/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/microos-tools-2.19/selinux/98selinux-microos/selinux-microos-relabel.sh
new/microos-tools-2.20/selinux/98selinux-microos/selinux-microos-relabel.sh
--- old/microos-tools-2.19/selinux/98selinux-microos/selinux-microos-relabel.sh
2023-03-14 09:51:35.000000000 +0100
+++ new/microos-tools-2.20/selinux/98selinux-microos/selinux-microos-relabel.sh
2023-03-16 13:02:08.000000000 +0100
@@ -16,64 +16,55 @@
rd_microos_relabel()
{
- # We need to load a SELinux policy to label the filesystem
- if [ -x "$NEWROOT/usr/sbin/load_policy" ]; then
- ret=0
- info "SELinux: relabeling root filesystem"
-
- # If this doesn't exist because e.g. it's not mounted yet due to a bug
- # (boo#1197309), the exclusion is ignored. If it gets mounted during
- # the relabel, it gets wrong labels assigned.
- if ! [ -d "$NEWROOT/var/lib/overlay" ]; then
- warn "ERROR: /var/lib/overlay doesn't exist - /var not mounted
(yet)?"
- return 1
- fi
+ info "SELinux: relabeling root filesystem"
+
+ # If this doesn't exist because e.g. it's not mounted yet due to a bug
+ # (boo#1197309), the exclusion is ignored. If it gets mounted during
+ # the relabel, it gets wrong labels assigned.
+ if ! [ -d "$NEWROOT/var/lib/overlay" ]; then
+ warn "ERROR: /var/lib/overlay doesn't exist - /var not mounted (yet)?"
+ return 1
+ fi
- for sysdir in /proc /sys /dev; do
- if ! mount --rbind "${sysdir}" "${NEWROOT}${sysdir}" ; then
- warn "ERROR: mounting ${sysdir} failed!"
- ret=1
- fi
- # Don't let recursive umounts propagate into the bind source
- mount --make-rslave "${NEWROOT}${sysdir}"
- done
- if [ $ret -eq 0 ]; then
- # load_policy does mount /proc and /sys/fs/selinux in
- # libselinux,selinux_init_load_policy()
- info "SELinux: loading policy"
- out=$(LANG=C chroot "$NEWROOT" /usr/sbin/load_policy -i 2>&1)
- ret=$?
- info "$out"
-
- if [ $ret -eq 0 ]; then
- #LANG=C /usr/sbin/setenforce 0
- info "SELinux: mount root read-write and relabel"
- # 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}"
- oldrovalue="$(btrfs prop get "${ROOT_SELINUX}" ro | cut -d=
-f2)"
- btrfs prop set "${ROOT_SELINUX}" ro false
- FORCE=
- [ -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 /
- btrfs prop set "${ROOT_SELINUX}" ro "${oldrovalue}"
- umount -R "${ROOT_SELINUX}"
- fi
+ ret=0
+ for sysdir in /proc /sys /dev; do
+ if ! mount --rbind "${sysdir}" "${NEWROOT}${sysdir}" ; then
+ warn "ERROR: mounting ${sysdir} failed!"
+ ret=1
fi
- for sysdir in /proc /sys /dev; do
- if ! umount -R "${NEWROOT}${sysdir}" ; then
- warn "ERROR: unmounting ${sysdir} failed!"
- ret=1
- fi
- done
+ # Don't let recursive umounts propagate into the bind source
+ mount --make-rslave "${NEWROOT}${sysdir}"
+ done
+ if [ $ret -eq 0 ]; then
+ #LANG=C /usr/sbin/setenforce 0
+ info "SELinux: mount root read-write and relabel"
+ # 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}"
+ oldrovalue="$(btrfs prop get "${ROOT_SELINUX}" ro | cut -d= -f2)"
+ btrfs prop set "${ROOT_SELINUX}" ro false
+ FORCE=
+ [ -e "${ROOT_SELINUX}"/etc/selinux/.autorelabel ] && FORCE="$(cat
"${ROOT_SELINUX}"/etc/selinux/.autorelabel)"
+ . "${ROOT_SELINUX}"/etc/selinux/config
+ LANG=C chroot "$ROOT_SELINUX" /sbin/setfiles $FORCE -e /var/lib/overlay
-e /proc -e /sys -e /dev -e /etc
"/etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts" $(chroot
"$ROOT_SELINUX" cut -d" " -f2 /proc/mounts)
+ # On overlayfs, st_dev isn't consistent so setfiles thinks it's a
different mountpoint, ignoring it.
+ LANG=C chroot "$ROOT_SELINUX" find /etc -exec /sbin/setfiles $FORCE
"/etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts" \{\} +
+ btrfs prop set "${ROOT_SELINUX}" ro "${oldrovalue}"
+ umount -R "${ROOT_SELINUX}"
+ fi
+ for sysdir in /proc /sys /dev; do
+ if ! umount -R "${NEWROOT}${sysdir}" ; then
+ warn "ERROR: unmounting ${sysdir} failed!"
+ ret=1
+ fi
+ done
- # Marker when we had relabelled the filesystem
- > "$NEWROOT"/etc/selinux/.relabelled
+ # Marker when we had relabelled the filesystem
+ > "$NEWROOT"/etc/selinux/.relabelled
- return $ret
- fi
+ return $ret
}
if test -e "$NEWROOT"/.autorelabel -a "$NEWROOT"/.autorelabel -nt
"$NEWROOT"/etc/selinux/.relabelled ; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-2.19/selinux/Makefile.in
new/microos-tools-2.20/selinux/Makefile.in
--- old/microos-tools-2.19/selinux/Makefile.in 2023-03-14 11:02:02.000000000
+0100
+++ new/microos-tools-2.20/selinux/Makefile.in 2023-03-16 13:02:54.000000000
+0100
@@ -268,9 +268,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu selinux/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign selinux/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu selinux/Makefile
+ $(AUTOMAKE) --foreign selinux/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-2.19/sysctl/Makefile.in
new/microos-tools-2.20/sysctl/Makefile.in
--- old/microos-tools-2.19/sysctl/Makefile.in 2023-03-14 11:02:02.000000000
+0100
+++ new/microos-tools-2.20/sysctl/Makefile.in 2023-03-16 13:02:54.000000000
+0100
@@ -260,9 +260,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sysctl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign sysctl/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu sysctl/Makefile
+ $(AUTOMAKE) --foreign sysctl/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-2.19/systemd-printenv/Makefile.in
new/microos-tools-2.20/systemd-printenv/Makefile.in
--- old/microos-tools-2.19/systemd-printenv/Makefile.in 2023-03-14
11:02:02.000000000 +0100
+++ new/microos-tools-2.20/systemd-printenv/Makefile.in 2023-03-16
13:02:54.000000000 +0100
@@ -260,9 +260,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu
systemd-printenv/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
systemd-printenv/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu systemd-printenv/Makefile
+ $(AUTOMAKE) --foreign systemd-printenv/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-2.19/systemd-proxy-env/Makefile.in
new/microos-tools-2.20/systemd-proxy-env/Makefile.in
--- old/microos-tools-2.19/systemd-proxy-env/Makefile.in 2023-03-14
11:02:02.000000000 +0100
+++ new/microos-tools-2.20/systemd-proxy-env/Makefile.in 2023-03-16
13:02:54.000000000 +0100
@@ -263,9 +263,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu
systemd-proxy-env/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
systemd-proxy-env/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu systemd-proxy-env/Makefile
+ $(AUTOMAKE) --foreign systemd-proxy-env/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-2.19/tmpfs/Makefile.in
new/microos-tools-2.20/tmpfs/Makefile.in
--- old/microos-tools-2.19/tmpfs/Makefile.in 2023-03-14 11:02:02.000000000
+0100
+++ new/microos-tools-2.20/tmpfs/Makefile.in 2023-03-16 13:02:54.000000000
+0100
@@ -264,9 +264,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tmpfs/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tmpfs/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu tmpfs/Makefile
+ $(AUTOMAKE) --foreign tmpfs/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
