From: Ivan Rako <irako@nekkar.carnet.hr>
Date: Wed, 12 Jun 2013 13:17:38 +0000 (+0200)
Subject: izbacen dnsbl.njabl.org
X-Git-Tag: debian/2.7.1.5^0
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=c18ccf295b02b5ab918b983f2e651de97e58c7ba;p=postfix-cn.git

izbacen dnsbl.njabl.org
---

diff --git a/debian/changelog b/debian/changelog
index 946b5b0..93a7b5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postfix-cn (2.7.1.5) stable; urgency=medium
+
+  * Izbacen dnsbl.njabl.org iz popisa RBL-ova jer vise ne postoji
+
+ -- Ivan Rako <Ivan.Rako@CARNet.hr>  Wed, 12 Jun 2013 15:14:38 +0200
+
 postfix-cn (2.7.1.4) stable; urgency=medium
 
   * Koristi se smtp_tls_security_level i smtpd_tls_security_level umjesto
diff --git a/debian/postinst b/debian/postinst
index c294a00..fe02c15 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -31,6 +31,17 @@ if echo $rbl | grep -q opm.blitzed.org; then
   db_set postfix-cn/rbl "$rbl" || true
 fi
 
+# Wed, 12 Jun 2013 15:15:28 +0200
+# dnsbl.njabl.org je ugasen 2013-03
+if echo $rbl | grep -q dnsbl.njabl.org; then
+  rbl="`echo $rbl | sed 's/dnsbl.njabl.org, //g'`"
+  # za svaki slucaj, ako je na kraju
+  rbl="`echo $rbl | sed 's/dnsbl.njabl.org//g'`"
+  db_set postfix-cn/rbl "$rbl" || true
+fi
+
+db_get postfix-cn/matchgecos || true
+
 db_get postfix-cn/matchgecos || true
 matchgecos="$RET"
 
diff --git a/debian/templates b/debian/templates
index 908a160..38309fc 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,6 +1,6 @@
 Template: postfix-cn/rbl
 Type: multiselect
-Choices: zen.dnsbl-sh.carnet.hr, zen.spamhaus.org, bl.spamcop.net, dnsbl.njabl.org
+Choices: zen.dnsbl-sh.carnet.hr, zen.spamhaus.org, bl.spamcop.net
 _Description: Koje RBL zelite?
  Postfix moze prilikom provjere primanja e-mail poruka provjeriti da li
  je posiljatelj zavrsio na nekoj od RBL (Realtime Blackhole List) listi.