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-09-11 22:24:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/microos-tools (Old) and /work/SRC/openSUSE:Factory/.microos-tools.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "microos-tools" Sat Sep 11 22:24:24 2021 rev:18 rq:917715 version:2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/microos-tools/microos-tools.changes 2021-07-02 13:27:44.484632879 +0200 +++ /work/SRC/openSUSE:Factory/.microos-tools.new.1899/microos-tools.changes 2021-09-11 22:24:50.195404712 +0200 @@ -1,0 +2,7 @@ +Thu Sep 9 11:45:19 UTC 2021 - Thorsten Kukuk <[email protected]> + +- Update to version 2.12 + - Remove special MicroOS firstboot script + - Remove locale-check, replaced by another aaa_base implementation + +------------------------------------------------------------------- Old: ---- microos-tools-2.11.tar.xz New: ---- microos-tools-2.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ microos-tools.spec ++++++ --- /var/tmp/diff_new_pack.NF1J0H/_old 2021-09-11 22:24:50.639405149 +0200 +++ /var/tmp/diff_new_pack.NF1J0H/_new 2021-09-11 22:24:50.643405153 +0200 @@ -17,7 +17,7 @@ Name: microos-tools -Version: 2.11 +Version: 2.12 Release: 0 Summary: Files and Scripts for openSUSE MicroOS License: GPL-2.0-or-later @@ -59,47 +59,50 @@ %endif %pre -%service_add_pre setup-systemd-proxy-env.service printenv.service +%service_add_pre setup-systemd-proxy-env.service setup-systemd-proxy-env.path printenv.service %post %{regenerate_initrd_post} -%service_add_post setup-systemd-proxy-env.service printenv.service +%service_add_post setup-systemd-proxy-env.service setup-systemd-proxy-env.path printenv.service %preun -%service_del_preun setup-systemd-proxy-env.service printenv.service +%service_del_preun setup-systemd-proxy-env.service setup-systemd-proxy-env.path printenv.service %postun %{regenerate_initrd_post} -%service_del_postun setup-systemd-proxy-env.service printenv.service +%service_del_postun setup-systemd-proxy-env.service setup-systemd-proxy-env.path printenv.service %posttrans %{regenerate_initrd_posttrans} +%pre -n microos-devel-tools +%service_add_pre microos-ro.service + +%post -n microos-devel-tools +%service_add_post microos-ro.service + +%preun -n microos-devel-tools +%service_del_preun microos-ro.service + +%postun -n microos-devel-tools +%service_del_postun microos-ro.service + %files %license COPYING %dir %{_sysconfdir}/selinux %config %{_sysconfdir}/selinux/fixfiles_exclude_dirs -%dir %{_sysconfdir}/systemd -%dir %{_sysconfdir}/systemd/system -%config %{_sysconfdir}/systemd/system/systemd-firstboot.service -%{_unitdir}/MicroOS-firstboot.service %{_unitdir}/printenv.service %{_unitdir}/setup-systemd-proxy-env.path %{_unitdir}/setup-systemd-proxy-env.service -%dir %{_unitdir}/sysinit.target.wants -%{_unitdir}/sysinit.target.wants/MicroOS-firstboot.service %dir %{_unitdir}/salt-minion.service.d %{_unitdir}/salt-minion.service.d/TMPDIR.conf %{_tmpfilesdir}/salt-minion-tmpdir.conf %{_sysctldir}/30-corefiles.conf -%{_libexecdir}/MicroOS-firstboot %{_sbindir}/setup-systemd-proxy-env %dir %{_prefix}/lib/dracut %dir %{_prefix}/lib/dracut/modules.d %{_prefix}/lib/dracut/modules.d/98selinux-microos %{_systemdgeneratordir}/selinux-autorelabel-generator -%config %{_sysconfdir}/profile.d/ssh-locale-check.sh -%{_bindir}/locale-check %if 0%{?suse_version} <= 1500 %{_unitdir}/tmp.mount %{_tmpfilesdir}/microos-tmp.conf ++++++ microos-tools-2.11.tar.xz -> microos-tools-2.12.tar.xz ++++++ ++++ 3231 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.11/Makefile.am new/microos-tools-2.12/Makefile.am --- old/microos-tools-2.11/Makefile.am 2021-05-27 18:46:06.000000000 +0200 +++ new/microos-tools-2.12/Makefile.am 2021-09-09 09:49:36.000000000 +0200 @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign check-news dist-xz -SUBDIRS = firstboot systemd-proxy-env systemd-printenv systemd-tmpfs \ - selinux sysctl locale-check devel-tools +SUBDIRS = systemd-proxy-env systemd-printenv systemd-tmpfs \ + selinux sysctl devel-tools CLEANFILES = *~ 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.11/NEWS new/microos-tools-2.12/NEWS --- old/microos-tools-2.11/NEWS 2021-06-16 21:36:24.000000000 +0200 +++ new/microos-tools-2.12/NEWS 2021-09-09 09:50:25.000000000 +0200 @@ -1,3 +1,8 @@ +Version 2.12 +- Remove locale-check, aaa_base has now an own solution +- Remove old CaaSP stuff +- Remove systemd firstboot overwrite + Version 2.11 - Fix unwritable /var / /etc after SELinux relabel [bsc#1186563] 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.11/compile new/microos-tools-2.12/compile --- old/microos-tools-2.11/compile 2021-05-27 19:02:45.000000000 +0200 +++ new/microos-tools-2.12/compile 2021-09-09 09:55:40.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2018-03-07.03; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # 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 <https://www.gnu.org/licenses/>. +# along with this program. If not, see <http://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* | MSYS*) + CYGWIN*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/* | msys/*) + cygwin/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -340,7 +340,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks '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.11/configure.ac new/microos-tools-2.12/configure.ac --- old/microos-tools-2.11/configure.ac 2021-06-16 21:36:24.000000000 +0200 +++ new/microos-tools-2.12/configure.ac 2021-09-09 09:54:05.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(microos-tools, 2.11) +AC_INIT(microos-tools, 2.12) AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr) @@ -28,7 +28,6 @@ AC_PROG_INSTALL AC_PROG_LN_S -AC_OUTPUT([Makefile firstboot/Makefile firstboot/MicroOS-firstboot.service \ - systemd-proxy-env/Makefile systemd-printenv/Makefile \ +AC_OUTPUT([Makefile systemd-proxy-env/Makefile systemd-printenv/Makefile \ systemd-tmpfs/Makefile sysctl/Makefile selinux/Makefile \ - locale-check/Makefile devel-tools/Makefile]) + devel-tools/Makefile]) 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.11/firstboot/Makefile.am new/microos-tools-2.12/firstboot/Makefile.am --- old/microos-tools-2.11/firstboot/Makefile.am 2021-05-27 18:46:06.000000000 +0200 +++ new/microos-tools-2.12/firstboot/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -systemddir = $(systemdsystemunitdir) - -libexec_SCRIPTS = MicroOS-firstboot -systemd_DATA = MicroOS-firstboot.service - -EXTRA_DIST = MicroOS-firstboot.service.in $(SCRIPTS) - -install-data-hook: - mkdir -p $(DESTDIR)@sysconfdir@/systemd/system - ln -sf /dev/null $(DESTDIR)@sysconfdir@/systemd/system/systemd-firstboot.service - mkdir -p $(DESTDIR)/$(systemdsystemunitdir)/sysinit.target.wants - ln -sf ../MicroOS-firstboot.service $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants/MicroOS-firstboot.service 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.11/firstboot/MicroOS-firstboot new/microos-tools-2.12/firstboot/MicroOS-firstboot --- old/microos-tools-2.11/firstboot/MicroOS-firstboot 2021-05-27 18:46:06.000000000 +0200 +++ new/microos-tools-2.12/firstboot/MicroOS-firstboot 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 SUSE LLC -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -set -e - -cleanup() { - setterm -msg on -} -trap cleanup EXIT - -# avoid kernel messages spamming our console -setterm -msg off - -systemd_firstboot_args=('--setup-machine-id') - -systemd-firstboot "${systemd_firstboot_args[@]}" - -# vim: sw=4 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.11/firstboot/MicroOS-firstboot.service.in new/microos-tools-2.12/firstboot/MicroOS-firstboot.service.in --- old/microos-tools-2.11/firstboot/MicroOS-firstboot.service.in 2021-05-27 18:46:06.000000000 +0200 +++ new/microos-tools-2.12/firstboot/MicroOS-firstboot.service.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -[Unit] -Description=openSUSE MicroOS Firstboot Service -DefaultDependencies=no -Conflicts=shutdown.target -After=systemd-remount-fs.service -Before=systemd-sysusers.service sysinit.target shutdown.target -ConditionPathIsReadWrite=/etc -ConditionFirstBoot=yes - -[Service] -Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux -Type=oneshot -RemainAfterExit=yes -ExecStart=@libexecdir@/MicroOS-firstboot -StandardOutput=tty -StandardInput=tty -StandardError=tty 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.11/locale-check/Makefile.am new/microos-tools-2.12/locale-check/Makefile.am --- old/microos-tools-2.11/locale-check/Makefile.am 2021-05-27 18:46:06.000000000 +0200 +++ new/microos-tools-2.12/locale-check/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -profileddir = @sysconfdir@/profile.d - -profiled_DATA = ssh-locale-check.sh - -EXTRA_DIST = $(DATA) - -bin_PROGRAMS = locale-check 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.11/locale-check/locale-check.c new/microos-tools-2.12/locale-check/locale-check.c --- old/microos-tools-2.11/locale-check/locale-check.c 2021-05-27 18:46:06.000000000 +0200 +++ new/microos-tools-2.12/locale-check/locale-check.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -/* From base-files-11ubuntu5.1 */ - -#include <locale.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -char *help = "locale-check DEFAULT_LOCALE\n" - "\n" - "Check that the various locale-related environment variables contain\n" - "values that can be set. Output shell that can be passed to eval to\n" - "set any invalid environment variables to DEFAULT_LOCALE\n"; - -static void usage(void) { - fprintf(stderr, "%s", help); - exit(1); -} - -static void check(int category, char* varname, char* defvalue) { - if (getenv(varname) != NULL) { - if (setlocale(category, "") == NULL) { - printf("%s=%s\n", varname, defvalue); - } - } -} - -#define SINGLEQUOTE '\'' -#define BACKSLASH '\\' - -/* Quote 'val' for shell */ -static char *quote(char* val) { - /* This implementation single quotes val and replaces single quotes - with SINGLEQUOTE BACKSLASH SINGLEQUOTE SINGLEQUOTE. The worst - case is that val is entirely single quotes, in which case each - character of the input becomes 4 bytes. Then 3 bytes for - surrounding quotes and terminating NUL. */ - char *ret = malloc(strlen(val)*4+3); - char *source = val; - char *dest = ret; - - *dest++ = SINGLEQUOTE; - while (*source) { - if (*source == SINGLEQUOTE) { - *dest++ = SINGLEQUOTE; - *dest++ = BACKSLASH; - *dest++ = SINGLEQUOTE; - } - *dest++ = *source++; - } - *dest++ = SINGLEQUOTE; - *dest++ = 0; - return ret; -} - -#define CHECK(cat, def) check(cat, #cat, def); - -int main(int argc, char** argv) { - char *defval; - if (argc != 2) { - usage(); - } - defval = quote(argv[1]); - /* setlocale will never consult LANG if LC_ALL is set */ - if (getenv("LC_ALL") == NULL) { - check(LC_ALL, "LANG", defval); - } else { - CHECK(LC_ALL, defval); - } - CHECK(LC_ADDRESS, defval); - CHECK(LC_COLLATE, defval); - CHECK(LC_CTYPE, defval); - CHECK(LC_IDENTIFICATION, defval); - CHECK(LC_MEASUREMENT, defval); - CHECK(LC_MESSAGES, defval); - CHECK(LC_MONETARY, defval); - CHECK(LC_NAME, defval); - CHECK(LC_NUMERIC, defval); - CHECK(LC_PAPER, defval); - CHECK(LC_TELEPHONE, defval); - CHECK(LC_TIME, defval); - return 0; -} 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.11/locale-check/ssh-locale-check.sh new/microos-tools-2.12/locale-check/ssh-locale-check.sh --- old/microos-tools-2.11/locale-check/ssh-locale-check.sh 2021-05-27 18:46:06.000000000 +0200 +++ new/microos-tools-2.12/locale-check/ssh-locale-check.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -# -# locale-check.sh: Verify that the locale SSH did set is valid, -# else reset to the system default. -# - -# Only check locale if it did got set by SSH -test -z "$SSH_SENDS_LOCALE" && return - -_SYSTEM_DEFAULT_LANG=C.UTF-8 -if [ -s /etc/locale.conf ]; then - eval "$(sed -rn -e 's/^(LANG)=/_SYSTEM_DEFAULT_\1=/p' < /etc/locale.conf)" -fi -# Make sure the locale variables are set to valid values. -eval "$(/usr/bin/locale-check ${_SYSTEM_DEFAULT_LANG})" 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.11/missing new/microos-tools-2.12/missing --- old/microos-tools-2.11/missing 2021-05-27 19:02:45.000000000 +0200 +++ new/microos-tools-2.12/missing 2021-09-09 09:55:40.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2018-03-07.03; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 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 <https://www.gnu.org/licenses/>. +# along with this program. If not, see <http://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=https://www.perl.org/ -flex_URL=https://github.com/westes/flex -gnu_software_URL=https://www.gnu.org/software +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" ++++++ microos-tools-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.NF1J0H/_old 2021-09-11 22:24:50.743405252 +0200 +++ /var/tmp/diff_new_pack.NF1J0H/_new 2021-09-11 22:24:50.743405252 +0200 @@ -1,7 +1,2 @@ -addFilter('suse-filelist-forbidden-systemd-userdirs') -addFilter('systemd-unit-in-etc') -addFilter('dangling-symlink') -addFilter('postin-without-tmpfile-creation') +addFilter('post-without-tmpfile-creation') addFilter('tmpfile-not-in-filelist') -addFilter('suse-missing-rclink') -addFilter('.*W: systemd-service-without-service.*MicroOS-firstboot.service.*')
