Hello community, here is the log from the commit of package postgrey for openSUSE:Factory checked in at 2019-12-31 10:28:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postgrey (Old) and /work/SRC/openSUSE:Factory/.postgrey.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "postgrey" Tue Dec 31 10:28:19 2019 rev:36 rq:760081 version:1.37 Changes: -------- --- /work/SRC/openSUSE:Factory/postgrey/postgrey.changes 2017-11-24 10:56:11.540511814 +0100 +++ /work/SRC/openSUSE:Factory/.postgrey.new.6675/postgrey.changes 2019-12-31 10:28:28.486953149 +0100 @@ -1,0 +2,9 @@ +Mon Dec 30 20:44:45 UTC 2019 - [email protected] + +- fix for boo#1115454 + * rename postgrey_daily_greylist.crontab + to postgrey_daily_greylist.sh + * add postgrey_daily_greylist.service + and postgrey_daily_greylist.timer + +------------------------------------------------------------------- Old: ---- postgrey_daily_greylist.crontab New: ---- postgrey_daily_greylist.service postgrey_daily_greylist.sh postgrey_daily_greylist.timer ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postgrey.spec ++++++ --- /var/tmp/diff_new_pack.psBhB6/_old 2019-12-31 10:28:31.866954708 +0100 +++ /var/tmp/diff_new_pack.psBhB6/_new 2019-12-31 10:28:31.866954708 +0100 @@ -1,7 +1,7 @@ # # spec file for package postgrey # -# Copyright (c) 2017 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,17 +25,19 @@ Version: 1.37 Release: 0 Summary: Postfix greylisting policy server -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/Email/Utilities -Url: http://postgrey.schweikert.ch/ +URL: http://postgrey.schweikert.ch/ Source0: http://postgrey.schweikert.ch/pub/%{name}-%{version}.tar.gz Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.README.SUSE -Source4: %{name}_daily_greylist.crontab # http://hg.schweikert.ch/dispatch.fcgi/postgrey-1.x/raw-file/ca06ef218498/postgrey_clients_dump Source5: postgrey_clients_dump Source6: %{name}.service +Source7: %{name}_daily_greylist.service +Source8: %{name}_daily_greylist.timer +Source9: %{name}_daily_greylist.sh # PATCH-FIX-OPENSUSE -- Adapt default config and documentation to pathnames for openSUSE # /etc/postfix => /etc/postgrey # /var/spool/postfix/postgrey => /var/lib/postgrey @@ -88,6 +90,10 @@ %setup -q test -d examples || mkdir examples cp %{SOURCE5} examples/ +test -d timer || mkdir timer +cp -a %{SOURCE7} timer/ +cp -a %{SOURCE8} timer/ +cp -a %{SOURCE9} timer/ %patch0 %patch1 %patch2 @@ -129,8 +135,6 @@ install -d %{buildroot}/%{_localstatedir}/lib/%{name} # directory for socket install -d -m 0775 %{buildroot}/%{_localstatedir}/spool/postfix/%{name} -# some helper tools -install -m 0644 %{SOURCE4} . %pre getent passwd %{name} >/dev/null || useradd -r -g nogroup -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "Postgrey Daemon" %{name} @@ -163,6 +167,8 @@ %files %defattr(-,root,root) +%doc Changes COPYING README README.SUSE +%doc examples timer %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/whitelist_recipients %config(noreplace) %{_sysconfdir}/%{name}/whitelist_clients @@ -174,7 +180,6 @@ %{_fillupdir}/sysconfig.%{name} %dir %attr(0770,postgrey,postfix) %{_localstatedir}/spool/postfix/%{name} %doc %{_mandir}/man?/* -%doc Changes COPYING README README.SUSE examples %{name}_daily_greylist.crontab %if 0%{?suse_version} > 1210 %{_unitdir}/%{name}.service %else ++++++ postgrey_daily_greylist.service ++++++ [Unit] Description=searches for relevant entries in mail log, generates a daily report from this data, and sends them in a (human) readable to specified user [Service] Type=oneshot ExecStart=/bin/bash /usr/lib/postgrey/postgrey_daily_greylist ++++++ postgrey_daily_greylist.sh ++++++ #!/bin/bash # # (c) Copyright Klaus Singvogel, 2008 # All rights reserved. # # This script searches for relevant entries in mail log, generates # a daily report from this data, and sends them in a (human) readable # to specified user # # suggested to use with cron, before the logfiles got rotated by # logrotate mechanism (otherwise bzcat/zcat has to be used) # reference to variable DAILY_TIME in /etc/sysconfig/cron when the # logfiles got rotate (exceptions to this rule possible) # variables to modify to personal settings reciepient=postmaster logfile=/var/log/mail report_flags="--check_sender=mx,a" # report_flags='--separate_by_subnet=":==================\n" --nosingle_line --check_sender=mx,a' # better, not to modify these variables TEMPFILE=$(mktemp "/tmp/greylist.XXXXXX") || exit 1 # for compressed logfiles... today=`date +"%Y%m%d"` yesterday=`date -d yesterday +"%Y%m%d"` ## ## Attention! This script has changed to work with ## rsyslog on an openSUSE >= 12.3 called ## MINIMAL SERVER SELECTION ## # Set date format to search value as your need's # RSYSLOG: # a RFC5424 logline start with yyyy-mm-dd # (e.g. 2015-08-15 ) comment out the next line # searchValue=`date -d yesterday +"%F"` # SYSLOG-NG: # a RFC3164 logline start with locale's abbreviated month # (e.g. Jan 1 ) comment out the next line searchValue=`date -d yesterday +"%b %2e"` if [ ! -r "$logfile" ]; then echo "no logfile $logfile" | \ mail -s "greylist: no greylisted host" $reciepient rm $TEMPFILE exit 1 fi if [ -z "$logfile" ]; then echo "empty logfile $logfile" | \ mail -s "greylist: no greylisted host" $reciepient rm $TEMPFILE exit 1 fi if [ -r "$logfile"-"$today".xz ]; then ( cat "$logfile"; xzcat "$logfile"-"$today".xz; ) |\ grep "postgrey\|[gG]reylist" | \ grep "$searchValue" > $TEMPFILE elif [ -r "$logfile"-"$yesterday".xz ]; then ( cat "$logfile"; xzcat "$logfile"-"$yesterday".xz; ) |\ grep "postgrey\|[gG]reylist" | \ grep "$searchValue" > $TEMPFILE else cat "$logfile" | \ grep "postgrey\|[gG]reylist" | \ grep "$searchValue" > $TEMPFILE fi if [ `wc -l < $TEMPFILE` -gt 1 ]; then /usr/sbin/postgreyreport "$report_flags" < $TEMPFILE | \ mail -s "greylist: yesterdays greylisted host" $reciepient else ( echo "no entries >$date< found in logfile $logfile" ; date; echo ""; ls -ls $logfile; echo ""; ls -ls $TEMPFILE; echo ""; ) | \ mail -s "greylist: no greylisted hosts" $reciepient fi rm $TEMPFILE ++++++ postgrey_daily_greylist.timer ++++++ [Unit] Description=searches for relevant entries in mail log, generates a daily report from this data, and sends them in a (human) readable to specified user #Documentation=none Before=logrotate.timer [Timer] OnCalendar=daily AccuracySec=12h Persistent=true [Install] WantedBy=timers.target
