Bug#774850: wheezy-pu: package bley/0.1.5-2+deb7u1

[Evgeni Golov <evgeni@debian.org>]

Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

as noticed yesterday in #-release, there are a few packages in the archive,
which still use ahbl.org in their configs. bley is one of these packages,
and while the existance of ahbl.org in the config will not result in data
loss as per design of bley, it will result in delays and should be avoided.

The obvious patch looks like this:
-dnsbls = ix.dnsbl.manitu.net, dnsbl.ahbl.org, dnsbl.sorbs.net
+dnsbls = ix.dnsbl.manitu.net, dnsbl.sorbs.net

The whole debdiff against the version in stable is attached. If it's OK,
i'd like to upload to stable to meet the next point release.

Greets and thanks
Evgeni

-- System Information:
Debian Release: 8.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff --git a/debian/changelog b/debian/changelog
index 5bfb6e1..7c12b4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bley (0.1.5-2+deb7u1) stable; urgency=medium
+
+  * drop dnsbl.ahbl.org from the config, it was shut down and produces
+    false positives.
+
+ -- Evgeni Golov <evgeni@debian.org>  Thu, 08 Jan 2015 12:18:35 +0100
+
 bley (0.1.5-2) unstable; urgency=low
 
   * cherry-pick patch from upstream to disable njabl.org
diff --git a/debian/patches/drop-dnsbl.ahbl.org-from-the-config.patch b/debian/patches/drop-dnsbl.ahbl.org-from-the-config.patch
new file mode 100644
index 0000000..4f5e281
--- /dev/null
+++ b/debian/patches/drop-dnsbl.ahbl.org-from-the-config.patch
@@ -0,0 +1,25 @@
+From 94394d74bae1256b6db24b70a7b8a99d156c8dac Mon Sep 17 00:00:00 2001
+From: Evgeni Golov <evgeni@golov.de>
+Date: Wed, 7 Jan 2015 21:55:14 +0100
+Subject: [PATCH] drop dnsbl.ahbl.org from the config example, it's dead
+
+---
+ bley.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bley.conf b/bley.conf
+index c20e7bd..6dd1ec2 100644
+--- a/bley.conf
++++ b/bley.conf
+@@ -18,7 +18,7 @@ dbpass = bley
+ dbname = bley
+ 
+ # Which DNSBLs and DNSWLs to use?
+-dnsbls = ix.dnsbl.manitu.net, dnsbl.ahbl.org, dnsbl.sorbs.net
++dnsbls = ix.dnsbl.manitu.net, dnsbl.sorbs.net
+ dnswls = list.dnswl.org
+ 
+ # Whitelist after dnswl_threshold hits.
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 5ec0bf8..b86e3e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-debian_config_and_paths.patch
 02-drop-dnsbl.njabl.org-it-s-not-maintained-anymore.patch
+drop-dnsbl.ahbl.org-from-the-config.patch