Hello community, here is the log from the commit of package mailgraph for openSUSE:Factory checked in at 2019-12-31 10:28:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailgraph (Old) and /work/SRC/openSUSE:Factory/.mailgraph.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailgraph" Tue Dec 31 10:28:26 2019 rev:6 rq:760090 version:1.14 Changes: -------- --- /work/SRC/openSUSE:Factory/mailgraph/mailgraph.changes 2019-08-09 16:54:44.529449169 +0200 +++ /work/SRC/openSUSE:Factory/.mailgraph.new.6675/mailgraph.changes 2019-12-31 10:28:37.158957148 +0100 @@ -1,0 +2,12 @@ +Mon Dec 30 22:21:33 UTC 2019 - [email protected] + +- fix for boo#1138214 + * fix filling of empty sysconfig vars + - MAILGRAPH_LOG_TYPE="syslog" + - MAILGRAPH_LOG_FILE="/var/log/mail" + * remove '-d' option from MAILGRAPH_OPTS + - MAILGRAPH_OPTS=" -v" +- fix sysconfig file + * for systemd there needs to be a [SPACE] before first option + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailgraph.spec ++++++ --- /var/tmp/diff_new_pack.phedfL/_old 2019-12-31 10:28:41.058958948 +0100 +++ /var/tmp/diff_new_pack.phedfL/_new 2019-12-31 10:28:41.106958969 +0100 @@ -1,7 +1,7 @@ # # spec file for package mailgraph # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ Summary: RRDtool frontend for Mail statistics License: GPL-2.0-or-later Group: Productivity/Networking/Diagnostic -Url: http://mailgraph.schweikert.ch/ +URL: http://mailgraph.schweikert.ch/ Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.init Source2: %{name}.service @@ -113,6 +113,12 @@ %endif %pre +if [[ -f %{_sysconfdir}/sysconfig/%{name} ]]; then + sed -i -e 's#^MAILGRAPH_OPTS=" -d -v"$#MAILGRAPH_OPTS=" -v"#'\ + -e 's#^MAILGRAPH_LOG_TYPE=""$#MAILGRAPH_LOG_TYPE="syslog"#'\ + -e 's#^MAILGRAPH_LOG_FILE=""#MAILGRAPH_LOG_FILE="/var/log/mail"#'\ + %{_sysconfdir}/sysconfig/%{name} +fi %if 0%{?has_systemd} %service_add_pre %{name}.service %endif @@ -129,7 +135,7 @@ %service_add_post %{name}.service %{fillup_only mailgraph} %else -%{fillup_and_insserv -f mailgraph} +%{fillup_and_insserv mailgraph} install -d %{_localstatedir}/run/%{name} %endif ++++++ mailgraph.sysconfig ++++++ --- /var/tmp/diff_new_pack.phedfL/_old 2019-12-31 10:28:42.286959514 +0100 +++ /var/tmp/diff_new_pack.phedfL/_new 2019-12-31 10:28:42.298959519 +0100 @@ -16,9 +16,8 @@ ## --rbl-is-spam count rbl rejects as spam ## --virbl-is-virus count virbl rejects as viruses # -## for systemd there needs to be a [SPACE] before first option -# -MAILGRAPH_OPTS="-v" +## !!! for systemd there needs to be a [SPACE] before first option !!! +MAILGRAPH_OPTS=" -v" ## Type: string ## Default: "/var/run/mailgraph.pid"
