SOURCES: libdnet-python.patch - fix build (type name is internal python type)

arekm arekm at pld-linux.org
Sun Nov 2 01:05:42 CET 2008


Author: arekm                        Date: Sun Nov  2 00:05:42 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix build (type name is internal python type)

---- Files affected:
SOURCES:
   libdnet-python.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/libdnet-python.patch
diff -u SOURCES/libdnet-python.patch:1.1 SOURCES/libdnet-python.patch:1.2
--- SOURCES/libdnet-python.patch:1.1	Fri Mar 21 19:54:50 2008
+++ SOURCES/libdnet-python.patch	Sun Nov  2 01:05:36 2008
@@ -8,3 +8,50 @@
      return strerror(errno)
  
  def __iter_append(entry, l):
+--- libdnet-1.11/python/dnet.pyx.org	2008-11-02 01:02:58.687884947 +0100
++++ libdnet-1.11/python/dnet.pyx	2008-11-02 01:04:19.111626507 +0100
+@@ -159,7 +159,7 @@
+     return PyString_FromStringAndSize(ea.data, 6)
+ 
+ def eth_pack_hdr(dst=ETH_ADDR_BROADCAST, src=ETH_ADDR_BROADCAST,
+-                 type=ETH_TYPE_IP):
++		ptype=ETH_TYPE_IP):
+     """Return a packed binary string representing an Ethernet header.
+ 	
+     Keyword arguments:
+@@ -171,7 +171,7 @@
+     cdef eth_addr_t s, d
+     __memcpy(s.data, src, 6)
+     __memcpy(d.data, dst, 6)
+-    __eth_pack_hdr(hdr, d, s, type)
++    __eth_pack_hdr(hdr, d, s, ptype)
+     return PyString_FromStringAndSize(hdr, 14)
+ 
+ #
+@@ -440,7 +440,7 @@
+     """
+     cdef addr_t _addr
+     
+-    def __init__(self, addrtxt=None, type=ADDR_TYPE_NONE):
++    def __init__(self, addrtxt=None, ptype=ADDR_TYPE_NONE):
+         if addrtxt != None and addr_aton(addrtxt, &self._addr) < 0:
+             if PyString_Size(addrtxt) == 4:
+                 self._addr.addr_type = ADDR_TYPE_IP
+@@ -784,7 +784,7 @@
+ cdef extern from *:
+     void __icmp_pack_hdr "icmp_pack_hdr" (char *hdr, int type, int code)
+     
+-def icmp_pack_hdr(type, code):
++def icmp_pack_hdr(ptype, code):
+     """Return a packed binary string representing an ICMP header.
+ 
+     Keyword arguments:
+@@ -792,7 +792,7 @@
+     code -- ICMP code		(8-bit integer)
+     """
+     cdef char buf[4]
+-    __icmp_pack_hdr(buf, type, code)
++    __icmp_pack_hdr(buf, ptype, code)
+     return PyString_FromStringAndSize(buf, sizeof(buf))
+ 
+ #
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/libdnet-python.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list