FreeBSD Bugzilla – Attachment 134062 Details for
Bug 178644
Redesign mail/postgrey RC script, other small tweaks
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
postgrey-1.34_5_2.diff.txt
postgrey-1.34_5_2.diff.txt (text/plain; charset=windows-1252), 4.34 KB, created by
ports.maintainer
on 2013-05-24 22:20:13 UTC
(
hide
)
Description:
postgrey-1.34_5_2.diff.txt
Filename:
MIME Type:
Creator:
ports.maintainer
Created:
2013-05-24 22:20:13 UTC
Size:
4.34 KB
patch
obsolete
>--- Makefile.orig 2013-05-12 07:29:46.000000000 -0700 >+++ Makefile 2013-05-14 12:28:17.569002494 -0700 >@@ -3,7 +3,7 @@ > > PORTNAME= postgrey > PORTVERSION= 1.34 >-PORTREVISION= 4 >+PORTREVISION= 5 > CATEGORIES= mail > MASTER_SITES= http://postgrey.schweikert.ch/pub/ \ > http://postgrey.schweikert.ch/pub/old/ >@@ -23,14 +23,13 @@ > POD2MAN?= pod2man > PORTDOCS= README Changes README.exim > SUB_FILES= pkg-install >-SUB_LIST= USER=${PGY_USERNAME} UID=${PGY_USERID} GROUP=${PGY_GROUPNAME} \ >- GID=${PGY_GROUPID} ETCFILES="${ETCFILES}" \ >+SUB_LIST= USER=${PGY_USERNAME} \ >+ GROUP=${PGY_GROUPNAME} \ >+ ETCFILES="${ETCFILES}" \ > POSTGREYDIR=${PGY_DIR} > ETCFILES= whitelist_clients whitelist_recipients > PGY_USERNAME?= postgrey >-PGY_USERID?= 225 >-PGY_GROUPNAME?= ${PGY_USERNAME} >-PGY_GROUPID?= ${PGY_USERID} >+PGY_GROUPNAME?= postgrey > PGY_DIR?= /var/db/postgrey > > USERS= ${PGY_USERNAME} >@@ -40,12 +39,10 @@ > USES= shebangfix > SHEBANG_FILES= ${WRKSRC}/postgrey > >-OPTIONS_DEFINE= DOCS >-OPTIONS_DEFAULT=DOCS >- > .include <bsd.port.options.mk> > > post-patch: >+ @${REINPLACE_CMD} -e 's#nogroup#${PGY_GROUPNAME}#' ${WRKSRC}/postgrey > @${REINPLACE_CMD} -e 's#/etc/main.cf#/etc/postfix/main.cf#' ${WRKSRC}/postgrey > @${REINPLACE_CMD} -e 's#/etc/postfix#${PREFIX}&#' ${WRKSRC}/postgrey ${WRKSRC}/postgrey_whitelist_* > @${REINPLACE_CMD} -e 's#/var/spool/postfix/postgrey#${PGY_DIR}#' ${WRKSRC}/postgrey ${WRKSRC}/contrib/postgreyreport >--- pkg-message.orig 2013-05-24 13:37:19.596438964 -0700 >+++ pkg-message 2013-05-24 13:58:22.148118989 -0700 >@@ -0,0 +1,9 @@ >+ >+ATTENTION >+ >+As of postgrey port version 1.34_5, there is a new RC script. The new >+design makes setting command-line options much simpler. If you use the >+default value for postgrey_flags, this does not affect you. If you have >+postgrey listen on a unix socket or set any other optional values, please >+read the comments in the RC script and revise your settings prior to >+restarting postgrey. >--- files/pkg-install.in.orig 2013-05-14 12:10:48.687037566 -0700 >+++ files/pkg-install.in 2013-05-14 12:12:41.785144004 -0700 >@@ -7,15 +7,10 @@ > case $2 in > > PRE-INSTALL) >- echo "---> Starting install script:" >- >- if [ -z "%%POSTGREYDIR%%" -o \ >- -z "%%USER%%" -o -z "%%GROUP%%" -o \ >- -z "%%UID%%" -o -z "%%GID%%" ]; then >+ if [ -z "%%POSTGREYDIR%%" -o -z "%%USER%%" -o -z "%%GROUP%%" ]; then > echo "ERROR: A required pragma was empty" > exit 1 > fi >- > ;; > > POST-INSTALL) >--- files/postgrey.in.orig 2012-07-14 06:54:48.000000000 -0700 >+++ files/postgrey.in 2013-05-24 13:57:17.789573576 -0700 >@@ -7,41 +7,38 @@ > # BEFORE: mail > # KEYWORD: shutdown > >-# > # Add the following lines to /etc/rc.conf to enable postgrey: > # >-# postgrey_enable="YES" >+# postgrey_enable (bool) Set to 'YES' to enable >+# Default: NO >+# postgrey_dbdir (path) Location of postgrey database files. >+# Default: /var/db/postgrey >+# postgrey_flags (extra args) Additional command-line parameters. >+# Default: --inet=10023 > # >-# See perldoc postgrey for flags >+# Note: > # >+# postgrey_flags must include a --inet or --unix option or postgrey will >+# not run. Change the --dbdir option with postgrey_dbdir. Please see >+# the postgrey(1) man page or perldoc postgrey for more information. > > . /etc/rc.subr > > name=postgrey >-rcvar=postgrey_enable >- >-command=%%PREFIX%%/sbin/postgrey >-required_dirs=/var/db/postgrey >-extra_commands=reload >- >-stop_postcmd=stop_postcmd > >-stop_postcmd() >-{ >- rm -f $pidfile >-} >+load_rc_config $name > >-# set defaults >+: ${postgrey_enable:=NO} >+: ${postgrey_dbdir:=/var/db/postgrey} >+: ${postgrey_flags:=--inet=10023} > >-load_rc_config $name >+command=%%PREFIX%%/sbin/postgrey >+pidfile=/var/run/postgrey.pid >+required_dirs=${postgrey_dbdir} >+extra_commands=reload > >-postgrey_enable=${postgrey_enable:-"NO"} >-postgrey_greylist_header=${postgrey_greylist_header:-"X-Greylist: delayed %t seconds by postgrey-%v at %h\; %d"} >-postgrey_pidfile=${postgrey_pidfile:-"/var/run/postgrey.pid"} >-postgrey_flags=${postgrey_flags:-"--pidfile=${postgrey_pidfile} \ >- --inet=10023 -d --user=%%USER%% --group=%%GROUP%% --dbdir=/var/db/postgrey \ >- --x-greylist-header=${postgrey_greylist_header}"} >+postgrey_flags="-d --pidfile=${pidfile} --dbdir=${postgrey_dbdir} ${postgrey_flags}" > >-pidfile="${postgrey_pidfile}" >+stop_postcmd="rm -f ${pidfile}" > > run_rc_command "$1"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 178644
:
134060
|
134061
| 134062 |
134063