uodate to py3-pf-0.2.2, maintainer timeout
This commit is contained in:
sthen
parent
57821ac022
commit
e777c78d45
|
|
@ -1,13 +1,9 @@
|
|||
COMMENT = Python module for managing PF
|
||||
|
||||
MODPY_EGG_VERSION = 0.2.1
|
||||
MODPY_EGG_VERSION = 0.2.2
|
||||
GH_ACCOUNT = dotpy
|
||||
GH_PROJECT = py-pf
|
||||
GH_TAGNAME = ${MODPY_EGG_VERSION}
|
||||
REVISION = 5
|
||||
|
||||
# remove with next update; tarball was regenerated at github
|
||||
DISTFILES = ${DISTNAME}_1{${DISTNAME}}${EXTRACT_SUFX}
|
||||
|
||||
MAINTAINER = Jasper Lievisse Adriaanse <jasper@openbsd.org>
|
||||
|
||||
|
|
@ -17,13 +13,9 @@ CATEGORIES = net
|
|||
PERMIT_PACKAGE = Yes
|
||||
|
||||
MODULES = lang/python
|
||||
MODPY_PYBUILD = setuptools
|
||||
|
||||
FLAVORS = python3
|
||||
FLAVOR = python3
|
||||
|
||||
BUILD_DEPENDS = ${RUN_DEPENDS}
|
||||
RUN_DEPENDS = devel/py-six${MODPY_FLAVOR}
|
||||
|
||||
NO_TEST = Yes
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (py-pf-0.2.1_1.tar.gz) = ICvVTNKpw9Kb5jXC4U05lCUxlgbjNeFFP7q9XARxRbI=
|
||||
SIZE (py-pf-0.2.1_1.tar.gz) = 41978
|
||||
SHA256 (py-pf-0.2.2.tar.gz) = R9HoHr8zBYhWdfJVzySb12qqtRQESX0k4Ei7FDVAEiU=
|
||||
SIZE (py-pf-0.2.2.tar.gz) = 42169
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
sync with sys/net/pfvar.h -r1.505
|
||||
|
||||
Index: pf/_struct.py
|
||||
--- pf/_struct.py.orig
|
||||
+++ pf/_struct.py
|
||||
@@ -461,6 +461,8 @@ class pfi_kif(Structure): # From /usr/in
|
||||
("pfik_states", c_int),
|
||||
("pfik_rules", c_int),
|
||||
("pfik_routes", c_int),
|
||||
+ ("pfik_srcnodes", c_int),
|
||||
+ ("pfik_flagrefs", c_int),
|
||||
("pfik_dynaddrs", c_void_p * 2)] # TAILQ_HEAD(,pfi_dynaddr)
|
||||
|
||||
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
All integers are long integers in Python 3.
|
||||
|
||||
Index: pf/filter.py
|
||||
--- pf/filter.py.orig
|
||||
+++ pf/filter.py
|
||||
@@ -29,9 +29,10 @@ __all__ = ['PacketFilter']
|
||||
|
||||
# ioctl() operations
|
||||
IOCPARM_MASK = 0x1fff
|
||||
-IOC_VOID = 0x20000000L
|
||||
-IOC_OUT = 0x40000000L
|
||||
-IOC_IN = 0x80000000L
|
||||
+IOC_VOID = 0x20000000
|
||||
+IOC_OUT = 0x40000000
|
||||
+IOC_IN = 0x80000000
|
||||
+
|
||||
IOC_INOUT = IOC_IN | IOC_OUT
|
||||
|
||||
def _IOC(inout, group, num, len):
|
||||
@@ -153,7 +154,7 @@ class PacketFilter(object):
|
||||
with open(self.dev, 'w') as d:
|
||||
try:
|
||||
ioctl(d, DIOCSTART)
|
||||
- except IOError, (e, s):
|
||||
+ except IOError as e:
|
||||
if e != EEXIST: # EEXIST means PF is already enabled
|
||||
raise
|
||||
|
||||
@@ -162,7 +163,7 @@ class PacketFilter(object):
|
||||
with open(self.dev, 'w') as d:
|
||||
try:
|
||||
ioctl(d, DIOCSTOP)
|
||||
- except IOError, (e, s):
|
||||
+ except IOError as e:
|
||||
if e != ENOENT: # ENOENT means PF is already disabled
|
||||
raise
|
||||
|
||||
@@ -233,7 +234,7 @@ class PacketFilter(object):
|
||||
with _PFTrans(d):
|
||||
try:
|
||||
ioctl(d, DIOCSETLIMIT, pl)
|
||||
- except IOError, (e, s):
|
||||
+ except IOError as e:
|
||||
if e == EBUSY:
|
||||
raise PFError("Current pool size > {0:d}".format(value))
|
||||
raise
|
||||
@@ -334,7 +335,7 @@ class PacketFilter(object):
|
||||
with _PFTrans(d):
|
||||
try:
|
||||
ioctl(d, DIOCSETSTATUSIF, pi)
|
||||
- except IOError, (e, s):
|
||||
+ except IOError as e:
|
||||
if e == EINVAL:
|
||||
raise PFError("Invalid ifname: '{0}'".format(ifname))
|
||||
raise
|
||||
@@ -624,7 +625,7 @@ class PacketFilter(object):
|
||||
for t in buffer[:io.pfrio_size]:
|
||||
try:
|
||||
addrs = self.get_addrs(PFTable(t))
|
||||
- except IOError, (e, s):
|
||||
+ except IOError as e:
|
||||
pass # Ignore tables of which you can't get the addresses
|
||||
else:
|
||||
tables.append(PFTable(t, *addrs))
|
||||
|
|
@ -2,18 +2,31 @@
|
|||
lib/python${MODPY_VERSION}/site-packages/pf/
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/__init__.py
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}/
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}_struct.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}_struct.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}filter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}filter.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}lib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}lib.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}queue.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}queue.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}rule.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}rule.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}status.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}status.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}table.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}table.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/_base.py
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/_struct.py
|
||||
|
|
@ -30,9 +43,17 @@ lib/python${MODPY_VERSION}/site-packages/pf/table.py
|
|||
lib/python${MODPY_VERSION}/site-packages/pf/tests/
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/tests/__init__.py
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pf/tests/${MODPY_PYCACHE}/
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/tests/${MODPY_PYCACHE}cmd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/tests/${MODPY_PYCACHE}cmd.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/tests/${MODPY_PYCACHE}test_filter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/tests/${MODPY_PYCACHE}test_filter.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/tests/cmd.py
|
||||
lib/python${MODPY_VERSION}/site-packages/pf/tests/test_filter.py
|
||||
lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
|
||||
lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_EGG_VERSION}.dist-info/
|
||||
lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_EGG_VERSION}.dist-info/LICENSE.md
|
||||
lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_EGG_VERSION}.dist-info/METADATA
|
||||
lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_EGG_VERSION}.dist-info/RECORD
|
||||
lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_EGG_VERSION}.dist-info/WHEEL
|
||||
lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_EGG_VERSION}.dist-info/top_level.txt
|
||||
|
|
|
|||
Loading…
Reference in New Issue