Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package os-update for openSUSE:Factory
checked in at 2023-01-14 00:03:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-update (Old)
and /work/SRC/openSUSE:Factory/.os-update.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-update"
Sat Jan 14 00:03:29 2023 rev:11 rq:1058256 version:1.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/os-update/os-update.changes 2022-12-21
16:07:21.814788439 +0100
+++ /work/SRC/openSUSE:Factory/.os-update.new.32243/os-update.changes
2023-01-14 00:04:16.398079805 +0100
@@ -1,0 +2,8 @@
+Fri Jan 13 13:40:55 UTC 2023 - Thorsten Kukuk <ku...@suse.com>
+
+- Update to Version 1.9
+ - Minimal support for SLE12 (os-update)
+ - From address now configureable (systemd-status-mail)
+ - Include error messages of systemctl, too (systemd-status-mail)
+
+-------------------------------------------------------------------
Old:
----
os-update-1.8.tar.xz
New:
----
os-update-1.9.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ os-update.spec ++++++
--- /var/tmp/diff_new_pack.fKrOv0/_old 2023-01-14 00:04:16.994083277 +0100
+++ /var/tmp/diff_new_pack.fKrOv0/_new 2023-01-14 00:04:16.998083301 +0100
@@ -1,7 +1,7 @@
#
# spec file for package os-update
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
%endif
Name: os-update
-Version: 1.8
+Version: 1.9
Release: 0
Summary: Updates the system regularly to stay current and safe
License: GPL-2.0-or-later
++++++ os-update-1.8.tar.xz -> os-update-1.9.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.8/NEWS new/os-update-1.9/NEWS
--- old/os-update-1.8/NEWS 2022-12-21 11:51:05.000000000 +0100
+++ new/os-update-1.9/NEWS 2023-01-13 14:22:18.000000000 +0100
@@ -1,3 +1,8 @@
+Version 1.9
+ - Minimal support for SLE12 (os-update)
+ - From address now configureable (systemd-status-mail)
+ - Include error messages of systemctl, too (systemd-status-mail)
+
Version 1.8
- Allow to specify additional options for mailx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.8/README.md new/os-update-1.9/README.md
--- old/os-update-1.8/README.md 2022-11-22 14:57:10.000000000 +0100
+++ new/os-update-1.9/README.md 2023-01-13 13:46:46.000000000 +0100
@@ -27,6 +27,8 @@
**IGNORE_SERVICES_FROM_RESTART**="dbus" - Specifies a list of services which
should not be restarted
+**SERVICES_TRIGGERING_REBOOT**="dbus" : Specifies a list of services which
trigger a reboot
+
## CONFIGURATION FILES
**/usr/etc/os-update.conf** - Vendor provided configuration file, contains the
defaults.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.8/configure new/os-update-1.9/configure
--- old/os-update-1.8/configure 2022-12-21 11:51:26.000000000 +0100
+++ new/os-update-1.9/configure 2023-01-13 14:39:21.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for os-update 1.8.
+# Generated by GNU Autoconf 2.69 for os-update 1.9.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -576,8 +576,8 @@
# Identity of this package.
PACKAGE_NAME='os-update'
PACKAGE_TARNAME='os-update'
-PACKAGE_VERSION='1.8'
-PACKAGE_STRING='os-update 1.8'
+PACKAGE_VERSION='1.9'
+PACKAGE_STRING='os-update 1.9'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1214,7 +1214,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 os-update 1.8 to adapt to many kinds of systems.
+\`configure' configures os-update 1.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1280,7 +1280,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of os-update 1.8:";;
+ short | recursive ) echo "Configuration of os-update 1.9:";;
esac
cat <<\_ACEOF
@@ -1370,7 +1370,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-os-update configure 1.8
+os-update configure 1.9
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1387,7 +1387,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by os-update $as_me 1.8, which was
+It was created by os-update $as_me 1.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2250,7 +2250,7 @@
# Define the identity of the package.
PACKAGE='os-update'
- VERSION='1.8'
+ VERSION='1.9'
cat >>confdefs.h <<_ACEOF
@@ -3124,7 +3124,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by os-update $as_me 1.8, which was
+This file was extended by os-update $as_me 1.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3177,7 +3177,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-os-update config.status 1.8
+os-update config.status 1.9
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.8/configure.ac
new/os-update-1.9/configure.ac
--- old/os-update-1.8/configure.ac 2022-12-21 11:51:05.000000000 +0100
+++ new/os-update-1.9/configure.ac 2023-01-13 14:22:24.000000000 +0100
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(os-update, 1.8)
+AC_INIT(os-update, 1.9)
AM_INIT_AUTOMAKE
AC_PREFIX_DEFAULT(/usr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.8/etc/default/systemd-status-mail
new/os-update-1.9/etc/default/systemd-status-mail
--- old/os-update-1.8/etc/default/systemd-status-mail 2022-12-21
11:50:42.000000000 +0100
+++ new/os-update-1.9/etc/default/systemd-status-mail 2023-01-13
14:13:32.000000000 +0100
@@ -1,6 +1,9 @@
# ADDRESS is the mail account to which the status mails should be send
ADDRESS=root@localhost
+# FROM is the mail account used as "From:" in the mail header
+#FROM=root@myhostname
+
# Set HOSTNAME if the system does not set it or if you need to override
# the system default
#HOSTNAME=myhostname
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.8/src/os-update.in
new/os-update-1.9/src/os-update.in
--- old/os-update-1.8/src/os-update.in 2022-12-19 13:14:11.000000000 +0100
+++ new/os-update-1.9/src/os-update.in 2023-01-13 13:48:40.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (C) 2020-2022 Thorsten Kukuk <ku...@thkukuk.de>
+# Copyright (C) 2020-2023 Thorsten Kukuk <ku...@thkukuk.de>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -56,8 +56,23 @@
}
check_and_reboot() {
- needs-restarting -r
- if [ $? -eq 1 ] || [ "$reboottrigger" = "yes" ]; then
+ if [ -x /usr/bin/needs-restarting ]; then
+ needs-restarting -r
+ if [ $? -eq 1 ] ; then
+ reboottrigger = "yes"
+ fi
+ else
+ release=$(uname -r)
+ flavor=${release##*-}
+ version=${release%-*}
+ for rpm in $(rpm -q kernel-${flavor}) ; do
+ installed=${rpm#kernel-${flavor}-}
+ if [[ ${installed} > ${version}.1.$(uname -m) ]] ; then
+ reboottrigger = "yes"
+ fi
+ done
+ fi
+ if [ "$reboottrigger" = "yes" ]; then
case "$REBOOT_CMD" in
"auto")
if [ -x /usr/sbin/rebootmgrctl ]; then
@@ -126,7 +141,7 @@
for service in $(zypper ps --print %s); do
for rebootservice in $SERVICES_TRIGGERING_REBOOT; do
if [ "$rebootservice" = "$service" ]; then
- log_info "$service triggers a reboot as it is excluded in
SERVICES_TRIGGERING_REBOOT"
+ log_info "$service triggers a reboot as it is included in
SERVICES_TRIGGERING_REBOOT"
reboottrigger="yes"
break
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.8/src/systemd-status-mail
new/os-update-1.9/src/systemd-status-mail
--- old/os-update-1.8/src/systemd-status-mail 2022-12-21 11:50:42.000000000
+0100
+++ new/os-update-1.9/src/systemd-status-mail 2023-01-13 14:21:01.000000000
+0100
@@ -19,6 +19,10 @@
HOSTNAME=${HOSTNAME:-$(hostname)}
+if [ -z "$FROM" ]; then
+ FROM="systemd <root@$HOSTNAME>"
+fi
+
if [ -z "${MAILER}" ]; then
if [ -x /usr/sbin/sendmail ]; then
MAILER="sendmail"
@@ -33,20 +37,20 @@
sendmail)
/usr/sbin/sendmail -t <<EOF
To: $1
-From: systemd <root@$HOSTNAME>
+From: $FROM
Subject: $2 ($HOSTNAME)
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
-$(systemctl status --lines=500 --full "$2")
+$(systemctl status --lines=500 --full "$2" 2>&1)
EOF
;;
mailx)
if [ -n "${RELAYHOST}" ]; then
RELAY="-Ssmtp=${RELAYHOST}"
fi
- mailx $MAILX_OPTIONS -Ssendwait -s "$2 ($HOSTNAME)" -r "systemd
<root@$HOSTNAME>" "$RELAY" "$1" <<EOF
-$(systemctl status --lines=500 --full "$2")
+ mailx $MAILX_OPTIONS -Ssendwait -s "$2 ($HOSTNAME)" -r "$FROM" "$RELAY"
"$1" <<EOF
+$(systemctl status --lines=500 --full "$2" 2>&1)
EOF
;;
*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.8/src/systemd-status-mail.8
new/os-update-1.9/src/systemd-status-mail.8
--- old/os-update-1.8/src/systemd-status-mail.8 2022-12-21 11:51:27.000000000
+0100
+++ new/os-update-1.9/src/systemd-status-mail.8 2023-01-13 14:14:45.000000000
+0100
@@ -1,5 +1,19 @@
-.\" Automatically generated by Pandoc 2.9.2.1
+.\" Automatically generated by Pandoc 2.17.1.1
.\"
+.\" Define V font for inline verbatim, using C font in formats
+.\" that render this, and otherwise B font.
+.ie "\f[CB]x\f[]"x" \{\
+. ftr V B
+. ftr VI BI
+. ftr VB B
+. ftr VBI BI
+.\}
+.el \{\
+. ftr V CR
+. ftr VI CI
+. ftr VB CB
+. ftr VBI CBI
+.\}
.TH "systemd-status-mail" "8" "" "" ""
.hy
.SH NAME
@@ -14,18 +28,21 @@
\f[B]/usr/lib/systemd/system/systemd-status-mail\[at].service\f[R]
.SH DESCRIPTION
.PP
-\f[C]systemd-mail-status\f[R] is called by
-\f[C]systemd-status-mail\[at].service\f[R] if the service is configured
+\f[V]systemd-mail-status\f[R] is called by
+\f[V]systemd-status-mail\[at].service\f[R] if the service is configured
for the \f[B]OnFailure\f[R] and/or \f[B]OnSuccess\f[R] case of a systemd
unit.
It sends an email to a configureable address with the name of the
service, the hostname and the output of
-\f[C]systemctl status --full <service>\f[R].
+\f[V]systemctl status --full <service>\f[R].
.SH CONFIGURATION OPTIONS
.TP
ADDRESS=\[lq]root\[at]localhost\[rq]
Address to which the status mail should be send.
.TP
+FROM=\[lq]root\[at]myhostname\[rq]
+Sender address of the status mail.
+.TP
HOSTNAME=\[lq]\[rq]
Name of the host used as domain for the from address
(root\[at]$HOSTNAME)
@@ -35,10 +52,10 @@
Valid values are \[lq]sendmail\[rq] and \[lq]mailx\[rq], by default
\[lq]sendmail\[rq] is used.
.TP
-RELAYHOST=\[dq]\[dq]
+RELAYHOST=\[lq]\[rq]
Mail relay used by mailx(1) if specified and not empty.
.TP
-MAILX_OPTIONS=\[dq]\[dq]
+MAILX_OPTIONS=\[lq]\[rq]
Additional options passed to mailx(1)
.SH CONFIGURATION FILES
.TP
@@ -52,8 +69,8 @@
.SH Example
.PP
To get informed if os-update(8) failed, create a file
-\f[C]status-mail.conf\f[R] in the
-\f[C]/etc/systemd/system/os-update.service.d/\f[R] directory with the
+\f[V]status-mail.conf\f[R] in the
+\f[V]/etc/systemd/system/os-update.service.d/\f[R] directory with the
content:
.IP
.nf
@@ -68,4 +85,4 @@
.PP
os-update(8), mailx(1), sendmail(1), postfix(1)
.SH AUTHORS
-Thorsten Kukuk \f[C]<kukuk\[at]thkukuk.de>\f[R].
+Thorsten Kukuk \f[V]<kukuk\[at]thkukuk.de>\f[R].
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.8/src/systemd-status-mail.8.md
new/os-update-1.9/src/systemd-status-mail.8.md
--- old/os-update-1.8/src/systemd-status-mail.8.md 2022-12-21
11:50:42.000000000 +0100
+++ new/os-update-1.9/src/systemd-status-mail.8.md 2023-01-13
14:14:42.000000000 +0100
@@ -23,6 +23,9 @@
ADDRESS="root@localhost"
: Address to which the status mail should be send.
+FROM="root@myhostname"
+: Sender address of the status mail.
+
HOSTNAME="<hostname>"
: Name of the host used as domain for the from address (root@$HOSTNAME)
