Dear release team,
could you please review the changes for postfwd 1.10pre7c-3, which I plan
to upload to unstable and state if it could be considered for unblock it for
lenny?
The diff is attached and the changelog follows:
postfwd (1.10pre7c-3) unstable; urgency=low
* implement machine-interpretable copyright file
* fix init script (Closes: #503597).
- let daemon write pid file for his own
- point start-stop daemon to pidfile when stoping
- fix reload by fixing the way how to get the pid
* fix example-cfg2.txt to work with 1.10pre7 (Closes: #503596).
Thanks and with kind regards, Jan.
--
Never write mail to <waja@spamfalle.info>, you have been warned!
-----BEGIN GEEK CODE BLOCK-----
Version: 3.1
GIT d-- s+: a- C+++ UL++++ P+ L+++ E- W+++ N+++ o++ K++ w--- O M V- PS PE
Y++ PGP++ t-- 5 X R tv- b+ DI- D++ G++ e++ h-- r+++ y+++
------END GEEK CODE BLOCK------
Index: debian/postfwd/trunk/debian/init.d
===================================================================
--- debian/postfwd/trunk/debian/init.d (revision 1260)
+++ debian/postfwd/trunk/debian/init.d (revision 1615)
@@ -20,4 +20,5 @@
NAME=postfwd
DAEMON=/usr/sbin/${NAME}
+PIDFILE=/var/run/$NAME.pid
DESC=postfwd
@@ -71,17 +72,15 @@
start-stop-daemon --start --quiet \
--name ${RUNAS} \
- --exec $DAEMON -- ${ARGS} --daemon --file=${CONF} --interface=${INET} --port=${PORT} --user=${RUNAS} --group=${RUNAS}
+ --exec $DAEMON -- ${ARGS} --daemon --file=${CONF} --interface=${INET} --port=${PORT} --user=${RUNAS} --group=${RUNAS} --pidfile=$PIDFILE
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
- start-stop-daemon --stop --quiet --oknodo \
- --exec $DAEMON
+ start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE && rm -rf $PIDFILE
echo "$NAME."
- rm -f /var/run/$NAME.pid
;;
reload)
echo "Reloading $DESC configuration files."
- for pid in `pidof ${NAME}`; do kill -HUP ${pid}; done ;
+ kill -HUP $(cat $PIDFILE)
;;
restart|force-reload)
Index: debian/postfwd/trunk/debian/changelog
===================================================================
--- debian/postfwd/trunk/debian/changelog (revision 1477)
+++ debian/postfwd/trunk/debian/changelog (revision 1616)
@@ -1,2 +1,13 @@
+postfwd (1.10pre7c-3) unstable; urgency=low
+
+ * implement machine-interpretable copyright file
+ * fix init script (Closes: #503597).
+ - let daemon write pid file for his own
+ - point start-stop daemon to pidfile when stoping
+ - fix reload by fixing the way how to get the pid
+ * fix example-cfg2.txt to work with 1.10pre7 (Closes: #503596).
+
+ -- Jan Wagner <waja@cyconet.org> Fri, 31 Oct 2008 09:55:52 +0100
+
postfwd (1.10pre7c-2) unstable; urgency=low
Index: debian/postfwd/trunk/debian/copyright
===================================================================
--- debian/postfwd/trunk/debian/copyright (revision 1338)
+++ debian/postfwd/trunk/debian/copyright (revision 1490)
@@ -1,13 +1,22 @@
-This package was debianized by Jan Wagner <waja@cyconet.org> on
-Mon, 10 Mar 2008 22:37:44 +0100
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Packaged-By: Jan Wagner <waja@cyconet.org>
+Packaged-Date: Mon, 10 Mar 2008 22:37:44 +0100
+Upstream-Name: postfwd
+Upstream-Maintainer: Jan Peter Kessler <info@postfwd.org>
+Upstream-Source: http://www.postfwd.org
-It was downloaded from <http://www.postfwd.org/>
+Files: *
+Copyright: (c) 2007, Jan Peter Kessler, All rights reserved.
+License: BSD-3
-Upstream Author: Jan Peter Kessler <info@postfwd.org>
+Files: debian/*
+Copyright: (C) 2006, 2008 Jan Wagner <waja@cyconet.org>
+License: GPL-2+
-Copyright: (c) 2007, Jan Peter Kessler, All rights reserved.
+Files: debian/example-cfg2.txt
+Copyright: (c) 2008, Henrik Krohns <hege@hege.li>
+License: BSD-3
-License:
-
+License: BSD-3
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -33,8 +42,19 @@
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Different copyrights/licenses:
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- debian/example-cfg2.txt: (c) 2008, Henrik Krohns <hege@hege.li>
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
-The Debian packaging is (C) 2008 Jan Wagner <waja@cyconet.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ On Debian systems, the complete text of the GNU General Public License can be
+ found in /usr/share/common-licenses/GPL-2 file.
Index: debian/postfwd/trunk/debian/example-cfg2.txt
===================================================================
--- debian/postfwd/trunk/debian/example-cfg2.txt (revision 1335)
+++ debian/postfwd/trunk/debian/example-cfg2.txt (revision 1615)
@@ -3,5 +3,5 @@
###
-### Example config for postfwd 1.10pre8+
+### Example config for postfwd 1.10pre7+
###
@@ -32,5 +32,5 @@
id=REJECT_RBL_ZEN; \
rbl=zen.spamhaus.org; \
- action=REJECT Blocked - contact postmaster@example.net for help - DNSBL [$$dnsbltext]
+ action=REJECT Blocked - contact postmaster@example.net for help - zen.spamhaus.org RBL
## Check other DNSBLs in parallel
@@ -51,9 +51,9 @@
id=EVAL_DNSBLS; \
&&DNSBLS; rblcount=all; \
- action=set(HIT_rbls=$$rblcount,HIT_dtxt=$$dnsbltext)
+ action=set(HIT_rbls=$$rblcount)
id=REJECT_RBL_MULTI; \
HIT_rbls>=2; \
- action=REJECT Blocked - contact postmaster@example.net for help - Multiple DNSBLs [$$HIT_dtxt]
+ action=REJECT Blocked - contact postmaster@example.net for help - Multiple DNSBLs
## Check RHSBLs if there wasn't enough DNSBLs hit
@@ -74,9 +74,9 @@
id=EVAL_RHSBLS; \
&&RHSBLS_REVERSE; &&RHSBLS_SENDER; rhsblcount=all; \
- action=set(HIT_rhsbls=$$rhsblcount,HIT_rtxt=$$dnsbltext)
+ action=set(HIT_rhsbls=$$rhsblcount)
id=REJECT_RHSBL_MULTI; \
HIT_rhsbls>=2; \
- action=REJECT Blocked - contact postmaster@example.net for help - Multiple RHSBLs [$$HIT_rtxt]
+ action=REJECT Blocked - contact postmaster@example.net for help - Multiple RHSBLs
## See if we get any combined hits from rules before
@@ -84,21 +84,21 @@
id=REJECT_RBL_RHSBL; \
HIT_rbls>=1; HIT_rhsbls>=1; \
- action=REJECT Blocked - contact postmaster@example.net for help - RHSBL and DNSBL [$$HIT_rtxt] [$$HIT_dtxt]
+ action=REJECT Blocked - contact postmaster@example.net for help - RHSBL and DNSBL
id=REJECT_RBL_HELO; \
HIT_rbls>=1; HIT_helo==1; \
- action=REJECT Blocked - contact postmaster@example.net for help - DNSBL [$$HIT_dtxt] and suspicious HELO [$$helo_name]
+ action=REJECT Blocked - contact postmaster@example.net for help - DNSBL and suspicious HELO [$$helo_name]
id=REJECT_RBL_NODNS; \
HIT_rbls>=1; HIT_nodns==1; \
- action=REJECT Blocked - contact postmaster@example.net for help - DNSBL [$$HIT_dtxt] and missing reverse DNS [$$client_address]
+ action=REJECT Blocked - contact postmaster@example.net for help - DNSBL and missing reverse DNS [$$client_address]
id=REJECT_RHSBL_HELO; \
HIT_rhsbls>=1; HIT_helo==1; \
- action=REJECT Blocked - contact postmaster@example.net for help - RHSBL [$$HIT_rtxt] and suspicious HELO [$$helo_name]
+ action=REJECT Blocked - contact postmaster@example.net for help - RHSBL and suspicious HELO [$$helo_name]
id=REJECT_RHSBL_NODNS; \
HIT_rhsbls>=1; HIT_nodns==1; \
- action=REJECT Blocked - contact postmaster@example.net for help - RHSBL [$$HIT_rtxt] and missing reverse DNS [$$client_address]
+ action=REJECT Blocked - contact postmaster@example.net for help - RHSBL and missing reverse DNS [$$client_address]
## Finally greylist all lesser hits.
Attachment:
signature.asc
Description: This is a digitally signed message part.