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 2025-03-17 22:16:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/microos-tools (Old)
and /work/SRC/openSUSE:Factory/.microos-tools.new.19136 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "microos-tools"
Mon Mar 17 22:16:25 2025 rev:42 rq:1253008 version:4.0+git10
Changes:
--------
--- /work/SRC/openSUSE:Factory/microos-tools/microos-tools.changes
2025-02-28 17:38:34.398694185 +0100
+++ /work/SRC/openSUSE:Factory/.microos-tools.new.19136/microos-tools.changes
2025-03-17 22:20:30.713794418 +0100
@@ -1,0 +2,8 @@
+Fri Mar 14 09:19:25 UTC 2025 - ku...@suse.com
+
+- Update to version 4.0+git10:
+ * Remove setup-systemd-proxy, now part of aaa_base
+ * Drop wtmpdb SELinux AVC workaround in test suite
+ * test: Wait for sshd.service before checking labels in /etc
+
+-------------------------------------------------------------------
Old:
----
microos-tools-4.0+git7.obscpio
New:
----
microos-tools-4.0+git10.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ microos-tools.spec ++++++
--- /var/tmp/diff_new_pack.t9XQm4/_old 2025-03-17 22:20:31.189814301 +0100
+++ /var/tmp/diff_new_pack.t9XQm4/_new 2025-03-17 22:20:31.193814469 +0100
@@ -19,7 +19,7 @@
%{!?_distconfdir: %global _distconfdir %{_prefix}%{_sysconfdir}}
Name: microos-tools
-Version: 4.0+git7
+Version: 4.0+git10
Release: 0
Summary: Files and Scripts for openSUSE MicroOS
License: GPL-2.0-or-later
@@ -67,16 +67,16 @@
%make_install
%pre
-%service_add_pre setup-systemd-proxy-env.service setup-systemd-proxy-env.path
printenv.service
+%service_add_pre printenv.service
%preun
-%service_del_preun setup-systemd-proxy-env.service
setup-systemd-proxy-env.path printenv.service
+%service_del_preun printenv.service
%post
-%service_add_post setup-systemd-proxy-env.service setup-systemd-proxy-env.path
printenv.service
+%service_add_post printenv.service
%postun
-%service_del_postun setup-systemd-proxy-env.service
setup-systemd-proxy-env.path printenv.service
+%service_del_postun printenv.service
%pre -n microos-devel-tools
%service_add_pre microos-ro.service
@@ -111,14 +111,11 @@
%dir %{_sysconfdir}/selinux
%config %{_sysconfdir}/selinux/fixfiles_exclude_dirs
%{_unitdir}/printenv.service
-%{_unitdir}/setup-systemd-proxy-env.path
-%{_unitdir}/setup-systemd-proxy-env.service
%dir %{_unitdir}/salt-minion.service.d
%{_unitdir}/salt-minion.service.d/TMPDIR.conf
%{_tmpfilesdir}/salt-minion-tmpdir.conf
%dir %{_distconfdir}/tukit.conf.d
%{_distconfdir}/tukit.conf.d/salt-tukit.conf
-%{_sbindir}/setup-systemd-proxy-env
%{_bindir}/man-online
%{_distconfdir}/profile.d/man-online.sh
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.t9XQm4/_old 2025-03-17 22:20:31.249816808 +0100
+++ /var/tmp/diff_new_pack.t9XQm4/_new 2025-03-17 22:20:31.253816975 +0100
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/microos-tools.git</param>
- <param
name="changesrevision">5c5015c481d2415cacfc6faa0a2f948145052f22</param></service>
+ <param
name="changesrevision">fa1a910b31274675516b29443923738d3738bba2</param></service>
</servicedata>
(No newline at EOF)
++++++ microos-tools-4.0+git7.obscpio -> microos-tools-4.0+git10.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-4.0+git7/Makefile.am
new/microos-tools-4.0+git10/Makefile.am
--- old/microos-tools-4.0+git7/Makefile.am 2025-02-27 14:47:27.000000000
+0100
+++ new/microos-tools-4.0+git10/Makefile.am 2025-03-14 10:18:37.000000000
+0100
@@ -1,7 +1,6 @@
AUTOMAKE_OPTIONS = 1.6 foreign check-news dist-xz
-SUBDIRS = systemd-proxy-env systemd-printenv tmpfs \
- selinux devel-tools
+SUBDIRS = systemd-printenv tmpfs selinux devel-tools
CLEANFILES = *~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-4.0+git7/NEWS
new/microos-tools-4.0+git10/NEWS
--- old/microos-tools-4.0+git7/NEWS 2025-02-27 14:47:27.000000000 +0100
+++ new/microos-tools-4.0+git10/NEWS 2025-03-14 10:18:37.000000000 +0100
@@ -1,3 +1,6 @@
+Version X.Y:
+- systemd-proxy-env got moved to aaa_base
+
Version 4.0:
- Some refactoring of the SELinux relabelling code
- The SELinux relabelling code is now usable on non-transactional systems as
well
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-4.0+git7/README.md
new/microos-tools-4.0+git10/README.md
--- old/microos-tools-4.0+git7/README.md 2025-02-27 14:47:27.000000000
+0100
+++ new/microos-tools-4.0+git10/README.md 2025-03-14 10:18:37.000000000
+0100
@@ -27,11 +27,6 @@
## systemd services
-### setup-systemd-proxy-env.service
-
-The `setup-systemd-proxy-env.service` makes the proxy variables from
-`/etc/sysconfig/proxy` available to all systemd units.
-
### printenv.service
The `printenv.service` is to debug which environment variables exist
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-4.0+git7/configure.ac
new/microos-tools-4.0+git10/configure.ac
--- old/microos-tools-4.0+git7/configure.ac 2025-02-27 14:47:27.000000000
+0100
+++ new/microos-tools-4.0+git10/configure.ac 2025-03-14 10:18:37.000000000
+0100
@@ -28,7 +28,7 @@
AC_PROG_INSTALL
AC_PROG_LN_S
-AC_CONFIG_FILES([Makefile systemd-proxy-env/Makefile systemd-printenv/Makefile
\
+AC_CONFIG_FILES([Makefile systemd-printenv/Makefile \
tmpfs/Makefile selinux/Makefile \
devel-tools/Makefile])
AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-4.0+git7/microos-tools.spec
new/microos-tools-4.0+git10/microos-tools.spec
--- old/microos-tools-4.0+git7/microos-tools.spec 2025-02-27
14:47:27.000000000 +0100
+++ new/microos-tools-4.0+git10/microos-tools.spec 2025-03-14
10:18:37.000000000 +0100
@@ -67,16 +67,16 @@
%make_install
%pre
-%service_add_pre setup-systemd-proxy-env.service setup-systemd-proxy-env.path
printenv.service
+%service_add_pre printenv.service
%preun
-%service_del_preun setup-systemd-proxy-env.service
setup-systemd-proxy-env.path printenv.service
+%service_del_preun printenv.service
%post
-%service_add_post setup-systemd-proxy-env.service setup-systemd-proxy-env.path
printenv.service
+%service_add_post printenv.service
%postun
-%service_del_postun setup-systemd-proxy-env.service
setup-systemd-proxy-env.path printenv.service
+%service_del_postun printenv.service
%pre -n microos-devel-tools
%service_add_pre microos-ro.service
@@ -112,14 +112,11 @@
%dir %{_sysconfdir}/selinux
%config %{_sysconfdir}/selinux/fixfiles_exclude_dirs
%{_unitdir}/printenv.service
-%{_unitdir}/setup-systemd-proxy-env.path
-%{_unitdir}/setup-systemd-proxy-env.service
%dir %{_unitdir}/salt-minion.service.d
%{_unitdir}/salt-minion.service.d/TMPDIR.conf
%{_tmpfilesdir}/salt-minion-tmpdir.conf
%dir %{_distconfdir}/tukit.conf.d
%{_distconfdir}/tukit.conf.d/salt-tukit.conf
-%{_sbindir}/setup-systemd-proxy-env
%{_bindir}/man-online
%{_distconfdir}/profile.d/man-online.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-4.0+git7/systemd-proxy-env/Makefile.am
new/microos-tools-4.0+git10/systemd-proxy-env/Makefile.am
--- old/microos-tools-4.0+git7/systemd-proxy-env/Makefile.am 2025-02-27
14:47:27.000000000 +0100
+++ new/microos-tools-4.0+git10/systemd-proxy-env/Makefile.am 1970-01-01
01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-systemddir = $(systemdsystemunitdir)
-
-sbin_SCRIPTS = setup-systemd-proxy-env
-systemd_DATA = setup-systemd-proxy-env.path setup-systemd-proxy-env.service
-
-EXTRA_DIST = $(DATA) $(SCRIPTS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/microos-tools-4.0+git7/systemd-proxy-env/setup-systemd-proxy-env
new/microos-tools-4.0+git10/systemd-proxy-env/setup-systemd-proxy-env
--- old/microos-tools-4.0+git7/systemd-proxy-env/setup-systemd-proxy-env
2025-02-27 14:47:27.000000000 +0100
+++ new/microos-tools-4.0+git10/systemd-proxy-env/setup-systemd-proxy-env
1970-01-01 01:00:00.000000000 +0100
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# Look at /etc/sysconfig/proxy and make the proxy configuration
-# available as environment variable in systemd services
-
-CFG=/etc/sysconfig/proxy
-SYSTEMD_CFG=/etc/systemd/system.conf.d/proxy.conf
-
-test -f ${CFG} || exit 0
-
-DefaultEnvironment=""
-
-while read line ; do
- case "$line" in
- \#*|"") continue ;;
- esac
- eval val=${line#*=}
- test -z "$val" && continue
- case "$line" in
- PROXY_ENABLED=*)
- test "$val" = "yes" && continue
- if [ -f $SYSTEMD_CFG ]; then
- rm $SYSTEMD_CFG
- systemctl daemon-reload
- fi
- exit 0
- ;;
- HTTP_PROXY=*)
- DefaultEnvironment="$DefaultEnvironment \"HTTP_PROXY=${val}\"
\"http_proxy=${val}\""
- ;;
- HTTPS_PROXY=*)
- DefaultEnvironment="$DefaultEnvironment \"HTTPS_PROXY=${val}\"
\"https_proxy=${val}\""
- ;;
- FTP_PROXY=*)
- DefaultEnvironment="$DefaultEnvironment \"FTP_PROXY=${val}\"
\"ftp_proxy=${val}\""
- ;;
- GOPHER_PROXY=*)
- DefaultEnvironment="$DefaultEnvironment \"GOPHER_PROXY=${val}\"
\"gopher_proxy=${val}\""
- ;;
- SOCKS_PROXY=*)
- DefaultEnvironment="$DefaultEnvironment \"SOCKS_PROXY=${val}\"
\"socks_proxy=${val}\""
- ;;
- SOCKS5_SERVER=*)
- DefaultEnvironment="$DefaultEnvironment \"SOCKS5_SERVER=${val}\"
\"socks5_server=${val}\""
- ;;
- NO_PROXY=*)
- DefaultEnvironment="$DefaultEnvironment \"NO_PROXY=${val}\"
\"no_proxy=${val}\""
- ;;
- esac
-done < $CFG
-
-test -z "$DefaultEnvironment" && exit 0
-
-if [ ! -d /etc/systemd/system.conf.d ]; then
- mkdir -p /etc/systemd/system.conf.d || exit 1
-fi
-
-TMPCFGFILE=`mktemp ${SYSTEMD_CFG}.XXXXXXXXXX` || exit 1
-echo -e "[Manager]\nDefaultEnvironment=${DefaultEnvironment}" > ${TMPCFGFILE}
-cmp -s ${TMPCFGFILE} ${SYSTEMD_CFG}
-if [ $? -ne 0 ]; then
- chmod 0644 ${TMPCFGFILE}
- mv ${TMPCFGFILE} ${SYSTEMD_CFG}
- systemctl daemon-reload
-else
- rm -f $TMPCFGFILE
-fi
-
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/microos-tools-4.0+git7/systemd-proxy-env/setup-systemd-proxy-env.path
new/microos-tools-4.0+git10/systemd-proxy-env/setup-systemd-proxy-env.path
--- old/microos-tools-4.0+git7/systemd-proxy-env/setup-systemd-proxy-env.path
2025-02-27 14:47:27.000000000 +0100
+++ new/microos-tools-4.0+git10/systemd-proxy-env/setup-systemd-proxy-env.path
1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-[Unit]
-Description=Watch for changes in proxy configuration
-After=local-fs.target
-
-[Path]
-Unit=setup-systemd-proxy-env.service
-PathChanged=/etc/sysconfig/proxy
-
-[Install]
-WantedBy=default.target
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/microos-tools-4.0+git7/systemd-proxy-env/setup-systemd-proxy-env.service
new/microos-tools-4.0+git10/systemd-proxy-env/setup-systemd-proxy-env.service
---
old/microos-tools-4.0+git7/systemd-proxy-env/setup-systemd-proxy-env.service
2025-02-27 14:47:27.000000000 +0100
+++
new/microos-tools-4.0+git10/systemd-proxy-env/setup-systemd-proxy-env.service
1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-[Unit]
-Description=Update system wide proxy setup for systemd services
-Wants=local-fs.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/setup-systemd-proxy-env
-
-[Install]
-WantedBy=default.target
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-4.0+git7/test/testscript
new/microos-tools-4.0+git10/test/testscript
--- old/microos-tools-4.0+git7/test/testscript 2025-02-27 14:47:27.000000000
+0100
+++ new/microos-tools-4.0+git10/test/testscript 2025-03-14 10:18:37.000000000
+0100
@@ -19,7 +19,7 @@
set -euxo pipefail
trap '[ $? -eq 0 ] || poweroff -f' EXIT
# Print a list of files which have SELinux label mismatches
-if restorecon -nvR -e /.snapshots -e /run / | grep -v wtmpdb | grep "Would
relabel"; then
+if restorecon -nvR -e /.snapshots -e /run / | grep "Would relabel"; then
echo "Some labels aren't correct?"
exit 1
fi
@@ -37,6 +37,9 @@
chmod a+x /usr/bin/combustion-validate
cat >>/etc/systemd/system/combustion-validate.service <<'EOF'
+[Unit]
+# This creates files in /etc/ssh/, make sure it's done.
+After=sshd.service
[Service]
Type=oneshot
StandardOutput=journal+console
++++++ microos-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.t9XQm4/_old 2025-03-17 22:20:31.373821987 +0100
+++ /var/tmp/diff_new_pack.t9XQm4/_new 2025-03-17 22:20:31.377822155 +0100
@@ -1,5 +1,5 @@
name: microos-tools
-version: 4.0+git7
-mtime: 1740664047
-commit: 5c5015c481d2415cacfc6faa0a2f948145052f22
+version: 4.0+git10
+mtime: 1741943917
+commit: fa1a910b31274675516b29443923738d3738bba2
