From a5078a6eb17421a8aea1b54566f774ab88b75d23 Mon Sep 17 00:00:00 2001
From: Stuart Gathman <stuart@gathman.org>
Date: Sat, 11 Oct 2008 15:57:59 +0000
Subject: [PATCH] Release 0.8.11

---
 MANIFEST.in   | 1 +
 ban2zone.py   | 9 ++++-----
 pymilter.spec | 7 ++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index a484446..2b534c7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -16,6 +16,7 @@ include bms.py
 include spf.py
 include cid2spf.py
 include spfquery.py
+include ban2zone.py
 include test.py
 include sample.py
 include milter-template.py
diff --git a/ban2zone.py b/ban2zone.py
index ec0e31e..fc9bcc1 100644
--- a/ban2zone.py
+++ b/ban2zone.py
@@ -1,14 +1,13 @@
 #!/usr/bin/python2.4
 
-# Convert banned ip list to zonefile data suitable for use as a 
-# DNS blacklist with BIND.  This is a way to share your banned ips
-# with friends.
-
 import socket
 import sys
 from glob import glob
 
-banned_ips = [socket.inet_aton(ip) for fn in sys.argv[1:] for ip in open(fn)]
+banned_ips = set(socket.inet_aton(ip) 
+    for fn in sys.argv[1:]
+    for ip in open(fn))
+banned_ips = list(banned_ips)
 banned_ips.sort()
 for ip in banned_ips:
   a = socket.inet_ntoa(ip).split('.')
diff --git a/pymilter.spec b/pymilter.spec
index ca77c5b..9e9ad17 100644
--- a/pymilter.spec
+++ b/pymilter.spec
@@ -2,9 +2,9 @@
 # module.  To compile all three on 32-bit Intel, use:
 # rpmbuild -ba --target=i386,noarch pymilter.spec
 
-%define __python python
+%define __python python2.4
 %define version 0.8.11
-%define release 1%{?dist}
+%define release 1%{?dist}.py24
 # what version of RH are we building for?
 %define redhat7 0
 
@@ -73,7 +73,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/mail
 mkdir $RPM_BUILD_ROOT/var/log/milter/save
 mkdir -p $RPM_BUILD_ROOT%{libdir}
 cp *.txt $RPM_BUILD_ROOT/var/log/milter
-cp bms.py spfmilter.py $RPM_BUILD_ROOT%{libdir}
+cp -p bms.py spfmilter.py ban2zone.py $RPM_BUILD_ROOT%{libdir}
 cp milter.cfg $RPM_BUILD_ROOT/etc/mail/pymilter.cfg
 cp spfmilter.cfg $RPM_BUILD_ROOT/etc/mail
 
@@ -172,6 +172,7 @@ fi
 %dir /var/log/milter
 %dir /var/log/milter/save
 %config %{libdir}/bms.py
+%config %{libdir}/ban2zone.py
 %config(noreplace) /var/log/milter/strike3.txt
 %config(noreplace) /var/log/milter/softfail.txt
 %config(noreplace) /var/log/milter/fail.txt