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 2024-01-18 21:54:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-update (Old) and /work/SRC/openSUSE:Factory/.os-update.new.16006 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-update" Thu Jan 18 21:54:39 2024 rev:20 rq:1139769 version:1.15 Changes: -------- --- /work/SRC/openSUSE:Factory/os-update/os-update.changes 2024-01-08 23:45:52.139635493 +0100 +++ /work/SRC/openSUSE:Factory/.os-update.new.16006/os-update.changes 2024-01-18 21:55:08.160536969 +0100 @@ -1,0 +2,7 @@ +Thu Jan 18 16:12:32 UTC 2024 - Thorsten Kukuk <ku...@suse.com> + +- Update to version 1.15 + - Add systemd generator for systemd-status-mail + - Add own user for status-mail service + +------------------------------------------------------------------- Old: ---- os-update-1.14.tar.xz New: ---- os-update-1.15.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-update.spec ++++++ --- /var/tmp/diff_new_pack.1Qmijz/_old 2024-01-18 21:55:08.824561083 +0100 +++ /var/tmp/diff_new_pack.1Qmijz/_new 2024-01-18 21:55:08.824561083 +0100 @@ -21,7 +21,7 @@ %endif Name: os-update -Version: 1.14 +Version: 1.15 Release: 0 Summary: Updates the system regularly to stay current and safe License: GPL-2.0-or-later @@ -29,6 +29,8 @@ Source: https://github.com/openSUSE/os-update/releases/download/v%{version}/os-update-%{version}.tar.xz Source99: os-update-rpmlintrc BuildRequires: pkgconfig +BuildRequires: sysuser-shadow +BuildRequires: sysuser-tools BuildRequires: pkgconfig(systemd) Requires: lsof %if 0%{?suse_version} >= 1500 @@ -54,6 +56,7 @@ %else Requires: mailx %endif +%sysusers_requires %description -n systemd-status-mail systemd-mail-status is called by systemd-status-mail@.service if the @@ -71,6 +74,7 @@ %define make_build %{__make} -O %{?_smp_mflags} %endif %make_build +%sysusers_generate_pre systemd/systemd-status-mail.conf systemd-status-mail systemd-status-mail.conf %install %make_install @@ -88,6 +92,8 @@ %postun %service_del_postun os-update.timer +%pre -n systemd-status-mail -f systemd-status-mail.pre + %files %license COPYING %doc README.md @@ -110,7 +116,9 @@ %endif %{_libexecdir}/systemd-status-mail %{_prefix}/lib/systemd/system/systemd-status-mail@.service +%{_prefix}/lib/systemd/system-generators/status-mail-generator.sh %{_mandir}/man8/systemd-status-mail.8%{?ext_man} %dir %{_datadir}/systemd-status-mail %{_datadir}/systemd-status-mail/status-mail.conf +%{_sysusersdir}/systemd-status-mail.conf ++++++ os-update-1.14.tar.xz -> os-update-1.15.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.14/Makefile.in new/os-update-1.15/Makefile.in --- old/os-update-1.14/Makefile.in 2023-11-24 14:20:30.000000000 +0100 +++ new/os-update-1.15/Makefile.in 2024-01-18 17:10:25.000000000 +0100 @@ -270,6 +270,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemgeneratordir = @systemdsystemgeneratordir@ systemdsystemunitdir = @systemdsystemunitdir@ sysusersdir = @sysusersdir@ target_alias = @target_alias@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.14/NEWS new/os-update-1.15/NEWS --- old/os-update-1.14/NEWS 2023-11-24 14:20:15.000000000 +0100 +++ new/os-update-1.15/NEWS 2024-01-17 15:40:09.000000000 +0100 @@ -1,3 +1,7 @@ +Version 1.15 + - Add systemd generator for systemd-status-mail + - Add own user for status-mail service + Version 1.14 - Fix check if rebootmgrctl is installed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.14/configure new/os-update-1.15/configure --- old/os-update-1.14/configure 2023-11-24 14:20:32.000000000 +0100 +++ new/os-update-1.15/configure 2024-01-18 17:10:27.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.14. +# Generated by GNU Autoconf 2.69 for os-update 1.15. # # # 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.14' -PACKAGE_STRING='os-update 1.14' +PACKAGE_VERSION='1.15' +PACKAGE_STRING='os-update 1.15' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -587,6 +587,7 @@ LN_S sysusersdir tmpfilesdir +systemdsystemgeneratordir systemdsystemunitdir PKG_CONFIG_LIBDIR PKG_CONFIG_PATH @@ -672,6 +673,7 @@ PKG_CONFIG_PATH PKG_CONFIG_LIBDIR systemdsystemunitdir +systemdsystemgeneratordir tmpfilesdir sysusersdir' @@ -1214,7 +1216,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.14 to adapt to many kinds of systems. +\`configure' configures os-update 1.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1280,7 +1282,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of os-update 1.14:";; + short | recursive ) echo "Configuration of os-update 1.15:";; esac cat <<\_ACEOF @@ -1301,6 +1303,9 @@ path overriding pkg-config's built-in search path systemdsystemunitdir value of systemdsystemunitdir for systemd, overriding pkg-config + systemdsystemgeneratordir + value of systemdsystemgeneratordir for systemd, overriding + pkg-config tmpfilesdir value of tmpfilesdir for systemd, overriding pkg-config sysusersdir value of sysusersdir for systemd, overriding pkg-config @@ -1370,7 +1375,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -os-update configure 1.14 +os-update configure 1.15 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1387,7 +1392,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.14, which was +It was created by os-update $as_me 1.15, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2250,7 +2255,7 @@ # Define the identity of the package. PACKAGE='os-update' - VERSION='1.14' + VERSION='1.15' cat >>confdefs.h <<_ACEOF @@ -2508,6 +2513,29 @@ as_fn_error $? "Could not determine value for 'systemdsystemunitdir' - is the 'systemd.pc' file installed?" "$LINENO" 5 fi +if test -n "$systemdsystemgeneratordir"; then + pkg_cv_systemdsystemgeneratordir="$systemdsystemgeneratordir" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "systemd") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_systemdsystemgeneratordir=`$PKG_CONFIG --variable="systemdsystemgeneratordir" "systemd" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +systemdsystemgeneratordir=$pkg_cv_systemdsystemgeneratordir + +if test "x$systemdsystemgeneratordir" = x""; then : + as_fn_error $? "Could not determine value for 'systemdsystemgeneratordir' - is the 'systemd.pc' file installed?" "$LINENO" 5 +fi + if test -n "$tmpfilesdir"; then pkg_cv_tmpfilesdir="$tmpfilesdir" elif test -n "$PKG_CONFIG"; then @@ -3124,7 +3152,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.14, which was +This file was extended by os-update $as_me 1.15, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3177,7 +3205,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.14 +os-update config.status 1.15 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.14/configure.ac new/os-update-1.15/configure.ac --- old/os-update-1.14/configure.ac 2023-11-24 14:20:22.000000000 +0100 +++ new/os-update-1.15/configure.ac 2024-01-18 17:10:08.000000000 +0100 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(os-update, 1.14) +AC_INIT(os-update, 1.15) AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr) @@ -15,6 +15,8 @@ PKG_CHECK_VAR([systemdsystemunitdir], [systemd], [systemdsystemunitdir], [], [AC_MSG_ERROR([Could not determine value for 'systemdsystemunitdir' - is the 'systemd.pc' file installed?])]) +PKG_CHECK_VAR([systemdsystemgeneratordir], [systemd], [systemdsystemgeneratordir], [], + [AC_MSG_ERROR([Could not determine value for 'systemdsystemgeneratordir' - is the 'systemd.pc' file installed?])]) PKG_CHECK_VAR([tmpfilesdir], [systemd], [tmpfilesdir], [], [AC_MSG_ERROR([Could not determine value for 'tmpfilesdir' - is the 'systemd.pc' file installed?])]) PKG_CHECK_VAR([sysusersdir], [systemd], [sysusersdir], [], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.14/etc/default/systemd-status-mail new/os-update-1.15/etc/default/systemd-status-mail --- old/os-update-1.14/etc/default/systemd-status-mail 2023-04-28 11:44:55.000000000 +0200 +++ new/os-update-1.15/etc/default/systemd-status-mail 2024-01-18 17:09:58.000000000 +0100 @@ -1,5 +1,5 @@ # ADDRESS is the mail account to which the status mails should be send -ADDRESS=root@localhost +ADDRESS= # FROM is the mail account used as "From:" in the mail header #FROM=root@myhostname @@ -14,5 +14,17 @@ # RELAYHOST specifies the mail relay used by mailx if specified #RELAYHOST=relay.example.com +# If the RELAYHOST requires authentication set the username here +#MAILX_AUTH_USER= + +# If the RELAYHOST requires authentication set the password here +# NOTE: If you have to set this field you should take additional +# security measures and restrict access. The file should only be +# readable by the "systemd-status-mail" user. +#MAILX_AUTH_PASSWORD= + # MAILX_OPTIONS specifies additional options for mailx #MAILX_OPTIONS="-Sverbose ..." + +# Space separated list of services where an email is sent on failure +SEND_ON_FAILURE="transactional-update.service" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.14/src/Makefile.in new/os-update-1.15/src/Makefile.in --- old/os-update-1.14/src/Makefile.in 2023-11-24 14:20:30.000000000 +0100 +++ new/os-update-1.15/src/Makefile.in 2024-01-18 17:10:25.000000000 +0100 @@ -225,6 +225,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemgeneratordir = @systemdsystemgeneratordir@ systemdsystemunitdir = @systemdsystemunitdir@ sysusersdir = @sysusersdir@ target_alias = @target_alias@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.14/src/systemd-status-mail new/os-update-1.15/src/systemd-status-mail --- old/os-update-1.14/src/systemd-status-mail 2023-04-28 11:44:55.000000000 +0200 +++ new/os-update-1.15/src/systemd-status-mail 2024-01-18 17:09:58.000000000 +0100 @@ -1,12 +1,7 @@ #!/bin/sh -if [ "$#" -ne 2 ]; then - echo "Usage: $0 <mail address> <systemd unit>" >&2 - exit 1 -fi - -if [ -z "$1" ]; then - echo "$0: <mail address> is empty!" >&2 +if [ "$#" -lt 1 -o "$#" -gt 2 ]; then + echo "Usage: $0 <systemd unit> [<mail address>]" >&2 exit 1 fi @@ -18,6 +13,14 @@ include /etc/default/systemd-status-mail HOSTNAME=${HOSTNAME:-$(hostname)} +SERVICE="$1" +if [ -n "$2" ]; then + TO="$2" +elif [ -n "$ADDRESS" ]; then + TO="$ADDRESS" +else + TO="root@localhost" +fi if [ -z "$FROM" ]; then FROM="systemd <root@$HOSTNAME>" @@ -36,22 +39,32 @@ case $MAILER in sendmail) /usr/sbin/sendmail -t <<EOF -To: $1 +To: $TO From: $FROM -Subject: $2 ($HOSTNAME) +Subject: $SERVICE ($HOSTNAME) Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 -$(systemctl status --lines=500 --full "$2" 2>&1) +$(systemctl status --lines=500 --full "$SERVICE" 2>&1) EOF ;; mailx) + MAILRC=`mktemp --tmpdir systemd-status-mail-mailx-conf.XXXXXXXXXX` || exit 1 + export MAILRC + echo "set sendwait" >> $MAILRC if [ -n "${RELAYHOST}" ]; then - RELAY="-Ssmtp=${RELAYHOST}" + echo "set smtp=${RELAYHOST@Q}" >> $MAILRC + fi + if [ -n "${MAILX_AUTH_USER}" ]; then + echo "set smtp-auth-user=${MAILX_AUTH_USER@Q}" >> $MAILRC + fi + if [ -n "${MAILX_AUTH_PASSWORD}" ]; then + echo "set smtp-auth-password=${MAILX_AUTH_PASSWORD@Q}" >> $MAILRC fi - mailx $MAILX_OPTIONS -Ssendwait -s "$2 ($HOSTNAME)" -r "$FROM" "$RELAY" "$1" <<EOF -$(systemctl status --lines=500 --full "$2" 2>&1) + mailx $MAILX_OPTIONS -s "$SERVICE ($HOSTNAME)" -r "$FROM" "$TO" <<EOF +$(systemctl status --lines=500 --full "$SERVICE" 2>&1) EOF + rm $MAILRC ;; *) echo "ERROR: \"$MAILER\" is not a valid entry!" >&2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.14/systemd/Makefile.am new/os-update-1.15/systemd/Makefile.am --- old/os-update-1.14/systemd/Makefile.am 2023-04-28 11:44:55.000000000 +0200 +++ new/os-update-1.15/systemd/Makefile.am 2024-01-17 15:47:24.000000000 +0100 @@ -2,18 +2,25 @@ systemdsystemunit_DATA = os-update.timer os-update.service \ systemd-status-mail@.service -maildatadir=${datadir}/systemd-status-mail +systemdsystemgenerator_SCRIPTS = status-mail-generator.sh +sysusers_DATA = systemd-status-mail.conf +maildatadir=${datadir}/systemd-status-mail maildata_DATA = status-mail.conf EXTRA_DIST = os-update.timer os-update.service.in status-mail.conf \ - systemd-status-m...@.service.in + status-mail-generator.sh.in systemd-status-m...@.service.in \ + systemd-status-mail.conf -CLEANFILES = os-update.service systemd-status-mail@.service +CLEANFILES = os-update.service status-mail-generator.sh \ + systemd-status-mail@.service os-update.service: os-update.service.in sed -e 's|@libexec@|$(libexecdir)|g' $< > $@ +status-mail-generator.sh: status-mail-generator.sh.in + sed -e 's|@maildatadir@|$(maildatadir)|g' $< > $@ + systemd-status-mail@.service: systemd-status-m...@.service.in sed -e 's|@libexec@|$(libexecdir)|g' $< > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.14/systemd/Makefile.in new/os-update-1.15/systemd/Makefile.in --- old/os-update-1.14/systemd/Makefile.in 2023-11-24 14:20:30.000000000 +0100 +++ new/os-update-1.15/systemd/Makefile.in 2024-01-18 17:10:25.000000000 +0100 @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -95,25 +96,6 @@ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -141,9 +123,30 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(maildatadir)" \ - "$(DESTDIR)$(systemdsystemunitdir)" -DATA = $(maildata_DATA) $(systemdsystemunit_DATA) +am__installdirs = "$(DESTDIR)$(systemdsystemgeneratordir)" \ + "$(DESTDIR)$(maildatadir)" "$(DESTDIR)$(systemdsystemunitdir)" \ + "$(DESTDIR)$(sysusersdir)" +SCRIPTS = $(systemdsystemgenerator_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +DATA = $(maildata_DATA) $(systemdsystemunit_DATA) $(sysusers_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -220,6 +223,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemgeneratordir = @systemdsystemgeneratordir@ systemdsystemunitdir = @systemdsystemunitdir@ sysusersdir = @sysusersdir@ target_alias = @target_alias@ @@ -231,12 +235,17 @@ systemdsystemunit_DATA = os-update.timer os-update.service \ systemd-status-mail@.service +systemdsystemgenerator_SCRIPTS = status-mail-generator.sh +sysusers_DATA = systemd-status-mail.conf maildatadir = ${datadir}/systemd-status-mail maildata_DATA = status-mail.conf EXTRA_DIST = os-update.timer os-update.service.in status-mail.conf \ - systemd-status-m...@.service.in + status-mail-generator.sh.in systemd-status-m...@.service.in \ + systemd-status-mail.conf + +CLEANFILES = os-update.service status-mail-generator.sh \ + systemd-status-mail@.service -CLEANFILES = os-update.service systemd-status-mail@.service all: all-am .SUFFIXES: @@ -269,6 +278,41 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +install-systemdsystemgeneratorSCRIPTS: $(systemdsystemgenerator_SCRIPTS) + @$(NORMAL_INSTALL) + @list='$(systemdsystemgenerator_SCRIPTS)'; test -n "$(systemdsystemgeneratordir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(systemdsystemgeneratordir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(systemdsystemgeneratordir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n' \ + -e 'h;s|.*|.|' \ + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ + if (++n[d] == $(am__install_max)) { \ + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ + else { print "f", d "/" $$4, $$1 } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(systemdsystemgeneratordir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(systemdsystemgeneratordir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-systemdsystemgeneratorSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(systemdsystemgenerator_SCRIPTS)'; test -n "$(systemdsystemgeneratordir)" || exit 0; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 's,.*/,,;$(transform)'`; \ + dir='$(DESTDIR)$(systemdsystemgeneratordir)'; $(am__uninstall_files_from_dir) install-maildataDATA: $(maildata_DATA) @$(NORMAL_INSTALL) @list='$(maildata_DATA)'; test -n "$(maildatadir)" || list=; \ @@ -311,6 +355,27 @@ @list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(systemdsystemunitdir)'; $(am__uninstall_files_from_dir) +install-sysusersDATA: $(sysusers_DATA) + @$(NORMAL_INSTALL) + @list='$(sysusers_DATA)'; test -n "$(sysusersdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sysusersdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sysusersdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysusersdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(sysusersdir)" || exit $$?; \ + done + +uninstall-sysusersDATA: + @$(NORMAL_UNINSTALL) + @list='$(sysusers_DATA)'; test -n "$(sysusersdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(sysusersdir)'; $(am__uninstall_files_from_dir) tags TAGS: ctags CTAGS: @@ -350,9 +415,9 @@ done check-am: all-am check: check-am -all-am: Makefile $(DATA) +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(maildatadir)" "$(DESTDIR)$(systemdsystemunitdir)"; do \ + for dir in "$(DESTDIR)$(systemdsystemgeneratordir)" "$(DESTDIR)$(maildatadir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(sysusersdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -406,7 +471,9 @@ info-am: -install-data-am: install-maildataDATA install-systemdsystemunitDATA +install-data-am: install-maildataDATA \ + install-systemdsystemgeneratorSCRIPTS \ + install-systemdsystemunitDATA install-sysusersDATA install-dvi: install-dvi-am @@ -450,7 +517,9 @@ ps-am: -uninstall-am: uninstall-maildataDATA uninstall-systemdsystemunitDATA +uninstall-am: uninstall-maildataDATA \ + uninstall-systemdsystemgeneratorSCRIPTS \ + uninstall-systemdsystemunitDATA uninstall-sysusersDATA .MAKE: install-am install-strip @@ -461,11 +530,13 @@ install-exec-am install-html install-html-am install-info \ install-info-am install-maildataDATA install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ - install-systemdsystemunitDATA installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags-am \ - uninstall uninstall-am uninstall-maildataDATA \ - uninstall-systemdsystemunitDATA + install-systemdsystemgeneratorSCRIPTS \ + install-systemdsystemunitDATA install-sysusersDATA \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-am \ + uninstall-maildataDATA uninstall-systemdsystemgeneratorSCRIPTS \ + uninstall-systemdsystemunitDATA uninstall-sysusersDATA .PRECIOUS: Makefile @@ -473,6 +544,9 @@ os-update.service: os-update.service.in sed -e 's|@libexec@|$(libexecdir)|g' $< > $@ +status-mail-generator.sh: status-mail-generator.sh.in + sed -e 's|@maildatadir@|$(maildatadir)|g' $< > $@ + systemd-status-mail@.service: systemd-status-m...@.service.in sed -e 's|@libexec@|$(libexecdir)|g' $< > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.14/systemd/status-mail-generator.sh.in new/os-update-1.15/systemd/status-mail-generator.sh.in --- old/os-update-1.14/systemd/status-mail-generator.sh.in 1970-01-01 01:00:00.000000000 +0100 +++ new/os-update-1.15/systemd/status-mail-generator.sh.in 2024-01-17 15:18:25.000000000 +0100 @@ -0,0 +1,21 @@ +#!/bin/sh + +unitdir="${1:?}" + +if [ -e /usr/etc/default/systemd-status-mail ]; then + . /usr/etc/default/systemd-status-mail +fi +if [ -e /etc/default/systemd-status-mail ]; then + . /etc/default/systemd-status-mail +fi + +if [ -z "${ADDRESS}" ]; then + echo "No email address configured for status mails - skipping." + exit 0 +fi + +for service in ${SEND_ON_FAILURE}; do + dropindir="${unitdir}/${service}.d/" + mkdir -p "${dropindir}" || exit 1 + ln -s @maildatadir@/status-mail.conf "${dropindir}" +done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.14/systemd/systemd-status-mail.conf new/os-update-1.15/systemd/systemd-status-mail.conf --- old/os-update-1.14/systemd/systemd-status-mail.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/os-update-1.15/systemd/systemd-status-mail.conf 2024-01-17 15:36:26.000000000 +0100 @@ -0,0 +1,2 @@ +# Type Name ID GECOS [HOME] +u systemd-status-mail - "systemd-status-mail user" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.14/systemd/systemd-status-m...@.service.in new/os-update-1.15/systemd/systemd-status-m...@.service.in --- old/os-update-1.14/systemd/systemd-status-m...@.service.in 2023-04-28 11:44:55.000000000 +0200 +++ new/os-update-1.15/systemd/systemd-status-m...@.service.in 2024-01-18 17:09:58.000000000 +0100 @@ -6,8 +6,6 @@ [Service] Type=oneshot -EnvironmentFile=-/usr/etc/default/systemd-status-mail -EnvironmentFile=-/etc/default/systemd-status-mail -ExecStart=@libexec@/systemd-status-mail ${ADDRESS} %i -User=nobody +ExecStart=@libexec@/systemd-status-mail %i +User=systemd-status-mail Group=systemd-journal
