Hello community, here is the log from the commit of package postgrey for openSUSE:Factory checked in at 2013-04-23 17:28:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postgrey (Old) and /work/SRC/openSUSE:Factory/.postgrey.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "postgrey", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/postgrey/postgrey.changes 2011-09-23 12:41:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postgrey.new/postgrey.changes 2013-04-23 17:28:17.000000000 +0200 @@ -1,0 +2,19 @@ +Tue Nov 20 09:24:07 UTC 2012 - [email protected] + +- update to 1.34: + - gracefully handle future timestamps in the database + (Andreas Hoedle) + - replaced obsolete Digest::SHA1 with Digest::SHA + (Salvatore Bonaccorso) + - updated whitelist +- adapt patches to the new version +- adapt URL to the postgrey_clients_dump source +- specfile cleanup +- removed empty verifyscript + +------------------------------------------------------------------- +Thu Nov 8 17:41:42 UTC 2012 - [email protected] + +- add systemd service file for openSUSE >= 12.1 + +------------------------------------------------------------------- Old: ---- postgrey-1.31-goupid.patch postgrey-1.33-config.patch postgrey-1.33.tar.bz2 New: ---- postgrey-1.34-config.patch postgrey-1.34.tar.gz postgrey-groupid.patch postgrey.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postgrey.spec ++++++ --- /var/tmp/diff_new_pack.kQWGiq/_old 2013-04-23 17:28:19.000000000 +0200 +++ /var/tmp/diff_new_pack.kQWGiq/_new 2013-04-23 17:28:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package postgrey # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -15,32 +15,42 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: postgrey -Requires: perl >= 5.6.0, perl-BerkeleyDB perl-IO-Multiplex perl-Net-Server BuildRequires: postfix +Requires: perl >= 5.6.0 +Requires: perl-BerkeleyDB +Requires: perl-IO-Multiplex +Requires: perl-Net-Server %if 0%{?suse_version} >= 1000 Suggests: cron %endif -PreReq: %insserv_prereq, %fillup_prereq /usr/sbin/useradd +Version: 1.34 +Release: 0 +Summary: Postfix greylisting policy server License: GPL-2.0+ Group: Productivity/Networking/Email/Utilities -Summary: Postfix greylisting policy server -Version: 1.33 -Release: 15 Url: http://postgrey.schweikert.ch/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: http://postgrey.schweikert.ch/pub/%name-%{version}.tar.bz2 +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 -Source5: http://lists.ee.ethz.ch/p/postgrey_clients_dump -Patch0: %{name}-1.33-config.patch -Patch1: %{name}-1.31-goupid.patch +# http://hg.schweikert.ch/dispatch.fcgi/postgrey-1.x/raw-file/ca06ef218498/postgrey_clients_dump +Source5: postgrey_clients_dump +Source6: %{name}.service +# 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 +# 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 +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Postgrey is a Postfix policy server implementing greylisting. When a @@ -56,19 +66,13 @@ subnet, auto-whitelisting of clients, only Berkeley DB and no large mysql nor postgresql DB needed. - - -Authors: --------- - David Schweikert <[email protected]> - %prep %setup -q -mkdir examples -cp %{SOURCE5} examples -%patch0 -%patch1 -%patch2 +test -d examples || mkdir examples +cp %{SOURCE5} examples/ +%patch0 -p0 +%patch1 -p0 +%patch2 -p0 cp %{SOURCE3} README.SUSE %build @@ -91,13 +95,17 @@ touch whitelist_clients.local install -m 0644 whitelist_clients.local %{buildroot}/%{_sysconfdir}/%{name} # init file and configuration -install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/%{name} -ln -sf /etc/init.d/%{name} $RPM_BUILD_ROOT/usr/sbin/rc%{name} -install -D -m 644 %{SOURCE2} %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} +install -D %{SOURCE1} %{buildroot}%{_initddir}/%{name} +ln -sf /etc/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} +install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +%if 0%{?suse_version} > 1140 +# systemd service file +install -D -m 644 %{SOURCE6} %{buildroot}/lib/systemd/system/%{name}.service +%endif # queue directory -install -d %{buildroot}/%{_var}/lib/%{name} +install -d %{buildroot}/%{_localstatedir}/lib/%{name} # directory for socket -install -d -m 0775 %{buildroot}/%{_var}/spool/postfix/%{name} +install -d -m 0775 %{buildroot}/%{_localstatedir}/spool/postfix/%{name} # some helper tools install -m 0644 %{SOURCE4} . @@ -113,7 +121,6 @@ %postun %restart_on_update %{name} %{insserv_cleanup} -%verifyscript %files %defattr(-,root,root) @@ -121,14 +128,17 @@ %config(noreplace) %{_sysconfdir}/%{name}/whitelist_recipients %config(noreplace) %{_sysconfdir}/%{name}/whitelist_clients %config(noreplace) %{_sysconfdir}/%{name}/whitelist_clients.local -%config %attr(0755,root,root) /etc/init.d/%{name} +%config %attr(0755,root,root) %{_sysconfdir}/init.d/%{name} %{_sbindir}/%{name} %{_sbindir}/postgreyreport %{_sbindir}/rc%{name} -%dir %attr(0755,postgrey,postfix) %{_var}/lib/%{name} -/var/adm/fillup-templates/sysconfig.%{name} -%dir %attr(0770,postgrey,postfix) %{_var}/spool/postfix/%{name} +%dir %attr(0755,postgrey,postfix) +%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +%dir %attr(0770,postgrey,postfix) %doc %{_mandir}/man?/* %doc Changes COPYING README README.SUSE examples %{name}_daily_greylist.crontab +%if 0%{?suse_version} > 1140 +/lib/systemd/system/%{name}.service +%endif %changelog ++++++ postgrey-1.33-config.patch -> postgrey-1.34-config.patch ++++++ --- /work/SRC/openSUSE:Factory/postgrey/postgrey-1.33-config.patch 2011-09-23 12:41:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postgrey.new/postgrey-1.34-config.patch 2013-04-23 17:28:17.000000000 +0200 @@ -1,7 +1,20 @@ +Index: README +=================================================================== +--- README.orig ++++ README +@@ -20,7 +20,7 @@ Documentation + + See POD documentation in postgrey. Execute: + +- perldoc postgrey ++ man postgrey + + See also Postgrey's homepage: + Index: contrib/postgreyreport =================================================================== ---- contrib/postgreyreport.orig 2007-08-29 15:26:01.000000000 +0200 -+++ contrib/postgreyreport 2009-11-30 19:14:24.922405000 +0100 +--- contrib/postgreyreport.orig ++++ contrib/postgreyreport @@ -24,7 +24,7 @@ select((select(STDOUT), $| = 1)[0]); # # default options, override via command line my %opt = ( @@ -11,7 +24,7 @@ delay => 300, return_string => 'Greylisted', # match on this string -@@ -583,7 +583,7 @@ B<postgreyreport> [I<options>...] +@@ -594,7 +594,7 @@ B<postgreyreport> [I<options>...] --version display version and exit --user=USER run as USER (default: postgrey) @@ -20,60 +33,14 @@ --delay=N report triplets that did not try again after N seconds (default: 300) --greylist-text=TXT text to match on for greylist maillog lines -Index: postgrey_whitelist_recipients -=================================================================== ---- postgrey_whitelist_recipients.orig 2007-08-29 15:25:08.000000000 +0200 -+++ postgrey_whitelist_recipients 2009-11-30 19:14:24.925407000 +0100 -@@ -1,6 +1,6 @@ - # postgrey whitelist for mail recipients - # -------------------------------------- --# put this file in /etc/postfix or specify its path -+# put this file in /etc/postgrey or specify its path - # with --whitelist-recipients=xxx - - postmaster@ -Index: README -=================================================================== ---- README.orig 2007-08-29 15:27:04.000000000 +0200 -+++ README 2009-11-30 19:14:24.929409000 +0100 -@@ -19,7 +19,7 @@ Documentation - - See POD documentation in postgrey. Execute: - -- perldoc postgrey -+ man postgrey - - See also Postgrey's homepage: - -Index: postgrey_whitelist_clients -=================================================================== ---- postgrey_whitelist_clients.orig 2008-07-22 22:17:50.000000000 +0200 -+++ postgrey_whitelist_clients 2009-11-30 19:14:24.934405000 +0100 -@@ -1,6 +1,6 @@ - # postgrey whitelist for mail client hostnames - # -------------------------------------------- --# put this file in /etc/postfix or specify its path -+# put this file in /etc/postgrey or specify its path - # with --whitelist-clients=xxx - - # greylisting.org: Southwest Airlines (unique sender, no retry) -@@ -17,8 +17,6 @@ vger.kernel.org - karger.ch - # 2004-06-02: lilys.ch, (slow: 4 hours) - server-x001.hostpoint.ch --# 2004-06-09: roche.com (no retry) --gw.bas.roche.com - # 2004-06-09: newsletter (no retry) - mail.hhlaw.com - # 2004-06-09: no retry (reported by Ralph Hildebrandt) Index: postgrey =================================================================== ---- postgrey.orig 2010-05-04 22:51:52.000000000 +0200 -+++ postgrey 2010-08-28 23:09:56.958706690 +0200 +--- postgrey.orig ++++ postgrey @@ -23,8 +23,8 @@ use vars qw(@ISA); @ISA = qw(Net::Server::Multiplex); - my $VERSION = '1.33'; + my $VERSION = '1.34'; -my $DEFAULT_DBDIR = '/var/spool/postfix/postgrey'; -my $CONFIG_DIR = '/etc/postfix'; +my $DEFAULT_DBDIR = '/var/lib/postgrey'; @@ -81,7 +48,7 @@ sub cidr_parse($) { -@@ -605,10 +605,10 @@ sub main() +@@ -610,8 +610,8 @@ sub main() greylist_action => $opt{'greylist-action'} || 'DEFER_IF_PERMIT', greylist_text => $opt{'greylist-text'} || 'Greylisted, see http://postgrey.schweikert.ch/help/%r.html', whitelist_clients_files => $opt{'whitelist-clients'} || @@ -90,12 +57,9 @@ + [ "$CONFIG_DIR/whitelist_clients" , + "$CONFIG_DIR/whitelist_clients.local" ], whitelist_recipients_files => $opt{'whitelist-recipients'} || -- [ "$CONFIG_DIR/postgrey_whitelist_recipients" ], -+ [ "$CONFIG_DIR/whitelist_recipients" ], + [ "$CONFIG_DIR/postgrey_whitelist_recipients" ], privacy => defined $opt{'privacy'}, - hostname => defined $opt{hostname} ? $opt{hostname} : hostname, - exim => defined $opt{'exim'}, -@@ -791,7 +791,7 @@ B<postgrey> [I<options>...] +@@ -796,7 +796,7 @@ B<postgrey> [I<options>...] --pidfile=PATH put daemon pid into this file --user=USER run as USER (default: postgrey) --group=GROUP run as group GROUP (default: nogroup) @@ -104,18 +68,18 @@ --delay=N greylist for N seconds (default: 300) --max-age=N delete entries older than N days since the last time that they have been seen (default: 35) -@@ -805,8 +805,8 @@ B<postgrey> [I<options>...] +@@ -810,8 +810,8 @@ B<postgrey> [I<options>...] --privacy store data using one-way hash functions --hostname=NAME set the hostname (default: `hostname`) --exim don't reuse a socket for more than one query (exim compatible) - --whitelist-clients=FILE default: /etc/postfix/postgrey_whitelist_clients - --whitelist-recipients=FILE default: /etc/postfix/postgrey_whitelist_recipients -+ --whitelist-clients=FILE default: /etc/postgrey/whitelist_clients ++ --whitelist-clients=FILE default: /etc/posgrey/whitelist_clients + --whitelist-recipients=FILE default: /etc/postgrey/whitelist_recipients --auto-whitelist-clients=N whitelist host after first successful delivery N is the minimal count of mails before a client is whitelisted (turned on by default with value 5) -@@ -816,7 +816,7 @@ B<postgrey> [I<options>...] +@@ -821,7 +821,7 @@ B<postgrey> [I<options>...] default: X-Greylist: delayed <seconds> seconds by postgrey-<version> at <server>; <date> Note that the --whitelist-x options can be specified multiple times, @@ -124,26 +88,23 @@ also read, so that you can put there local entries. =head1 DESCRIPTION -@@ -842,11 +842,6 @@ doing lookups in the database. - +@@ -848,7 +848,7 @@ doing lookups in the database. =item * --Create a C<postgrey> user and the directory where to put the database I<dbdir> + Create a C<postgrey> user and the directory where to put the database I<dbdir> -(default: C</var/spool/postfix/postgrey>) -- --=item * -- - Write an init script to start postgrey at boot and start it. Like this for example: ++(default: C</var/lib/postgrey>) - postgrey --inet=10023 -d -@@ -866,12 +861,12 @@ Put something like this in /etc/main.cf: + =item * + +@@ -871,12 +871,12 @@ Put something like this in /etc/main.cf: =item * -Install the provided postgrey_whitelist_clients and -postgrey_whitelist_recipients in /etc/postfix. +Install the provided whitelist_clients and -+whitelist_recipients in /etc/postgrey. ++postgrey_whitelist_recipients in /etc/postgrey. =item * @@ -152,7 +113,7 @@ greylisting. =back -@@ -882,9 +877,9 @@ Whitelists allow you to specify client a +@@ -887,9 +887,9 @@ Whitelists allow you to specify client a which no greylisting should be done. Per default postgrey will read the following files: @@ -165,3 +126,36 @@ You can specify alternative paths with the --whitelist-x options. +Index: postgrey_whitelist_clients +=================================================================== +--- postgrey_whitelist_clients.orig ++++ postgrey_whitelist_clients +@@ -1,6 +1,6 @@ + # postgrey whitelist for mail client hostnames + # -------------------------------------------- +-# put this file in /etc/postfix or specify its path ++# put this file in /etc/postgrey or specify its path + # with --whitelist-clients=xxx + # + # postgrey version: 1.34, build date: 2011-05-04 +@@ -19,8 +19,6 @@ vger.kernel.org + karger.ch + # 2004-06-02: lilys.ch, (slow: 4 hours) + server-x001.hostpoint.ch +-# 2004-06-09: roche.com (no retry) +-gw.bas.roche.com + # 2004-06-09: newsletter (no retry) + mail.hhlaw.com + # 2004-06-09: no retry (reported by Ralph Hildebrandt) +Index: postgrey_whitelist_recipients +=================================================================== +--- postgrey_whitelist_recipients.orig ++++ postgrey_whitelist_recipients +@@ -1,6 +1,6 @@ + # postgrey whitelist for mail recipients + # -------------------------------------- +-# put this file in /etc/postfix or specify its path ++# put this file in /etc/postgrey or specify its path + # with --whitelist-recipients=xxx + + postmaster@ ++++++ postgrey-groupid.patch ++++++ Index: postgrey =================================================================== --- postgrey.orig +++ postgrey @@ -586,7 +586,7 @@ sub main() port => [ $opt{inet} ? $opt{inet} : $opt{unix}."|unix" ], proto => $opt{inet} ? 'tcp' : 'unix', user => $opt{user} || 'postgrey', - group => $opt{group} || 'nogroup', + group => $opt{group} || 'postfix', dbdir => $opt{dbdir} || $DEFAULT_DBDIR, setsid => $opt{daemonize} ? 1 : undef, pid_file => $opt{daemonize} ? $opt{pidfile} : undef, @@ -795,7 +795,7 @@ B<postgrey> [I<options>...] -d, --daemonize run in the background --pidfile=PATH put daemon pid into this file --user=USER run as USER (default: postgrey) - --group=GROUP run as group GROUP (default: nogroup) + --group=GROUP run as group GROUP (default: postfix) --dbdir=PATH put db files in PATH (default: /var/lib/postgrey) --delay=N greylist for N seconds (default: 300) --max-age=N delete entries older than N days since the last time ++++++ postgrey.service ++++++ # This file is part of package postgrey. # # Copyright (c) 2012 Stefan Botter. # Author: Stefan Botter # Please send feedback to [email protected] # # Description: # # Used to start postgrey greylisting service # [Unit] Description=Postgrey Greylisting Service Requires=var-run.mount nss-lookup.target network.target remote-fs.target syslog.target time-sync.target After=var-run.mount nss-lookup.target network.target remote-fs.target syslog.target time-sync.target Before=mail-transfer-agent.target Conflicts= [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 RestartSec=1 [Install] WantedBy=multi-user.target ++++++ postgrey_clients_dump ++++++ --- /var/tmp/diff_new_pack.kQWGiq/_old 2013-04-23 17:28:19.000000000 +0200 +++ /var/tmp/diff_new_pack.kQWGiq/_new 2013-04-23 17:28:19.000000000 +0200 @@ -47,4 +47,3 @@ main; # vim: sw=4 - ++++++ postgrey_clients_dump.patch ++++++ --- /var/tmp/diff_new_pack.kQWGiq/_old 2013-04-23 17:28:19.000000000 +0200 +++ /var/tmp/diff_new_pack.kQWGiq/_new 2013-04-23 17:28:19.000000000 +0200 @@ -1,5 +1,7 @@ ---- examples/postgrey_clients_dump.orig 2008-04-04 14:36:39.000000000 +0200 -+++ examples/postgrey_clients_dump 2008-04-04 14:37:29.000000000 +0200 +Index: exampples/postgrey_clients_dump +=================================================================== +--- examples/postgrey_clients_dump.orig ++++ examples/postgrey_clients_dump @@ -1,11 +1,9 @@ -#!/usr/sepp/bin/perl-5.8.4 -w - @@ -14,8 +16,3 @@ sub resolv($) { my $host = shift; -@@ -47,4 +45,3 @@ - main; - - # vim: sw=4 -- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
