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 2022-09-01 22:09:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/microos-tools (Old) and /work/SRC/openSUSE:Factory/.microos-tools.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "microos-tools" Thu Sep 1 22:09:25 2022 rev:19 rq:1000393 version:2.15 Changes: -------- --- /work/SRC/openSUSE:Factory/microos-tools/microos-tools.changes 2021-09-11 22:24:50.195404712 +0200 +++ /work/SRC/openSUSE:Factory/.microos-tools.new.2083/microos-tools.changes 2022-09-01 22:10:17.444099706 +0200 @@ -1,0 +2,20 @@ +Wed Aug 31 06:53:58 UTC 2022 - Fabian Vogt <fv...@suse.com> + +- Update to version 2.15 + - 98selinux-microos: Add grep as dependency + +------------------------------------------------------------------- +Tue Aug 30 15:28:55 UTC 2022 - Thorsten Kukuk <ku...@suse.com> + +- Update to version 2.14 + - Fix Makefile to install sysext-add-debug + +------------------------------------------------------------------- +Tue Aug 30 13:51:58 UTC 2022 - Thorsten Kukuk <ku...@suse.com> + +- Update to version 2.13 + - 98selinux-microos: Don't rely on selinux=1 [bsc#1202449] + - Add sysext-add-debug + - Make sure /var/lib/overlay exists before relabeling + +------------------------------------------------------------------- Old: ---- microos-tools-2.12.tar.xz New: ---- microos-tools-2.15.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ microos-tools.spec ++++++ --- /var/tmp/diff_new_pack.ztX0lt/_old 2022-09-01 22:10:17.904100964 +0200 +++ /var/tmp/diff_new_pack.ztX0lt/_new 2022-09-01 22:10:17.912100986 +0200 @@ -1,7 +1,7 @@ # # spec file for package microos-tools # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: microos-tools -Version: 2.12 +Version: 2.15 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 -Source: microos-tools-%{version}.tar.xz +Source: https://github.com/openSUSE/microos-tools/releases/download/v%{version}/microos-tools-%{version}.tar.xz Source1: tmp.mount Source2: microos-tmp.conf Source99: microos-tools-rpmlintrc @@ -45,7 +45,7 @@ This package contains tools to make developing of MicroOS easier. %prep -%setup -q +%autosetup -p1 %build %configure @@ -114,5 +114,6 @@ %{_sbindir}/microos-rw %{_sbindir}/rpm-sortbysize %{_sbindir}/rpmorphan +%{_sbindir}/sysext-add-debug %changelog ++++++ microos-tools-2.12.tar.xz -> microos-tools-2.15.tar.xz ++++++ ++++ 6029 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.12/NEWS new/microos-tools-2.15/NEWS --- old/microos-tools-2.12/NEWS 2021-09-09 09:50:25.000000000 +0200 +++ new/microos-tools-2.15/NEWS 2022-08-31 08:48:04.000000000 +0200 @@ -1,3 +1,14 @@ +Version 2.15 +- 98selinux-microos: Add grep as dependency + +Version 2.14 +- Fix Makefile for devel-tools + +Version 2.13 +- 98selinux-microos: Don't rely on selinux=1 [bsc#1202449] +- Add sysext-add-debug +- Make sure /var/lib/overlay exists before relabeling + Version 2.12 - Remove locale-check, aaa_base has now an own solution - Remove old CaaSP stuff 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.12/compile new/microos-tools-2.15/compile --- old/microos-tools-2.12/compile 2021-09-09 09:55:40.000000000 +0200 +++ new/microos-tools-2.15/compile 2022-08-31 08:48:31.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-2021 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.12/configure.ac new/microos-tools-2.15/configure.ac --- old/microos-tools-2.12/configure.ac 2021-09-09 09:54:05.000000000 +0200 +++ new/microos-tools-2.15/configure.ac 2022-08-31 08:47:28.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(microos-tools, 2.12) +AC_INIT(microos-tools, 2.15) 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.12/devel-tools/Makefile.am new/microos-tools-2.15/devel-tools/Makefile.am --- old/microos-tools-2.12/devel-tools/Makefile.am 2021-05-10 09:58:46.000000000 +0200 +++ new/microos-tools-2.15/devel-tools/Makefile.am 2022-08-31 08:46:54.000000000 +0200 @@ -1,7 +1,7 @@ systemddir = $(systemdsystemunitdir) systemd_DATA = microos-ro.service -sbin_SCRIPTS = microos-rw microos-ro rpm-sortbysize +sbin_SCRIPTS = microos-rw microos-ro rpm-sortbysize sysext-add-debug sbin_PROGRAMS = rpmorphan rpmorphan_LDADD = $(RPM_LIBS) 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.12/devel-tools/sysext-add-debug new/microos-tools-2.15/devel-tools/sysext-add-debug --- old/microos-tools-2.12/devel-tools/sysext-add-debug 1970-01-01 01:00:00.000000000 +0100 +++ new/microos-tools-2.15/devel-tools/sysext-add-debug 2022-08-31 08:38:40.000000000 +0200 @@ -0,0 +1,39 @@ +#!/bin/bash -e + +if [ "$#" = 0 -o "$1" = "--help" ]; then + echo "Usage: $0 PACKAGE..." + echo "Downloads gdb and debuginfo for specified packages to /var/lib/extensions/" + echo "Uses systemd-sysext(8) to temporarily overlay them into the system." + exit 0 +fi + +pkgs=('gdb') +for i in "$@"; do + if [ "${i%-debuginfo}" = "$i" ] && [ "${i%-debugsource}" = "$i" ]; then + pkgs+=("$i-debuginfo" "$i-debugsource") + else + pkgs+=("$i") + fi +done + +. /usr/lib/os-release + +ext_base=/var/lib/extensions/debug-"$VERSION_ID" +mkdir -p "$ext_base/download" + +echo "getting ${pkgs[@]}" +zypper --pkg-cache-dir="$ext_base/download" --plus-content debug in --dry-run --download-only "${pkgs[@]}" + +while read pkg; do + echo "adding ${pkg##*/}" + rpm2cpio "$pkg" | cpio -idD "$ext_base" + rm "$pkg" +done < <(find "$ext_base/download" -type f -name '*.rpm') + +mkdir -p "$ext_base"/usr/lib/extension-release.d +cat > "$ext_base"/usr/lib/extension-release.d/extension-release.debug-"$VERSION_ID" <<EOF +ID=$ID +VERSION_ID=$VERSION_ID +EOF + +systemd-sysext merge 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.12/missing new/microos-tools-2.15/missing --- old/microos-tools-2.12/missing 2021-09-09 09:55:40.000000000 +0200 +++ new/microos-tools-2.15/missing 2022-08-31 08:48:31.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-2021 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.12/selinux/98selinux-microos/module-setup.sh new/microos-tools-2.15/selinux/98selinux-microos/module-setup.sh --- old/microos-tools-2.12/selinux/98selinux-microos/module-setup.sh 2020-08-03 21:11:39.000000000 +0200 +++ new/microos-tools-2.15/selinux/98selinux-microos/module-setup.sh 2022-08-31 08:46:54.000000000 +0200 @@ -14,5 +14,5 @@ # called by dracut install() { inst_hook pre-pivot 50 "$moddir/selinux-microos-relabel.sh" - inst_multiple setenforce + inst_multiple grep setenforce } 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.12/selinux/98selinux-microos/selinux-microos-relabel.sh new/microos-tools-2.15/selinux/98selinux-microos/selinux-microos-relabel.sh --- old/microos-tools-2.12/selinux/98selinux-microos/selinux-microos-relabel.sh 2021-07-29 15:20:30.000000000 +0200 +++ new/microos-tools-2.15/selinux/98selinux-microos/selinux-microos-relabel.sh 2022-08-31 08:46:54.000000000 +0200 @@ -3,7 +3,7 @@ rd_is_selinux_enabled() { # If SELinux is not enabled exit now - getarg "selinux=1" > /dev/null || return 1 + grep -qw selinux /sys/kernel/security/lsm || return 1 SELINUX="enforcing" [ -e "$NEWROOT/etc/selinux/config" ] && . "$NEWROOT/etc/selinux/config" @@ -21,6 +21,14 @@ 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 + for sysdir in /proc /sys /dev; do if ! mount --rbind "${sysdir}" "${NEWROOT}${sysdir}" ; then warn "ERROR: mounting ${sysdir} failed!"
