packages: python-netaddr/python-netaddr.spec, python-netaddr/issue-2.patch ...

[glen]

Author: glen                         Date: Sat Oct  1 19:24:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add invalid netaddr patch from fedora

---- Files affected:
packages/python-netaddr:
   python-netaddr.spec (1.7 -> 1.8) , issue-2.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/python-netaddr/python-netaddr.spec
diff -u packages/python-netaddr/python-netaddr.spec:1.7 packages/python-netaddr/python-netaddr.spec:1.8
--- packages/python-netaddr/python-netaddr.spec:1.7	Fri Jul 15 19:20:01 2011
+++ packages/python-netaddr/python-netaddr.spec	Sat Oct  1 21:24:49 2011
@@ -7,11 +7,12 @@
 Summary:	A pure Python network address representation and manipulation library
 Name:		python-netaddr
 Version:	0.7.5
-Release:	2
+Release:	3
 License:	BSD
 Group:		Development/Languages/Python
 Source0:	https://github.com/downloads/drkjam/netaddr/netaddr-%{version}.tar.gz
 # Source0-md5:	06168e1efb753d4d3e48778a5373e192
+Patch0:		issue-2.patch
 URL:		https://github.com/drkjam/netaddr/
 BuildRequires:	python-modules
 %{?with_python3:BuildRequires:	python3-modules}
@@ -73,18 +74,18 @@
 
 %prep
 %setup -q -n %{module}-%{version}
+%patch0 -p1
 
 %build
-%{__python} ./setup.py build
+%{__python} setup.py build
 
 %if %{with python3}
-%{__python3} ./setup.py build
+%{__python3} setup.py build
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%{__python} ./setup.py install \
+%{__python} setup.py install \
 	--optimize 2 \
 	--root=$RPM_BUILD_ROOT
 
@@ -93,7 +94,7 @@
 %py_postclean
 
 %if %{with python3}
-%{__python3} ./setup.py install \
+%{__python3} setup.py install \
 	--optimize 2 \
 	--root=$RPM_BUILD_ROOT
 %py3_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
@@ -166,6 +167,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2011/10/01 19:24:49  glen
+- add invalid netaddr patch from fedora
+
 Revision 1.7  2011/07/15 17:20:01  jajcus
 - Python 3.2 fixes
 - Release: 2

================================================================
Index: packages/python-netaddr/issue-2.patch
diff -u /dev/null packages/python-netaddr/issue-2.patch:1.1
--- /dev/null	Sat Oct  1 21:24:55 2011
+++ packages/python-netaddr/issue-2.patch	Sat Oct  1 21:24:49 2011
@@ -0,0 +1,65 @@
+From 80071f4450261b70b70f537bc2b54d2c97d9f562 Mon Sep 17 00:00:00 2001
+From: "David P. D. Moss" <drkjam at gmail.com>
+Date: Thu, 25 Nov 2010 08:53:49 +0000
+Subject: [PATCH] Fixed github Issue no. 2. Thanks keesbos.
+
+---
+ netaddr/ip/__init__.py               |    2 ++
+ netaddr/tests/2.x/ip/constructor.txt |   11 +++++++++++
+ netaddr/tests/3.x/ip/constructor.txt |   11 +++++++++++
+ 3 files changed, 24 insertions(+), 0 deletions(-)
+
+diff --git a/netaddr/ip/__init__.py b/netaddr/ip/__init__.py
+index 0179c38..e4a6b7b 100644
+--- a/netaddr/ip/__init__.py
++++ b/netaddr/ip/__init__.py
+@@ -779,6 +779,8 @@ def parse_ip_network(module, addr, implicit_prefix=False, flags=0):
+                 #   Try a partial IPv4 network address...
+                 expanded_addr = _ipv4.expand_partial_address(val1)
+                 ip = IPAddress(expanded_addr, module.version, flags=INET_PTON)
++            else:
++                raise AddrFormatError('invalid IPNetwork address %s!' % addr)
+         value = ip._value
+ 
+         try:
+diff --git a/netaddr/tests/2.x/ip/constructor.txt b/netaddr/tests/2.x/ip/constructor.txt
+index f67f5e4..5a9e978 100644
+--- a/netaddr/tests/2.x/ip/constructor.txt
++++ b/netaddr/tests/2.x/ip/constructor.txt
+@@ -209,3 +209,14 @@ IPNetwork('172.24.0.0/16')
+ 
+ 
+ }}}
++
++Negative testing
++
++{{{
++
++>>> IPNetwork('foo')
++Traceback (most recent call last):
++...
++AddrFormatError: invalid IPNetwork foo
++
++}}}
+diff --git a/netaddr/tests/3.x/ip/constructor.txt b/netaddr/tests/3.x/ip/constructor.txt
+index 2ec47c0..35a5cd6 100644
+--- a/netaddr/tests/3.x/ip/constructor.txt
++++ b/netaddr/tests/3.x/ip/constructor.txt
+@@ -209,3 +209,14 @@ IPNetwork('172.24.0.0/16')
+ 
+ 
+ }}}
++
++Negative testing
++
++{{{
++
++>>> IPNetwork('foo')
++Traceback (most recent call last):
++...
++netaddr.core.AddrFormatError: invalid IPNetwork foo
++
++}}}
+-- 
+1.7.5.2
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-netaddr/python-netaddr.spec?r1=1.7&r2=1.8&f=u