From 49c87bb912d3d0f28983d891ced7da6dafe18b9e Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Feb 22 2018 05:29:08 +0000 Subject: Bump up to 2.0.2. --- diff --git a/.gitignore b/.gitignore index d8a3908..23ca82b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pypolicyd-spf-1.3.1.tar.gz /pypolicyd-spf-1.3.2.tar.gz /pypolicyd-spf-2.0.1.tar.gz +/pypolicyd-spf-2.0.2.tar.gz diff --git a/pypolicyd-spf-1.3.1-ipaddress.patch b/pypolicyd-spf-1.3.1-ipaddress.patch deleted file mode 100644 index 76d5db4..0000000 --- a/pypolicyd-spf-1.3.1-ipaddress.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- pypolicyd-spf-1.3.1/policyd-spf.original 2014-06-04 15:08:50.000000000 +1000 -+++ pypolicyd-spf-1.3.1/policyd-spf 2015-06-18 14:28:55.300135301 +1000 -@@ -38,10 +38,7 @@ - if int(micro) < 7: - raise ImportError("At least pyspf 2.0.7 is required.") - import policydspfsupp --try: -- import ipaddress --except ImportError: -- import ipaddr as ipaddress -+import ipaddress - try: - import authres - except: -@@ -54,6 +51,12 @@ - def _cidrmatch(ip, netwrk): - """Match connect IP against a CIDR network of other IP addresses.""" - -+ if sys.version_info.major < 3: -+ if isinstance(ip, str): -+ ip = ip.decode('ascii') -+ if isinstance(netwrk, str): -+ netwrk = netwrk.decode('ascii') -+ - try: - address = ipaddress.ip_address(ip) - except AttributeError: -@@ -65,6 +68,10 @@ - return network.__contains__(address) - - def _get_rdns_lookup(ip): -+ if sys.version_info.major < 3: -+ if isinstance(ip, str): -+ ip = ip.decode('ascii') -+ - try: - address = ipaddress.ip_address(ip) - except AttributeError: diff --git a/pypolicyd-spf.spec b/pypolicyd-spf.spec index 2ad4bb1..ed7dd1c 100644 --- a/pypolicyd-spf.spec +++ b/pypolicyd-spf.spec @@ -1,6 +1,6 @@ Name: pypolicyd-spf -Version: 2.0.1 -Release: 4%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: SPF Policy Server for Postfix (Python implementation) License: ASL 2.0 @@ -49,6 +49,9 @@ range of requirements. %changelog +* Thu Feb 22 2018 Bojan Smojver 2.0.2-1 +- bump up to 2.0.2 + * Fri Feb 09 2018 Fedora Release Engineering - 2.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 524cb42..f5d488a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pypolicyd-spf-2.0.1.tar.gz) = 85f51491ab1f44e197dbf9a15f9e723ba3aaf0472d9d1653595490d7211670a67cdca5699111ab5a29f9d919cd935ed58d8d70bd1312a4f0f90da4ef26a50509 +SHA512 (pypolicyd-spf-2.0.2.tar.gz) = adcc7b30c6922894f9407edd0637b02a138623f4480ec37635475396826b457c835b3ffb599d1985e306770fe5f72404552ed705bd957e63b5c54ca3d8991673