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 2022-12-21 16:07:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-update (Old)
 and      /work/SRC/openSUSE:Factory/.os-update.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "os-update"

Wed Dec 21 16:07:21 2022 rev:10 rq:1044056 version:1.8

Changes:
--------
--- /work/SRC/openSUSE:Factory/os-update/os-update.changes      2022-12-19 
15:02:43.435783094 +0100
+++ /work/SRC/openSUSE:Factory/.os-update.new.1835/os-update.changes    
2022-12-21 16:07:21.814788439 +0100
@@ -1,0 +2,12 @@
+Wed Dec 21 10:53:22 UTC 2022 - Thorsten Kukuk <ku...@suse.com>
+
+- Update to Version 1.8
+  - Allow to specify additional options for mailx
+
+-------------------------------------------------------------------
+Wed Dec 21 10:17:01 UTC 2022 - Johannes Kastl <ka...@b1-systems.de>
+
+- if sysconfdir is being used on older SLES/Leap versions,
+  mark the config file as %config(noreplace)
+
+-------------------------------------------------------------------

Old:
----
  os-update-1.7.tar.xz

New:
----
  os-update-1.8.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ os-update.spec ++++++
--- /var/tmp/diff_new_pack.ruib1i/_old  2022-12-21 16:07:22.302791071 +0100
+++ /var/tmp/diff_new_pack.ruib1i/_new  2022-12-21 16:07:22.310791113 +0100
@@ -21,9 +21,9 @@
 %endif
 
 Name:           os-update
-Version:        1.7
+Version:        1.8
 Release:        0
-Summary:        Updates the system regular to stay current and safe
+Summary:        Updates the system regularly to stay current and safe
 License:        GPL-2.0-or-later
 URL:            https://github.com/thkukuk/os-update
 Source:         
https://github.com/thkukuk/os-update/releases/download/v%{version}/os-update-%{version}.tar.xz
@@ -86,7 +86,11 @@
 
 %files -n systemd-status-mail
 %license COPYING
+%if 0%{?suse_version} < 1550
+%config(noreplace) %{_sysconfdir}/default/systemd-status-mail
+%else
 %{_distconfdir}/default/systemd-status-mail
+%endif
 %{_libexecdir}/systemd-status-mail
 %{_prefix}/lib/systemd/system/systemd-status-mail@.service
 %{_mandir}/man8/systemd-status-mail.8%{?ext_man}

++++++ os-update-1.7.tar.xz -> os-update-1.8.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/os-update-1.7/NEWS new/os-update-1.8/NEWS
--- old/os-update-1.7/NEWS      2022-12-19 13:16:00.000000000 +0100
+++ new/os-update-1.8/NEWS      2022-12-21 11:51:05.000000000 +0100
@@ -1,3 +1,6 @@
+Version 1.8
+ - Allow to specify additional options for mailx
+
 Version 1.7
  - Fix detection of running rebootmgrd
  - Add SERVICES_TRIGGERING_REBOOT (#2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/os-update-1.7/configure new/os-update-1.8/configure
--- old/os-update-1.7/configure 2022-12-19 13:16:04.000000000 +0100
+++ new/os-update-1.8/configure 2022-12-21 11:51:26.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.7.
+# Generated by GNU Autoconf 2.69 for os-update 1.8.
 #
 #
 # 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.7'
-PACKAGE_STRING='os-update 1.7'
+PACKAGE_VERSION='1.8'
+PACKAGE_STRING='os-update 1.8'
 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.7 to adapt to many kinds of systems.
+\`configure' configures os-update 1.8 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.7:";;
+     short | recursive ) echo "Configuration of os-update 1.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1290,8 +1290,8 @@
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-vendordir=DIR  Direcotry for distribution provided configuration
-                          files
+  --enable-vendordir=DIR  Directory for configuration files provided by the
+                          distribution
 
 Some influential environment variables:
   PKG_CONFIG  path to pkg-config utility
@@ -1370,7 +1370,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-os-update configure 1.7
+os-update configure 1.8
 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.7, which was
+It was created by os-update $as_me 1.8, 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.7'
+ VERSION='1.8'
 
 
 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.7, which was
+This file was extended by os-update $as_me 1.8, 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.7
+os-update config.status 1.8
 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.7/configure.ac 
new/os-update-1.8/configure.ac
--- old/os-update-1.7/configure.ac      2022-12-19 13:14:50.000000000 +0100
+++ new/os-update-1.8/configure.ac      2022-12-21 11:51:05.000000000 +0100
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(os-update, 1.7)
+AC_INIT(os-update, 1.8)
 AM_INIT_AUTOMAKE
 AC_PREFIX_DEFAULT(/usr)
 
@@ -7,7 +7,7 @@
 AC_SUBST(VERSION)
 
 AC_ARG_ENABLE([vendordir],
-  AS_HELP_STRING([--enable-vendordir=DIR], [Direcotry for distribution 
provided configuration files]),,
+  AS_HELP_STRING([--enable-vendordir=DIR], [Directory for configuration files 
provided by the distribution]),,
   []
 )
 AC_SUBST([vendordir], [$enable_vendordir])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/os-update-1.7/etc/default/systemd-status-mail 
new/os-update-1.8/etc/default/systemd-status-mail
--- old/os-update-1.7/etc/default/systemd-status-mail   2022-11-06 
20:56:14.000000000 +0100
+++ new/os-update-1.8/etc/default/systemd-status-mail   2022-12-21 
11:50:42.000000000 +0100
@@ -10,3 +10,6 @@
 
 # RELAYHOST specifies the mail relay used by mailx if specified
 #RELAYHOST=relay.example.com
+
+# MAILX_OPTIONS specifies additional options for mailx
+#MAILX_OPTIONS="-Sverbose ..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/os-update-1.7/src/systemd-status-mail 
new/os-update-1.8/src/systemd-status-mail
--- old/os-update-1.7/src/systemd-status-mail   2022-11-09 14:59:18.000000000 
+0100
+++ new/os-update-1.8/src/systemd-status-mail   2022-12-21 11:50:42.000000000 
+0100
@@ -45,8 +45,12 @@
        if [ -n "${RELAYHOST}" ]; then
            RELAY="-Ssmtp=${RELAYHOST}"
        fi
-       mailx -Ssendwait -s "$2 ($HOSTNAME)" -r "systemd <root@$HOSTNAME>" 
"$RELAY" "$1" <<EOF
+       mailx $MAILX_OPTIONS -Ssendwait -s "$2 ($HOSTNAME)" -r "systemd 
<root@$HOSTNAME>" "$RELAY" "$1" <<EOF
 $(systemctl status --lines=500 --full "$2")
 EOF
        ;;
+    *)
+       echo "ERROR: \"$MAILER\" is not a valid entry!" >&2
+       echo "       Only \"sendmail\" and \"mailx\" are." >&2
+       ;;
 esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/os-update-1.7/src/systemd-status-mail.8 
new/os-update-1.8/src/systemd-status-mail.8
--- old/os-update-1.7/src/systemd-status-mail.8 2022-11-10 16:23:27.000000000 
+0100
+++ new/os-update-1.8/src/systemd-status-mail.8 2022-12-21 11:51:27.000000000 
+0100
@@ -36,7 +36,10 @@
 \[lq]sendmail\[rq] is used.
 .TP
 RELAYHOST=\[dq]\[dq]
-Mail relay used by mailx if specified and not empty.
+Mail relay used by mailx(1) if specified and not empty.
+.TP
+MAILX_OPTIONS=\[dq]\[dq]
+Additional options passed to mailx(1)
 .SH CONFIGURATION FILES
 .TP
 /usr/etc/default/systemd-status-mail
@@ -63,6 +66,6 @@
 Everytime the os-update.service fails, a mail is send.
 .SH SEE ALSO
 .PP
-os-update(8)
+os-update(8), mailx(1), sendmail(1), postfix(1)
 .SH AUTHORS
 Thorsten Kukuk \f[C]<kukuk\[at]thkukuk.de>\f[R].
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/os-update-1.7/src/systemd-status-mail.8.md 
new/os-update-1.8/src/systemd-status-mail.8.md
--- old/os-update-1.7/src/systemd-status-mail.8.md      2022-11-10 
16:23:01.000000000 +0100
+++ new/os-update-1.8/src/systemd-status-mail.8.md      2022-12-21 
11:50:42.000000000 +0100
@@ -31,7 +31,10 @@
 and "mailx", by default "sendmail" is used.
 
 RELAYHOST=""
-: Mail relay used by mailx if specified and not empty.
+: Mail relay used by mailx(1) if specified and not empty.
+
+MAILX_OPTIONS=""
+: Additional options passed to mailx(1)
 
 # CONFIGURATION FILES
 
@@ -57,4 +60,4 @@
 Everytime the os-update.service fails, a mail is send.
 
 # SEE ALSO
-os-update(8)
+os-update(8), mailx(1), sendmail(1), postfix(1)

Reply via email to