diff -u scapy-1.0.5.20/debian/rules scapy-1.0.5.20/debian/rules --- scapy-1.0.5.20/debian/rules +++ scapy-1.0.5.20/debian/rules @@ -6,4 +6,5 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/python-distutils.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_DH_INSTALL_SOURCEDIR := debian/tmp diff -u scapy-1.0.5.20/debian/changelog scapy-1.0.5.20/debian/changelog --- scapy-1.0.5.20/debian/changelog +++ scapy-1.0.5.20/debian/changelog @@ -1,3 +1,14 @@ +scapy (1.0.5.20-1ubuntu1) gutsy; urgency=low + + * Wrap interface call to prevent crash due to call to uninitialized interface. + Ubuntu unique interface management confounds scapy interface status + detection (Tested and not reproduced on Debian Testing) (LP: #96753) + * Add cdbs support for simple-patchsys and debian/patches + * Moved build-depends-indep to build-depends (Lintian Errors) + * Change maintainer to MOTU + + -- Scott Kitterman Fri, 27 Apr 2007 21:45:56 -0400 + scapy (1.0.5.20-1) unstable; urgency=low * New upstream release. (Closes: #407918) diff -u scapy-1.0.5.20/debian/control scapy-1.0.5.20/debian/control --- scapy-1.0.5.20/debian/control +++ scapy-1.0.5.20/debian/control @@ -1,9 +1,9 @@ Source: scapy Section: net Priority: optional -Maintainer: David Villa Alises -Build-Depends: debhelper (>= 5.0.38), cdbs (>=0.4.43) -Build-Depends-Indep: python-all-dev, python-support (>= 0.3) +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: David Villa Alises +Build-Depends: debhelper (>= 5.0.38), cdbs (>=0.4.43), python-all-dev, python-support (>= 0.3) Standards-Version: 3.7.2 XS-Python-Version: all only in patch2: unchanged: --- scapy-1.0.5.20.orig/debian/patches/01-unused-interface-wrapper.patch +++ scapy-1.0.5.20/debian/patches/01-unused-interface-wrapper.patch @@ -0,0 +1,15 @@ +diff -Nur scapy-1.0.5.20/scapy.py scapy-1.0.5.20.new/scapy.py +--- scapy-1.0.5.20/scapy.py 2007-04-27 22:04:52.000000000 -0400 ++++ scapy-1.0.5.20.new/scapy.py 2007-04-27 22:07:18.000000000 -0400 +@@ -2678,7 +2678,10 @@ + continue + if flags & RTF_REJECT: + continue +- ifreq = ioctl(s, SIOCGIFADDR,struct.pack("16s16x",iff)) ++ try: ++ ifreq = ioctl(s, SIOCGIFADDR,struct.pack("16s16x",iff)) ++ except: ++ continue + addrfamily = struct.unpack("h",ifreq[16:18])[0] + if addrfamily == socket.AF_INET: + ifaddr = inet_ntoa(ifreq[20:24])