On Tuesday 28 February 2006 22:23, Martin Zobel-Helas wrote:
> > > with regard to
> > > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=298832
> i spoke with Martin Krafft (madduck) recently (at FOSDEM) and indicated,
> that i am willing to accept this fix, when the next round of whitelist
> updates hits volatile; even though this is not a bug which normaly
> should be fixed via volatile.
Yo all!
madduck - if you want you can do an upload (personally, I don't see any
urgency here, I'll do the next upload when 1.25 is out with any whitelist
changes). I won't find time today and I'm offline until 20.3. But I'd
recommend to isolate the fix for this bug and not the whole 1.21-2 changes.
Which should be (Arrgh, there's no separate commit for it. Note to self:
use svn properly to isolate fixes...):
Index: debian/postgrey.default
===================================================================
--- debian/postgrey.default (.../postgrey.default) (revision 893)
+++ debian/postgrey.default (.../postgrey-default) (revision 894)
@@ -8,3 +8,7 @@
# see also the postgrey(8) manpage
POSTGREY_OPTS="--inet=127.0.0.1:60000"
+
+# the --greylist-text commandline argument can not be easily passed through
+# POSTGREY_OPTS when it contains spaces. So, insert your text here:
+#POSTGREY_TEXT="Your customized rejection message here"
Index: debian/postgrey.default
===================================================================
--- debian/postgrey.init (revision 893)
+++ debian/postgrey.init (revision 894)
@@ -30,12 +30,17 @@
fi
POSTGREY_OPTS="--pidfile=$PIDFILE --daemonize $POSTGREY_OPTS"
+if [[ "$POSTGREY_TEXT" = "" ]]; then
+ POSTGREY_TEXT_OPT=""
+else
+ POSTGREY_TEXT_OPT="--greylist-text=$POSTGREY_TEXT"
+fi
case "$1" in
start)
echo -n "Starting $DESC: $NAME"
start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --exec $DAEMON -- $POSTGREY_OPTS
+ --exec $DAEMON -- $POSTGREY_OPTS "$POSTGREY_TEXT_OPT"
echo "."
;;
stop)
@@ -55,7 +60,7 @@
rm -f $PIDFILE
sleep 1
start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --exec $DAEMON -- $POSTGREY_OPTS
+ --exec $DAEMON -- $POSTGREY_OPTS "$POSTGREY_TEXT_OPT"
echo "."
;;
*)
Hmm. Seems I only introduced ucf handling of this file in 1.21-2, so I'd
not introduce this change in a volatile upload.
cheers
-- vbi
--
[Forbes Magazine] looks ... like corporate pornography, giving middle-
management dreamers fodder for their fantasies, and this sort of
exercise, basically meaningless, hardly seems useful or instructive.
-- The Canberra Times, August 2004
Attachment:
pgpD0ZWh7L9A1.pgp
Description: PGP signature