From f06b38f7bb83b51dfb9d461ce1664fd977aef1f3 Mon Sep 17 00:00:00 2001
From: fgsch <fgsch@openbsd.org>
Date: Wed, 23 Jun 2010 16:53:15 +0000
Subject: [PATCH] be more cautious when loading modules.  spotted by naddy@.

---
 net/py-dpkt/Makefile                 |  4 ++--
 net/py-dpkt/patches/patch-dpkt_ip_py | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 net/py-dpkt/patches/patch-dpkt_ip_py

diff --git a/net/py-dpkt/Makefile b/net/py-dpkt/Makefile
index 7842b345dba..d6e68dd307b 100644
--- a/net/py-dpkt/Makefile
+++ b/net/py-dpkt/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2010/06/15 17:16:13 fgsch Exp $
+# $OpenBSD: Makefile,v 1.3 2010/06/23 16:53:15 fgsch Exp $
 
 COMMENT =		python network packet manipulation library
 
 MODPY_EGG_VERSION =	1.7
 DISTNAME =		dpkt-${MODPY_EGG_VERSION}
-PKGNAME =		py-${DISTNAME}
+PKGNAME =		py-${DISTNAME}p0
 
 CATEGORIES =		net
 
diff --git a/net/py-dpkt/patches/patch-dpkt_ip_py b/net/py-dpkt/patches/patch-dpkt_ip_py
new file mode 100644
index 00000000000..8140643c55d
--- /dev/null
+++ b/net/py-dpkt/patches/patch-dpkt_ip_py
@@ -0,0 +1,15 @@
+$OpenBSD: patch-dpkt_ip_py,v 1.1 2010/06/23 16:53:15 fgsch Exp $
+--- dpkt/ip.py.orig	Thu Jun 17 15:51:24 2010
++++ dpkt/ip.py	Thu Jun 17 15:50:52 2010
+@@ -247,9 +247,9 @@ def __load_protos():
+             name = k[9:].lower()
+             try:
+                 mod = __import__(name, g)
+-            except ImportError:
++                IP.set_proto(v, getattr(mod, name.upper()))
++            except (ImportError, AttributeError):
+                 continue
+-            IP.set_proto(v, getattr(mod, name.upper()))
+ 
+ if not IP._protosw:
+     __load_protos()