cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move scapy to python 3 only

Browse Source 
Now that base regress is fully converted to using the Python 3 version
merge scapy (Python 2) and py3-scapy into scapy (Python 3).

OK bluhm sthen
This commit is contained in:
kn 2020-12-30 21:38:58 +00:00
parent 032bdc1064
commit d63327a39a
6 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.1115 2020/12/30 08:44:38 daniel Exp $
# $OpenBSD: Makefile,v 1.1116 2020/12/30 21:38:58 kn Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-3.504
PKGNAME = quirks-3.505
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

3
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.1132 2020/12/30 08:44:38 daniel Exp $
# $OpenBSD: Quirks.pm,v 1.1133 2020/12/30 21:38:58 kn Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -524,6 +524,7 @@ my $stem_extensions = {
'glibmm26' => 'glibmm268',
'docker' => 'docker-cli',
'py-lazy-object-proxy' => 'py3-lazy-project-proxy',
'py3-scapy' => 'scapy',
};
my $obsolete_reason = {

3
net/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1234 2020/12/30 15:52:35 sthen Exp $
# $OpenBSD: Makefile,v 1.1235 2020/12/30 21:38:58 kn Exp $
SUBDIR =
SUBDIR += adns
@ -687,7 +687,6 @@
SUBDIR += sbm
SUBDIR += scamper
SUBDIR += scapy
SUBDIR += scapy,python3
SUBDIR += seafile
SUBDIR += sendxmpp
SUBDIR += serf

5
net/pcapdiff/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2020/12/10 22:02:02 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2020/12/30 21:38:58 kn Exp $
COMMENT = compare pcap dump files
@ -6,6 +6,7 @@ GH_ACCOUNT = isginf
GH_PROJECT = pcap-diff
GH_COMMIT = d4c129e98527f42fbd94362d50608d5286e3f57d
DISTNAME = pcapdiff-0.20180816
REVISION = 0
CATEGORIES = net security
@ -13,7 +14,7 @@ CATEGORIES = net security
PERMIT_PACKAGE = Yes
MODULES = lang/python
RUN_DEPENDS = net/scapy,python3
RUN_DEPENDS = net/scapy
NO_TEST = Yes
NO_BUILD = Yes

17
net/scapy/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.40 2020/12/10 11:49:23 sthen Exp $
# $OpenBSD: Makefile,v 1.41 2020/12/30 21:38:58 kn Exp $
COMMENT = powerful interactive packet manipulation in python
MODPY_EGG_VERSION = 2.4.4
REVISION = 0
REVISION = 1
DISTNAME = scapy-${MODPY_EGG_VERSION}
@ -21,13 +21,7 @@ DISTFILES = ${EXTRACT_ONLY} ethertypes-20120703:0
EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
MODULES = lang/python
FLAVORS = python3
FLAVOR ?=
.if ${FLAVOR:Mpython3}
PKGNAME = py3-${DISTNAME}
.endif
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
UPDATE_PLIST_ARGS = -i MODPY_PY_PREFIX
@ -47,9 +41,6 @@ pre-configure:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/scapy
${INSTALL_DATA} ${DISTDIR}/ethertypes-20120703 \
${PREFIX}/share/examples/scapy/ethertypes${MODPY_BIN_SUFFIX}
mv ${PREFIX}/bin/UTscapy{,${MODPY_BIN_SUFFIX}}
mv ${PREFIX}/man/man1/scapy{,${MODPY_BIN_SUFFIX}}.1
mv ${PREFIX}/bin/scapy{,${MODPY_BIN_SUFFIX}}
${PREFIX}/share/examples/scapy/ethertypes
.include <bsd.port.mk>

12
net/scapy/pkg/PLIST
View File

@ -1,8 +1,10 @@
@comment $OpenBSD: PLIST,v 1.12 2020/12/10 11:49:23 sthen Exp $
@comment $OpenBSD: PLIST,v 1.13 2020/12/30 21:38:58 kn Exp $
@conflict py3-scapy-*
@conflict scapy6-*
@pkgpath net/scapy,python3
@pkgpath net/scapy6
bin/UTscapy${MODPY_BIN_SUFFIX}
bin/scapy${MODPY_BIN_SUFFIX}
bin/UTscapy
bin/scapy
lib/python${MODPY_VERSION}/site-packages/scapy/
lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/scapy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@ -616,7 +618,7 @@ lib/python${MODPY_VERSION}/site-packages/scapy/tools/scapy_pyannotate.py
lib/python${MODPY_VERSION}/site-packages/scapy/utils.py
lib/python${MODPY_VERSION}/site-packages/scapy/utils6.py
lib/python${MODPY_VERSION}/site-packages/scapy/volatile.py
@man man/man1/scapy${MODPY_BIN_SUFFIX}.1
@man man/man1/scapy.1
share/examples/scapy/
share/examples/scapy/ethertypes${MODPY_BIN_SUFFIX}
share/examples/scapy/ethertypes
@sample ${SYSCONFDIR}/ethertypes