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-14 18:15:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/microos-tools (Old)
and /work/SRC/openSUSE:Factory/.microos-tools.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "microos-tools"
Tue Mar 14 18:15:30 2023 rev:25 rq:1071802 version:2.19
Changes:
--------
--- /work/SRC/openSUSE:Factory/microos-tools/microos-tools.changes
2023-01-24 20:26:25.706514893 +0100
+++ /work/SRC/openSUSE:Factory/.microos-tools.new.31432/microos-tools.changes
2023-03-14 18:15:32.703379133 +0100
@@ -1,0 +2,8 @@
+Tue Mar 14 14:25:23 UTC 2023 - Fabian Vogt <fv...@suse.com>
+
+- Update URL
+- Update to version 2.19:
+ - configure.ac: Run autoupdate to fix some deprecation warnings
+ - Clean up selinux-autorelabel-generator and make it compatible with systemd
253
+
+-------------------------------------------------------------------
Old:
----
microos-tools-2.18.tar.xz
New:
----
microos-tools-2.19.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ microos-tools.spec ++++++
--- /var/tmp/diff_new_pack.daQZyr/_old 2023-03-14 18:15:33.419382961 +0100
+++ /var/tmp/diff_new_pack.daQZyr/_new 2023-03-14 18:15:33.423382982 +0100
@@ -19,12 +19,12 @@
%{!?_distconfdir: %global _distconfdir %{_prefix}%{_sysconfdir}}
Name: microos-tools
-Version: 2.18
+Version: 2.19
Release: 0
Summary: Files and Scripts for openSUSE MicroOS
License: GPL-2.0-or-later
Group: Development/Tools/Other
-URL: https://github.com/kubic-project/microos-tools
+URL: https://github.com/openSUSE/microos-tools
Source:
https://github.com/openSUSE/microos-tools/releases/download/v%{version}/microos-tools-%{version}.tar.xz
Source1: tmp.mount
Source2: microos-tmp.conf
++++++ microos-tools-2.18.tar.xz -> microos-tools-2.19.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-2.18/NEWS new/microos-tools-2.19/NEWS
--- old/microos-tools-2.18/NEWS 2023-01-19 11:41:09.000000000 +0100
+++ new/microos-tools-2.19/NEWS 2023-03-14 11:00:50.000000000 +0100
@@ -1,3 +1,6 @@
+Version 2.19:
+- Clean up selinux-autorelabel-generator and make it compatible with systemd
253
+
Version 2.18
- Add TMPDIR to tukit binddirs for Salt
- 98selinux-microos: Add chroot as dependency
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-2.18/configure
new/microos-tools-2.19/configure
--- old/microos-tools-2.18/configure 2023-01-19 11:45:14.000000000 +0100
+++ new/microos-tools-2.19/configure 2023-03-14 11:02:04.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.18.
+# Generated by GNU Autoconf 2.71 for microos-tools 2.19.
#
#
# 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.18'
-PACKAGE_STRING='microos-tools 2.18'
+PACKAGE_VERSION='2.19'
+PACKAGE_STRING='microos-tools 2.19'
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.18 to adapt to many kinds of systems.
+\`configure' configures microos-tools 2.19 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.18:";;
+ short | recursive ) echo "Configuration of microos-tools 2.19:";;
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.18
+microos-tools configure 2.19
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.18, which was
+It was created by microos-tools $as_me 2.19, 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.18'
+ VERSION='2.19'
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.18, which was
+This file was extended by microos-tools $as_me 2.19, 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.18
+microos-tools config.status 2.19
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.18/configure.ac
new/microos-tools-2.19/configure.ac
--- old/microos-tools-2.18/configure.ac 2023-01-19 11:41:09.000000000 +0100
+++ new/microos-tools-2.19/configure.ac 2023-03-14 11:00:54.000000000 +0100
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(microos-tools, 2.18)
+AC_INIT([microos-tools], [2.19])
AM_INIT_AUTOMAKE
AC_PREFIX_DEFAULT(/usr)
@@ -28,6 +28,7 @@
AC_PROG_INSTALL
AC_PROG_LN_S
-AC_OUTPUT([Makefile systemd-proxy-env/Makefile systemd-printenv/Makefile \
+AC_CONFIG_FILES([Makefile systemd-proxy-env/Makefile systemd-printenv/Makefile
\
tmpfs/Makefile sysctl/Makefile selinux/Makefile \
devel-tools/Makefile])
+AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/microos-tools-2.18/selinux/selinux-autorelabel-generator
new/microos-tools-2.19/selinux/selinux-autorelabel-generator
--- old/microos-tools-2.18/selinux/selinux-autorelabel-generator
2023-01-19 11:41:09.000000000 +0100
+++ new/microos-tools-2.19/selinux/selinux-autorelabel-generator
2023-03-14 09:51:35.000000000 +0100
@@ -1,4 +1,5 @@
#!/bin/sh
+set -e
# This systemd.generator(7) detects if SELinux is running and if the
# user requested an autorelabel. If so, services will be enabled to
@@ -14,44 +15,58 @@
enable_units() {
mkdir -p "${generatordir}"/local-fs.target.requires
- for realdir in ".snapshots" "home" "opt" "root" "srv" "usr/local" \
- "boot/grub2/i386-pc" "boot/grub2/x86_64-efi" \
- "boot/grub2/arm64-efi" "boot/writable"; do
+ relabel_unit_list=""
+
+ for realdir in "/.snapshots" "/home" "/opt" "/root" "/srv" "/usr/local" \
+ "/boot/grub2/i386-pc" "/boot/grub2/x86_64-efi" \
+ "/boot/grub2/arm64-efi" "/boot/writable"; do
# Make sure the directory exist, else we create
# services for non existing mount points
- test -d "/${realdir}" || continue
+ test -d "${realdir}" || continue
mountunit=$(systemd-escape --path ${realdir})
unitfile="${mountunit}-relabel.service"
+ relabel_unit_list="$unitfile $relabel_unit_list"
+
+ opts=""
+ [ "${realdir}" == "/.snapshots" ] && opts="-x"
- {
- echo "[Unit]";
- echo "Description=Relabel ${realdir}";
- echo "DefaultDependencies=no";
- echo "RequiresMountsFor=/${realdir}";
- echo "Before=local-fs.target";
- echo "ConditionSecurity=selinux";
- echo "";
- echo "[Service]";
- echo "Type=oneshot";
- case "$realdir" in
- .snapshots)
- echo "ExecStart=/sbin/restorecon -R -x /${realdir}";
- ;;
- *)
- echo "ExecStart=/sbin/restorecon -R /${realdir}";
- ;;
- esac
- } > "${generatordir}"/"${unitfile}"
+ cat >"${generatordir}/${unitfile}" <<-EOF
+ [Unit]
+ Description=Relabel ${realdir}
+ DefaultDependencies=no
+ RequiresMountsFor=${realdir}
+ Before=local-fs.target
+ ConditionSecurity=selinux
+
+ [Service]
+ Type=oneshot
+ ExecStart=/sbin/restorecon -R ${opts} ${realdir}
+ EOF
ln -sf ../"${unitfile}"
"${generatordir}"/local-fs.target.requires/"${unitfile}"
done
+
+ unitfile="mark-autorelabel-done.service"
+ cat >"${generatordir}/${unitfile}" <<-EOF
+ [Unit]
+ Description=Mark autorelabel as done
+ DefaultDependencies=no
+ Before=local-fs.target
+ After=${relabel_unit_list}
+ Requires=${relabel_unit_list}
+ ConditionSecurity=selinux
+ ConditionPathExists=/etc/selinux/.autorelabel
+
+ [Service]
+ Type=oneshot
+ ExecStart=/usr/bin/rm /etc/selinux/.autorelabel
+EOF
+
+ ln -sf "../${unitfile}"
"${generatordir}/local-fs.target.requires/${unitfile}"
}
if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
- if test -f /etc/selinux/.autorelabel; then
- enable_units
- rm -f /etc/selinux/.autorelabel
- elif grep -sqE "\bautorelabel\b" /proc/cmdline; then
+ if [ -f /etc/selinux/.autorelabel ] || grep -wq autorelabel /proc/cmdline;
then
enable_units
fi
fi
