Package: sponsorship-requests Subject: RFS - policyd-weight/0.1.15.2-11 Hi everybody,
I've created a new version of my package policyd-weight. * Package name : policyd-weight Version : 0.1.15.2-11 Upstream Author : Robert Felber * URL : www.policyd-weight.org * License : GPL-2+ Section : mail As my sponsor Arno seems to be unavailable sice some weeks I'm asking here for someone who could upload my packages. Debdiff is found under [1], changes since last upload: policyd-weight (0.1.15.2-11) unstable; urgency=low * debian/postrm + Fix command-with-path-in-maintainer-script * debian/init.d + Updated LSB header * debian/rules + Add dh_lintian * Add debian/source.lintian-overrides + override for debian-watch-may-check-gpg-signature as upstream does not provide cryptographic signature * Update to debhelper 9 * Updated 10_replace_net_dns_dn_expand.patch to use official replacement Net::DNS::DomainName::decode for Net::DNS::Packet::dn_expand * Add 13_fix_default_rhsbl_dnsbl_in_man5.patch which updates default dnsbls/rhsbls in man5 manpage * Add 14_ignore_rfc1918_a_records_config_option.patch which introduces new config config option $IGNORE_RFC1918_A. If enabled A records with RFC1918 addresses aren't treated as bogus addresses by policyd-weight and therefore bogus_mx_score is not added. Updated sample configuration and man5 manpage (Closes: #799314) * Add closing bug in previous changelog entry -- Werner Detter <wer...@aloah-from-hell.de> Tue, 1 Dec 2015 23:17:14 +0100 It builds those binary packages: policyd-weight - Perl policy daemon for the Postfix MTA To access further information about this package, please visit the following URL: http://mentors.debian.net/package/policyd-weight Alternatively, one can download the package with dget using this command: dget -x http://mentors.debian.net/debian/pool/main/p/policyd-weight/policyd-weight_0.1.15.2-11.dsc Regards, Werner [1] Debdiff werner@smaint:~$ debdiff policyd-weight_0.1.15.2-10.dsc policyd-weight_0.1.15.2-11.dsc diff -Nru policyd-weight-0.1.15.2/debian/changelog policyd-weight-0.1.15.2/debian/changelog --- policyd-weight-0.1.15.2/debian/changelog 2015-01-07 07:32:00.000000000 +0100 +++ policyd-weight-0.1.15.2/debian/changelog 2015-12-01 09:45:29.000000000 +0100 @@ -1,7 +1,32 @@ +policyd-weight (0.1.15.2-11) unstable; urgency=low + + * debian/postrm + + Fix command-with-path-in-maintainer-script + * debian/init.d + + Updated LSB header + * debian/rules + + Add dh_lintian + * Add debian/source.lintian-overrides + + override for debian-watch-may-check-gpg-signature as upstream does + not provide cryptographic signature + * Update to debhelper 9 + * Updated 10_replace_net_dns_dn_expand.patch to use official replacement + Net::DNS::DomainName::decode for Net::DNS::Packet::dn_expand + * Add 13_fix_default_rhsbl_dnsbl_in_man5.patch which updates default + dnsbls/rhsbls in man5 manpage + * Add 14_ignore_rfc1918_a_records_config_option.patch which introduces + new config config option $IGNORE_RFC1918_A. If enabled A records with + RFC1918 addresses aren't treated as bogus addresses by policyd-weight + and therefore bogus_mx_score is not added. Updated sample configuration + and man5 manpage (Closes: #799314) + * Add closing bug in previous changelog entry + + -- Werner Detter <wer...@aloah-from-hell.de> Tue, 1 Dec 2015 23:17:14 +0100 + policyd-weight (0.1.15.2-10) unstable; urgency=low - * Add 12_del_rhsbl.ahbl.org.patch which removes rhsbl.ahbl.org list due - to service shutdown + * Add 12_del_rhsbl.ahbl.org.patch which removes rhsbl.ahbl.org list due + to service shutdown (Closes: #774772) -- Werner Detter <wer...@aloah-from-hell.de> Wed, 7 Jan 2015 07:30:14 +0100 diff -Nru policyd-weight-0.1.15.2/debian/compat policyd-weight-0.1.15.2/debian/compat --- policyd-weight-0.1.15.2/debian/compat 2014-10-04 16:43:25.000000000 +0200 +++ policyd-weight-0.1.15.2/debian/compat 2015-11-30 20:34:32.000000000 +0100 @@ -1 +1 @@ -7 +9 diff -Nru policyd-weight-0.1.15.2/debian/control policyd-weight-0.1.15.2/debian/control --- policyd-weight-0.1.15.2/debian/control 2014-10-04 16:43:25.000000000 +0200 +++ policyd-weight-0.1.15.2/debian/control 2015-11-30 20:34:32.000000000 +0100 @@ -2,7 +2,7 @@ Section: mail Priority: optional Maintainer: Werner Detter <wer...@aloah-from-hell.de> -Build-Depends: debhelper (>= 7) +Build-Depends: debhelper (>= 9) Homepage: http://www.policyd-weight.org/ Standards-Version: 3.9.6 diff -Nru policyd-weight-0.1.15.2/debian/init.d policyd-weight-0.1.15.2/debian/init.d --- policyd-weight-0.1.15.2/debian/init.d 2014-10-04 16:43:25.000000000 +0200 +++ policyd-weight-0.1.15.2/debian/init.d 2015-11-30 20:34:32.000000000 +0100 @@ -1,20 +1,15 @@ #! /bin/sh # -# policyd-weight start/stop the policyd-weight deamon for postfix -# (priority should be smaller than that of postfix) -# -# Author: (c) 2012 Werner Detter <wer...@aloah-from-hell.de> -# ### BEGIN INIT INFO -# Provides: policyd-weight -# Required-Start: $local_fs $network $remote_fs $syslog -# Required-Stop: $local_fs $network $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop the policyd-weight daemon -# Description: Perl policy daemon for the Postfix MTA +# Provides: policyd-weight +# Required-Start: $local_fs $network $remote_fs $syslog +# Required-Stop: $local_fs $network $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start and stop the policyd-weight daemon +# Description: Perl policy daemon for the Postfix MTA ### END INIT INFO - +# set -e PATH=/sbin:/bin:/usr/sbin:/usr/bin diff -Nru policyd-weight-0.1.15.2/debian/patches/10_replace_net_dns_dn_expand.patch policyd-weight-0.1.15.2/debian/patches/10_replace_net_dns_dn_expand.patch --- policyd-weight-0.1.15.2/debian/patches/10_replace_net_dns_dn_expand.patch 2014-10-04 16:43:25.000000000 +0200 +++ policyd-weight-0.1.15.2/debian/patches/10_replace_net_dns_dn_expand.patch 2015-12-01 09:30:23.000000000 +0100 @@ -1,25 +1,25 @@ -Description: replace Net::DNS::Packet function dh_expand() with dh_expand_PP() +Description: replace Net::DNS::Packet::dn_expand with Net::DNS::DomainName::decode Origin: James Cloos <cl...@jhcloos.com> Author: Werner Detter <wer...@aloah-from-hell.de> DEP: 3 Bug-Debian: http://bugs.debian.org/752845 --- a/policyd-weight +++ b/policyd-weight -@@ -69,7 +69,7 @@ +@@ -69,7 +69,6 @@ use Sys::Syslog qw(:DEFAULT setlogsock); use Net::DNS; use Net::IP; -use Net::DNS::Packet qw(dn_expand); -+use Net::DNS::Packet; use IO::Socket::INET; use IO::Socket::UNIX; use IO::Select; -@@ -3587,7 +3587,7 @@ +@@ -3587,7 +3586,8 @@ my ($id, $bf, $qc, $anc, $nsc, $arc, $qb) = unpack('n n n n n n a*', $buf); - my ($dn, $offset) = dn_expand(\$qb, 0); -+ my ($dn, $offset) = Net::DNS::Packet::dn_expand_PP(\$qb, 0); ++ my ($decoded, $offset) = decode Net::DNS::DomainName(\$qb); ++ my $dn = $decoded->name; if(($id && $anc) && ($id == $oid) && ($query eq $dn)) { diff -Nru policyd-weight-0.1.15.2/debian/patches/11_fix_ipv6_socket_creation.patch policyd-weight-0.1.15.2/debian/patches/11_fix_ipv6_socket_creation.patch --- policyd-weight-0.1.15.2/debian/patches/11_fix_ipv6_socket_creation.patch 2014-10-04 17:14:19.000000000 +0200 +++ policyd-weight-0.1.15.2/debian/patches/11_fix_ipv6_socket_creation.patch 2015-12-01 09:08:31.000000000 +0100 @@ -6,7 +6,7 @@ --- a/policyd-weight +++ b/policyd-weight -@@ -914,15 +914,31 @@ +@@ -913,15 +913,31 @@ if($res) { my $ns = (($res->nameserver)[0]); @@ -46,7 +46,7 @@ } } -@@ -1394,17 +1410,32 @@ +@@ -1393,17 +1409,32 @@ $s->close; # don't use inherited DNS sockets } my $ns = (($res->nameserver)[0]); diff -Nru policyd-weight-0.1.15.2/debian/patches/12_del_rhsbl.ahbl.org.patch policyd-weight-0.1.15.2/debian/patches/12_del_rhsbl.ahbl.org.patch --- policyd-weight-0.1.15.2/debian/patches/12_del_rhsbl.ahbl.org.patch 2015-01-07 07:28:21.000000000 +0100 +++ policyd-weight-0.1.15.2/debian/patches/12_del_rhsbl.ahbl.org.patch 2015-12-01 09:08:31.000000000 +0100 @@ -3,7 +3,7 @@ DEP: 3 --- a/policyd-weight +++ b/policyd-weight -@@ -389,8 +389,7 @@ +@@ -388,8 +388,7 @@ ## RHSBL settings my @rhsbl_score = ( diff -Nru policyd-weight-0.1.15.2/debian/patches/13_fix_default_rhsbl_dnsbl_in_man5.patch policyd-weight-0.1.15.2/debian/patches/13_fix_default_rhsbl_dnsbl_in_man5.patch --- policyd-weight-0.1.15.2/debian/patches/13_fix_default_rhsbl_dnsbl_in_man5.patch 1970-01-01 01:00:00.000000000 +0100 +++ policyd-weight-0.1.15.2/debian/patches/13_fix_default_rhsbl_dnsbl_in_man5.patch 2015-11-30 20:34:32.000000000 +0100 @@ -0,0 +1,34 @@ +Description: patch updates default dnsbls/rhsbls in man5 manpage +Author: Werner Detter <wer...@aloah-from-hell.de> +DEP: 3 +--- a/man/man5/policyd-weight.conf.5 ++++ b/man/man5/policyd-weight.conf.5 +@@ -303,13 +303,10 @@ + The default is: + + @dnsbl_score = ( +- "dynablock.njabl.org", 3.25, 0, "DYN_NJABL", +- "dnsbl.njabl.org", 4.25, \-1.5, "BL_NJABL", +- "bl.spamcop.net", 1.75, \-1.5, "SPAMCOP", ++ "pbl.spamhaus.org", 3.25, 0, "DYN_PBL_SPAMHAUS", + "sbl-xbl.spamhaus.org", 4.35, \-1.5, "SBL_XBL_SPAMHAUS", +- "list.dsbl.org", 4.35, 0, "DSBL_ORG", +- "ix.dnsbl.manitu.net", 4.35, 0, "IX_MANITU", +- "relays.ordb.org", 3.25, 0, "ORDB_ORG" ++ "bl.spamcop.net", 3.75, \-1.5, "SPAMCOP", ++ "ix.dnsbl.manitu.net", 4.35, 0, "IX_MANITU" + .br + ); + +@@ -332,10 +329,7 @@ + The default is: + + @rhsbl_score = ( +- "rhsbl.ahbl.org", 1.8, 0, "AHBL", +- "dsn.rfc-ignorant.org", 3.2, 0, "DSN_RFCI", +- "postmaster.rfc-ignorant.org", 1 , 0, "PM_RFCI", +- "abuse.rfc-ignorant.org", 1, 0, "ABUSE_RFCI" ++ "multi.surbl.org", 4, 0, "SURBL" + .br + ); + diff -Nru policyd-weight-0.1.15.2/debian/patches/14_ignore_rfc1918_a_records_config_option.patch policyd-weight-0.1.15.2/debian/patches/14_ignore_rfc1918_a_records_config_option.patch --- policyd-weight-0.1.15.2/debian/patches/14_ignore_rfc1918_a_records_config_option.patch 1970-01-01 01:00:00.000000000 +0100 +++ policyd-weight-0.1.15.2/debian/patches/14_ignore_rfc1918_a_records_config_option.patch 2015-12-01 09:08:31.000000000 +0100 @@ -0,0 +1,67 @@ +Description: introduces new config option $IGNORE_RFC1918_A. If enabled A records with RFC1918 addresses +aren't treated as bogus addresses by policyd-weight and therefore bogus_mx_score isn't added. +Origin: Julien Cristau <jcris...@debian.org> +Author: Werner Detter <wer...@aloah-from-hell.de> +DEP: 3 +Bug-Debian: http://bugs.debian.org/799314 + +--- a/policyd-weight ++++ b/policyd-weight +@@ -482,6 +482,10 @@ + # established connections to one policyd-weight + # child + ++my $IGNORE_RFC1918_A = 0; # If enabled (1) A records with RFC1918 addresses ++ # aren't treated as bogus addresses by policyd-weight ++ # and therefore bogus_mx_score isn't added. ++ + # scores for checks, WARNING: they may manipulate eachother + # or be factors for other scores. + # HIT score, MISS Score +@@ -2207,8 +2211,18 @@ + + if($tmpcnt == 0) + { +- $from_addresses .= ' '.$ip_address; +- } ++ if($IGNORE_RFC1918_A == 1) ++ { ++ if($ip_address !~ /(127\.|192\.168\.|10\.|172\.(?:1[6-9]|2\d|3[01])\.)/) ++ { ++ $from_addresses .= ' '.$ip_address; ++ } ++ } ++ else ++ { ++ $from_addresses .= ' '.$ip_address; ++ } ++ } + + $addresses .= ' '.$ip_address; + +--- a/policyd-weight.conf.sample ++++ b/policyd-weight.conf.sample +@@ -174,6 +174,10 @@ + # established connections to one policyd-weight + # child + ++ $IGNORE_RFC1918_A = 0; # If enabled (1) A records with RFC1918 addresses ++ # aren't treated as bogus addresses by policyd-weight ++ # and therefore bogus_mx_score isn't added. ++ + # scores for checks, WARNING: they may manipulate eachother + # or be factors for other scores. + # HIT score, MISS Score +--- a/man/man5/policyd-weight.conf.5 ++++ b/man/man5/policyd-weight.conf.5 +@@ -86,6 +86,10 @@ + If that many queries fail, the mail is accepted with \fB$MAXDNSERRMSG\fR. + .br + In total DNS queries this means: $MAXDNSERR * $DNS_RETRIES ++.IP "\fB$IGNORE_RFC1918_A\fR (default: 0)" ++.br ++If enabled (1) A records with RFC1918 addresses aren't treated as bogus ++addresses by policyd-weight and therefore bogus_mx_score isn't added. + + .SH "MISC SETTINGS" + .ad diff -Nru policyd-weight-0.1.15.2/debian/patches/series policyd-weight-0.1.15.2/debian/patches/series --- policyd-weight-0.1.15.2/debian/patches/series 2015-01-07 07:26:16.000000000 +0100 +++ policyd-weight-0.1.15.2/debian/patches/series 2015-11-30 20:34:32.000000000 +0100 @@ -10,3 +10,5 @@ 10_replace_net_dns_dn_expand.patch 11_fix_ipv6_socket_creation.patch 12_del_rhsbl.ahbl.org.patch +13_fix_default_rhsbl_dnsbl_in_man5.patch +14_ignore_rfc1918_a_records_config_option.patch diff -Nru policyd-weight-0.1.15.2/debian/postrm policyd-weight-0.1.15.2/debian/postrm --- policyd-weight-0.1.15.2/debian/postrm 2014-10-04 16:43:25.000000000 +0200 +++ policyd-weight-0.1.15.2/debian/postrm 2015-11-30 20:34:32.000000000 +0100 @@ -7,6 +7,19 @@ set -e +pathfind() { + OLDIFS="$IFS" + IFS=: + for p in $PATH; do + if [ -x "$p/$*" ]; then + IFS="$OLDIFS" + return 0 + fi + done + IFS="$OLDIFS" + return 1 +} + case "$1" in purge) # find first and last SYSTEM_UID numbers @@ -28,11 +41,11 @@ if [ -n "$USERID" ]; then if [ "$FIST_SYSTEM_UID" -le "$USERID" ] && \ [ "$USERID" -le "$LAST_SYSTEM_UID" ] && \ - [ -x /usr/sbin/deluser ]; then + pathfind deluser; then deluser --quiet $NUSER || true # And then remove the group GROUPID=`getent group $NGROUP | cut -f 3 -d ':'` - if [ -n "$GROUPID" ] && [ -x /usr/sbin/delgroup ] ; then + if [ -n "$GROUPID" ] && pathfind delgroup; then delgroup --quiet $NGROUP || true fi fi diff -Nru policyd-weight-0.1.15.2/debian/rules policyd-weight-0.1.15.2/debian/rules --- policyd-weight-0.1.15.2/debian/rules 2014-10-04 16:43:25.000000000 +0200 +++ policyd-weight-0.1.15.2/debian/rules 2015-11-30 20:34:32.000000000 +0100 @@ -25,6 +25,7 @@ dh_installdocs dh_installinit -- defaults 19 21 dh_installman man/man5/policyd-weight.conf.5 man/man8/policyd-weight.8 + dh_lintian dh_link dh_compress dh_fixperms diff -Nru policyd-weight-0.1.15.2/debian/source.lintian-overrides policyd-weight-0.1.15.2/debian/source.lintian-overrides --- policyd-weight-0.1.15.2/debian/source.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 +++ policyd-weight-0.1.15.2/debian/source.lintian-overrides 2015-11-30 20:34:32.000000000 +0100 @@ -0,0 +1,2 @@ +# disable debian-watch-may-check-gpg-signature as upstream does not provide cryptographic signature +policyd-weight source: debian-watch-may-check-gpg-signature