On 2016 Oct 30 (Sun) at 20:21:29 +0100 (+0100), Rafael Sadowski wrote:
:On Sun Oct 30, 2016 at 08:16:12PM +0100, Rafael Sadowski wrote:
:> On Sun Oct 30, 2016 at 07:28:42PM +0100, Peter Hessler wrote:
:> > On 2016 Oct 30 (Sun) at 14:37:19 +0100 (+0100), Peter Hessler wrote:
:> > :I would like to use pcapy in a python3 module, so we need to update it.
:> >
:> > Updated version that can install both the python2 and python3 versions
:> > at the same time.
:> >
:> > depends on r1.59 of sys/net/bpf.h that I committed recently.
:> >
:> > OK?
:> >
:>
:> Maybe with GH_?
:>
:
:... and cleanup WANTLIB
Yes, these look good to me.
:
:Kind regards,
:
:Rafael Sadowski
:
:Index: Makefile
:===================================================================
:RCS file: /cvs/ports/net/py-pcapy/Makefile,v
:retrieving revision 1.11
:diff -u -p -u -p -r1.11 Makefile
:--- Makefile 17 Apr 2015 16:15:59 -0000 1.11
:+++ Makefile 30 Oct 2016 19:19:43 -0000
:@@ -2,25 +2,25 @@
:
: COMMENT = libpcap module for Python
:
:-MODPY_EGG_VERSION = 0.10.5
:-DISTNAME = pcapy-${MODPY_EGG_VERSION}
:-PKGNAME = py-${DISTNAME}
:-REVISION = 7
:+MODPY_EGG_VERSION = 0.10.10
:+GH_ACCOUNT = CoreSecurity
:+GH_PROJECT = pcapy
:+GH_TAGNAME = ${MODPY_EGG_VERSION}
:
: CATEGORIES = net devel
:
:-HOMEPAGE = http://oss.coresecurity.com/projects/pcapy.html
:+HOMEPAGE =
https://www.coresecurity.com/corelabs-research/open-source-tools/pcapy
:
: # Apache
: PERMIT_PACKAGE_CDROM = Yes
:
:-WANTLIB += ${MODPY_WANTLIB} m stdc++ pcap pthread util
:-
:-MASTER_SITES = http://oss.coresecurity.com/repo/
:+WANTLIB += ${MODPY_WANTLIB} m stdc++ pcap
:
: MODULES = lang/python
:+MODPY_SETUPTOOLS = Yes
:
:-NO_TEST = Yes
:+FLAVORS = python3
:+FLAVOR ?=
:
: MAKE_ENV += LDSHARED="${CC} -shared -fPIC"
: MAKE_ENV += LDFLAGS="-L${LOCALBASE}/lib"
:@@ -28,5 +28,8 @@ MAKE_ENV += LDFLAGS="-L${LOCALBASE}/lib
: # fix msdos line-endings
: pre-patch:
: cd ${WRKSRC}; perl -i -pe 's/\r$$//' `find . -type f`
:+
:+pre-configure:
:+ ${SUBST_CMD} ${WRKSRC}/setup.py
:
: .include <bsd.port.mk>
:Index: distinfo
:===================================================================
:RCS file: /cvs/ports/net/py-pcapy/distinfo,v
:retrieving revision 1.2
:diff -u -p -u -p -r1.2 distinfo
:--- distinfo 18 Jan 2015 03:14:51 -0000 1.2
:+++ distinfo 30 Oct 2016 19:19:43 -0000
:@@ -1,2 +1,2 @@
:-SHA256 (pcapy-0.10.5.tar.gz) = gKdj2RgUg24M0eV7Y1GdxgITtCujxIbUeUyrrjD9elc=
:-SIZE (pcapy-0.10.5.tar.gz) = 18884
:+SHA256 (pcapy-0.10.10.tar.gz) = NEdTmoUWrhkIR1ZBqA/6EvaYanY1eW/Uz1ayJ4C7bok=
:+SIZE (pcapy-0.10.10.tar.gz) = 28332
:Index: patches/patch-pcap_pkthdr_cc
:===================================================================
:RCS file: /cvs/ports/net/py-pcapy/patches/patch-pcap_pkthdr_cc,v
:retrieving revision 1.1.1.1
:diff -u -p -u -p -r1.1.1.1 patch-pcap_pkthdr_cc
:--- patches/patch-pcap_pkthdr_cc 3 Apr 2009 15:45:41 -0000 1.1.1.1
:+++ patches/patch-pcap_pkthdr_cc 30 Oct 2016 19:19:43 -0000
:@@ -1,7 +1,7 @@
: $OpenBSD: patch-pcap_pkthdr_cc,v 1.1.1.1 2009/04/03 15:45:41 sthen Exp $
:---- pcap_pkthdr.cc.orig Fri Apr 3 11:52:32 2009
:-+++ pcap_pkthdr.cc Fri Apr 3 11:52:36 2009
:-@@ -24,7 +24,7 @@
:+--- pcap_pkthdr.cc.orig Sun Oct 30 14:05:35 2016
:++++ pcap_pkthdr.cc Sun Oct 30 14:05:35 2016
:+@@ -23,7 +23,7 @@
: // internal pcapobject
: typedef struct {
: PyObject_HEAD
:Index: patches/patch-setup_py
:===================================================================
:RCS file: /cvs/ports/net/py-pcapy/patches/patch-setup_py,v
:retrieving revision 1.1
:diff -u -p -u -p -r1.1 patch-setup_py
:--- patches/patch-setup_py 25 Dec 2011 23:59:06 -0000 1.1
:+++ patches/patch-setup_py 30 Oct 2016 19:19:43 -0000
:@@ -1,12 +1,15 @@
: $OpenBSD: patch-setup_py,v 1.1 2011/12/25 23:59:06 fgsch Exp $
:---- setup.py.orig Mon Dec 12 08:57:21 2011
:-+++ setup.py Mon Dec 12 08:57:34 2011
:-@@ -60,7 +60,7 @@ setup(name = PACKAGE_NAME,
:- include_dirs = include_dirs,
:- library_dirs = library_dirs,
:- libraries = libraries)],
:-- data_files = [(os.path.join('share', 'doc', PACKAGE_NAME),
:-+ data_files = [(os.path.join('share', 'doc', 'py-%s' % PACKAGE_NAME),
:- ['README', 'LICENSE', 'pcapy.html'])],
:+--- setup.py.orig Sun Oct 30 19:18:00 2016
:++++ setup.py Sun Oct 30 19:19:55 2016
:+@@ -72,7 +72,9 @@ setup(name=PACKAGE_NAME,
:+ libraries=libraries)],
:+ # scripts=['tests/pcapytests.py', 'tests/96pings.pcap'],
:+ data_files=[
:+- (os.path.join('share', 'doc', PACKAGE_NAME),
:++ (os.path.join('share', 'doc', '${MODPY_PY_PREFIX}%s' %
PACKAGE_NAME),
:+ ['README', 'LICENSE', 'pcapy.html']),
:+- ('tests', ['tests/pcapytests.py', 'tests/96pings.pcap'])]
:++ (os.path.join('share', 'doc',
:++ '${MODPY_PY_PREFIX}%s' % PACKAGE_NAME, 'tests'),
:++ ['tests/pcapytests.py', 'tests/96pings.pcap'])]
: )
:-
:Index: pkg/PLIST
:===================================================================
:RCS file: /cvs/ports/net/py-pcapy/pkg/PLIST,v
:retrieving revision 1.2
:diff -u -p -u -p -r1.2 PLIST
:--- pkg/PLIST 25 Dec 2011 23:59:06 -0000 1.2
:+++ pkg/PLIST 30 Oct 2016 19:19:43 -0000
:@@ -1,7 +1,14 @@
: @comment $OpenBSD: PLIST,v 1.2 2011/12/25 23:59:06 fgsch Exp $
:-lib/python${MODPY_VERSION}/site-packages/pca${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
:+lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
:+lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
:+lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
:+lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
:+lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
: lib/python${MODPY_VERSION}/site-packages/pcapy.so
: share/doc/${MODPY_PY_PREFIX}pcapy/
: share/doc/${MODPY_PY_PREFIX}pcapy/LICENSE
: share/doc/${MODPY_PY_PREFIX}pcapy/README
: share/doc/${MODPY_PY_PREFIX}pcapy/pcapy.html
:+share/doc/${MODPY_PY_PREFIX}pcapy/tests/
:+share/doc/${MODPY_PY_PREFIX}pcapy/tests/96pings.pcap
:+SHare/doc/${MODPY_PY_PREFIX}pcapy/tests/pcapytests.py
:
--
Pardon this fortune. Database under reconstruction.
