Author: glen Date: Tue Jul 25 04:41:41 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - update to 1.27 - cosmetics - restart postgrey in %post, if sysadmin disables RPM_SKIP_AUTO_RESTART=yes (remove that restriction if uneccessary)
---- Files affected: SPECS: postgrey.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/postgrey.spec diff -u SPECS/postgrey.spec:1.14 SPECS/postgrey.spec:1.15 --- SPECS/postgrey.spec:1.14 Thu Apr 20 19:18:09 2006 +++ SPECS/postgrey.spec Tue Jul 25 06:41:36 2006 @@ -3,12 +3,12 @@ Summary: Postfix Greylisting Policy Server Summary(pl): Serwer do polityki "szarych list" dla Postfiksa Name: postgrey -Version: 1.24 +Version: 1.27 Release: 1 License: GPL v2 Group: Daemons Source0: http://isg.ee.ethz.ch/tools/postgrey/pub/%{name}-%{version}.tar.gz -# Source0-md5: db11f4da47ee28252cf2ddd160308d7e +# Source0-md5: df3a8b4a0c6ab7e8e5bb5be0de096c47 Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-group.patch @@ -21,7 +21,7 @@ BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define confdir /etc/mail +%define _sysconfdir /etc/mail %description Postgrey is a Postfix policy server implementing greylisting. When a @@ -33,13 +33,13 @@ however required per RFC. Edit your configuration files: -%{confdir}/main.cf: +%{_sysconfdir}/main.cf: smtpd_recipient_restrictions = ... check_policy_service unix:postgrey/socket, ... or if you like to use inet sockets (modify the IP if needed): /etc/sysconfig/postgrey: OPTIONS="--inet=127.0.0.1:10023" -%{confdir}/main.cf: +%{_sysconfdir}/main.cf: smtpd_recipient_restrictions = ... check_policy_service inet:127.0.0.1:10023, ... @@ -53,13 +53,13 @@ co jest jednak wymagane przez RFC. Aby użyć tego programu należy zmodyfikować pliki konfiguracyjne: -%{confdir}/main.cf: +%{_sysconfdir}/main.cf: smtpd_recipient_restrictions = ... check_policy_service unix:postgrey/socket, ... lub jeśli chcemy używać gniazd inet (w razie potrzeby zmienić IP): /etc/sysconfig/postgrey: OPTIONS="--inet=127.0.0.1:10023" -%{confdir}/main.cf: +%{_sysconfdir}/main.cf: smtpd_recipient_restrictions = ... check_policy_service inet:127.0.0.1:10023, ... @@ -70,16 +70,16 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{confdir},%{_sbindir}} \ +install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{_sysconfdir},%{_sbindir}} \ $RPM_BUILD_ROOT%{_var}/spool/postfix/%{name} # init script: install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name} -install postgrey_whitelist_clients $RPM_BUILD_ROOT%{confdir} -install postgrey_whitelist_recipients $RPM_BUILD_ROOT%{confdir} -touch $RPM_BUILD_ROOT%{confdir}/postgrey_whitelist_clients.local +install postgrey_whitelist_clients $RPM_BUILD_ROOT%{_sysconfdir} +install postgrey_whitelist_recipients $RPM_BUILD_ROOT%{_sysconfdir} +touch $RPM_BUILD_ROOT%{_sysconfdir}/postgrey_whitelist_clients.local install postgrey $RPM_BUILD_ROOT%{_sbindir} install contrib/postgreyreport $RPM_BUILD_ROOT%{_sbindir} @@ -93,6 +93,8 @@ %post /sbin/chkconfig --add %{name} +# default sysconfig file has RPM_SKIP_AUTO_RESTART=yes +%service %{name} restart %preun if [ "$1" = 0 ]; then @@ -111,9 +113,9 @@ %files %defattr(644,root,root,755) %doc README Changes -%config(noreplace) %verify(not md5 mtime size) %{confdir}/postgrey_whitelist_clients -%config(noreplace) %verify(not md5 mtime size) %{confdir}/postgrey_whitelist_recipients -%config(noreplace) %verify(not md5 mtime size) %{confdir}/postgrey_whitelist_clients.local +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postgrey_whitelist_clients +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postgrey_whitelist_recipients +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postgrey_whitelist_clients.local %attr(640,root,postgrey) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} %attr(754,root,root) /etc/rc.d/init.d/%{name} %attr(755,root,root) %{_sbindir}/postgrey* @@ -125,6 +127,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.15 2006/07/25 04:41:36 glen +- update to 1.27 +- cosmetics +- restart postgrey in %post, if sysadmin disables RPM_SKIP_AUTO_RESTART=yes (remove that restriction if uneccessary) + Revision 1.14 2006/04/20 17:18:09 glen - use %service, adapter @@ -167,18 +174,3 @@ Revision 1.1 2005/09/05 12:42:38 blues - raw, a bit PLD-dized. NFY - -* Thu Apr 28 2005 Levente Farkas <[EMAIL PROTECTED]> 1.21 -- update to 1.21 - -* Tue Mar 8 2005 Levente Farkas <[EMAIL PROTECTED]> 1.18 -- update to 1.18 - -* Tue Dec 14 2004 Levente Farkas <[EMAIL PROTECTED]> 1.17 -- update to 1.17 - -* Wed Jul 14 2004 Levente Farkas <[EMAIL PROTECTED]> 1.14 -- guard the pre and post scripts - -* Wed Jul 7 2004 Levente Farkas <[EMAIL PROTECTED]> 1.13 -- initial release 1.13 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/postgrey.spec?r1=1.14&r2=1.15&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
