Hello community, here is the log from the commit of package postgrey for openSUSE:Factory checked in at 2015-01-29 09:56:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postgrey (Old) and /work/SRC/openSUSE:Factory/.postgrey.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "postgrey" Changes: -------- --- /work/SRC/openSUSE:Factory/postgrey/postgrey.changes 2014-02-13 15:02:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.postgrey.new/postgrey.changes 2015-01-29 09:56:16.000000000 +0100 @@ -1,0 +2,23 @@ +Mon Jan 19 14:17:23 UTC 2015 - [email protected] + +- Replace postgrey-1.34-config.patch with postgrey-1.35-config.patch + which was updated to correctly apply to current release +- Build as noarch since there are now architecture dependend + components +- Don't install init scripts when systemd is used +- Create rcpostgrey also when systemd is used +- Misc spec file cleanups +- Remove unnecessary echo from unit file +- Remove condition for suggesting cron since all current releases + already have cron + +------------------------------------------------------------------- +Wed Jun 25 13:08:07 UTC 2014 - [email protected] + +- Update to 1.35 + - use just 'postgrey' as process name, instead of '/usr/sbin/postgrey', because + Linux tools are limited to 15 characters (#5) + - Make postgrey work with Perl 5.18 (Yasuhiro KIMURA, #4) + - updated whitelist + +------------------------------------------------------------------- Old: ---- postgrey-1.34-config.patch postgrey-1.34.tar.gz New: ---- postgrey-1.35-config.patch postgrey-1.35.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postgrey.spec ++++++ --- /var/tmp/diff_new_pack.FlOl6u/_old 2015-01-29 09:56:17.000000000 +0100 +++ /var/tmp/diff_new_pack.FlOl6u/_new 2015-01-29 09:56:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package postgrey # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,7 @@ Name: postgrey -BuildRequires: postfix -Requires: perl >= 5.6.0 -Requires: perl-BerkeleyDB -Requires: perl-IO-Multiplex -Requires: perl-Net-DNS -Requires: perl-Net-Server -%if 0%{?suse_version} >= 1000 -Suggests: cron -%endif -Version: 1.34 +Version: 1.35 Release: 0 Summary: Postfix greylisting policy server License: GPL-2.0+ @@ -43,15 +34,24 @@ # PATCH-FIX-OPENSUSE -- Adapt default config and documentation to pathnames for openSUSE # /etc/postfix => /etc/postgrey # /var/spool/postfix/postgrey => /var/lib/postgrey -Patch0: %{name}-1.34-config.patch +Patch0: %{name}-1.35-config.patch # PATCH-FIX-OPENSUSE -- run postgrey under the same groupid as postfix: postfix Patch1: %{name}-groupid.patch # PATCH-FIX-OPENSUSE -- patch SOURCE5 to run under openSUSE Patch2: postgrey_clients_dump.patch -Requires(pre): %fillup_prereq -Requires(pre): %insserv_prereq, -Requires(pre): /usr/sbin/useradd +BuildRequires: postfix +Requires: perl >= 5.6.0 +Requires: perl-BerkeleyDB +Requires: perl-IO-Multiplex +Requires: perl-Net-DNS +Requires: perl-Net-Server BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +Suggests: cron +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%systemd_requires +%endif %description Postgrey is a Postfix policy server implementing greylisting. When a @@ -71,9 +71,9 @@ %setup -q test -d examples || mkdir examples cp %{SOURCE5} examples/ -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 +%patch0 +%patch1 +%patch2 cp %{SOURCE3} README.SUSE %build @@ -95,13 +95,15 @@ install -m 0644 postgrey_whitelist_recipients %{buildroot}/%{_sysconfdir}/%{name}/whitelist_recipients touch whitelist_clients.local install -m 0644 whitelist_clients.local %{buildroot}/%{_sysconfdir}/%{name} -# init file and configuration -install -D %{SOURCE1} %{buildroot}%{_initddir}/%{name} -ln -sf /etc/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} +# configuration install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} -%if 0%{?suse_version} > 1140 -# systemd service file +# systemd service file or init file +%if 0%{?suse_version} > 1210 install -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} +%else +install -D %{SOURCE1} %{buildroot}%{_initddir}/%{name} +ln -sf %{_initddir}/%{name} %{buildroot}%{_sbindir}/rc%{name} %endif # queue directory install -d %{buildroot}/%{_localstatedir}/lib/%{name} @@ -111,17 +113,32 @@ install -m 0644 %{SOURCE4} . %pre -/usr/sbin/useradd --system -g nogroup -s /bin/false -c "Postgrey Daemon" -d /var/lib/%{name} %{name} 2> /dev/null || : +getent passwd %{name} >/dev/null || useradd -r -g nogroup -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "Postgrey Daemon" %{name} +%if 0%{?suse_version} > 1210 +%service_add_pre %{name}.service +%endif %preun +%if 0%{?suse_version} > 1210 +%service_del_preun %{name}.service +%else %stop_on_removal %{name} +%endif %post +%if 0%{?suse_version} > 1210 +%service_add_post %{name}.service +%else %{fillup_and_insserv %{name}} +%endif %postun +%if 0%{?suse_version} > 1210 +%service_del_postun %{name}.service +%else %restart_on_update %{name} -%{insserv_cleanup} +%insserv_cleanup +%endif %files %defattr(-,root,root) @@ -129,7 +146,6 @@ %config(noreplace) %{_sysconfdir}/%{name}/whitelist_recipients %config(noreplace) %{_sysconfdir}/%{name}/whitelist_clients %config(noreplace) %{_sysconfdir}/%{name}/whitelist_clients.local -%config %attr(0755,root,root) %{_sysconfdir}/init.d/%{name} %{_sbindir}/%{name} %{_sbindir}/postgreyreport %{_sbindir}/rc%{name} @@ -138,8 +154,10 @@ %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} > 1140 +%if 0%{?suse_version} > 1210 %{_unitdir}/%{name}.service +%else +%config %attr(0755,root,root) %{_initddir}/%{name} %endif %changelog ++++++ postgrey-1.34-config.patch -> postgrey-1.35-config.patch ++++++ --- /work/SRC/openSUSE:Factory/postgrey/postgrey-1.34-config.patch 2013-10-11 09:01:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postgrey.new/postgrey-1.35-config.patch 2015-01-29 09:56:15.000000000 +0100 @@ -40,7 +40,7 @@ @@ -23,8 +23,8 @@ use vars qw(@ISA); @ISA = qw(Net::Server::Multiplex); - my $VERSION = '1.34'; + my $VERSION = '1.35'; -my $DEFAULT_DBDIR = '/var/spool/postfix/postgrey'; -my $CONFIG_DIR = '/etc/postfix'; +my $DEFAULT_DBDIR = '/var/lib/postgrey'; @@ -140,7 +140,7 @@ +# put this file in /etc/postgrey or specify its path # with --whitelist-clients=xxx # - # postgrey version: 1.34, build date: 2011-05-04 + # postgrey version: 1.35, build date: 2014-06-11 @@ -19,8 +19,6 @@ vger.kernel.org karger.ch # 2004-06-02: lilys.ch, (slow: 4 hours) ++++++ postgrey-1.34.tar.gz -> postgrey-1.35.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postgrey-1.34/Changes new/postgrey-1.35/Changes --- old/postgrey-1.34/Changes 2011-05-04 22:49:17.000000000 +0200 +++ new/postgrey-1.35/Changes 2014-06-11 15:12:26.000000000 +0200 @@ -1,3 +1,8 @@ +* 2014-06-11: version 1.35 + - use just 'postgrey' as process name, instead of '/usr/sbin/postgrey', because + Linux tools are limited to 15 characters (#5) + - updated whitelist + * 2011-05-04: version 1.34 - gracefully handle future timestamps in the database (Andreas Hoedle) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postgrey-1.34/README new/postgrey-1.35/README --- old/postgrey-1.34/README 2011-05-04 22:34:19.000000000 +0200 +++ new/postgrey-1.35/README 2013-12-12 11:33:10.000000000 +0100 @@ -38,4 +38,4 @@ There is also a mailing-list archive, where you might find answers: - http://lists.ee.ethz.ch/postgrey + http://lists.ee.ethz.ch/wws/arc/postgrey diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postgrey-1.34/postgrey new/postgrey-1.35/postgrey --- old/postgrey-1.34/postgrey 2011-05-04 22:54:15.000000000 +0200 +++ new/postgrey-1.35/postgrey 2014-06-11 15:13:50.000000000 +0200 @@ -22,7 +22,7 @@ use vars qw(@ISA); @ISA = qw(Net::Server::Multiplex); -my $VERSION = '1.34'; +my $VERSION = '1.35'; my $DEFAULT_DBDIR = '/var/spool/postfix/postgrey'; my $CONFIG_DIR = '/etc/postfix'; @@ -557,6 +557,16 @@ if($opt{dbdir}) { $opt{dbdir} =~ /^(.*)$/; $opt{dbdir} = $1; } + # untaint what is given on --pidfile. It is not security sensitive since + # it is provided by the admin + if($opt{pidfile}) { + $opt{pidfile} =~ /^(.*)$/; $opt{pidfile} = $1; + } + # untaint what is given on --inet. It is not security sensitive since + # it is provided by the admin + if($opt{inet}) { + $opt{inet} =~ /^(.*)$/; $opt{inet} = $1; + } # determine proper "logsock" for Sys::Syslog my $syslog_logsock; @@ -582,7 +592,7 @@ # create Net::Server object and run it my $server = bless { server => { - commandline => [ $0, @ARGV_saved ], + commandline => [ 'postgrey', @ARGV_saved ], port => [ $opt{inet} ? $opt{inet} : $opt{unix}."|unix" ], proto => $opt{inet} ? 'tcp' : 'unix', user => $opt{user} || 'postgrey', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postgrey-1.34/postgrey_whitelist_clients new/postgrey-1.35/postgrey_whitelist_clients --- old/postgrey-1.34/postgrey_whitelist_clients 2011-05-04 22:54:16.000000000 +0200 +++ new/postgrey-1.35/postgrey_whitelist_clients 2014-06-11 15:13:50.000000000 +0200 @@ -3,7 +3,7 @@ # put this file in /etc/postfix or specify its path # with --whitelist-clients=xxx # -# postgrey version: 1.34, build date: 2011-05-04 +# postgrey version: 1.35, build date: 2014-06-11 # greylisting.org: Southwest Airlines (unique sender, no retry) southwest.com @@ -218,3 +218,12 @@ /^mx.*\.evanzo-server\.de$/ # 2011-05-02: upcmail.net (big pool, reported by Michael Monnerie) upcmail.net +# 2013-12-18: orange.fr (big pool, reported by fulax) +/^smtp\d+\.smtpout\.orange\.fr$/ +# 2014-01-29: gmx/web.de/1&1 (long retry, reported by Axel Beckert) +mout-xforward.gmx.net +mout-xforward.web.de +mout-xforward.kundenserver.de +mout-xforward.perfora.net +# 2014-02-01: startcom.org (long retry, reported by jweiher) +gateway.startcom.org ++++++ postgrey.service ++++++ --- /var/tmp/diff_new_pack.FlOl6u/_old 2015-01-29 09:56:17.000000000 +0100 +++ /var/tmp/diff_new_pack.FlOl6u/_new 2015-01-29 09:56:17.000000000 +0100 @@ -18,7 +18,6 @@ [Service] Type=forking -ExecStartPre=-/bin/echo 'Starting greylisting service (Postgrey)' EnvironmentFile=-/etc/sysconfig/postgrey ExecStart=/usr/sbin/postgrey -d $POSTGREY_CONN_OPTIONS $POSTGREY_DBDIR $POSTGREY_EXTRA_OPTIONS Restart=always -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
