Remove: abandoned upstream, we have to fix it each time base changes.

sthen had already warned more than one year ago.

ok sthen@ jasper@
This commit is contained in:
jca 2015-12-07 18:42:53 +00:00
parent 458abeba7e
commit ae91a4eced
15 changed files with 5 additions and 380 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1425 2015/12/01 22:44:32 edd Exp $
# $OpenBSD: Makefile,v 1.1426 2015/12/07 18:42:53 jca Exp $
SUBDIR =
SUBDIR += ElectricFence
@ -1276,7 +1276,6 @@
SUBDIR += py-nose
SUBDIR += py-nose,python3
SUBDIR += py-notify
SUBDIR += py-openbsd
SUBDIR += py-optik
SUBDIR += py-path.py
SUBDIR += py-pathlib

View File

@ -1,40 +0,0 @@
# $OpenBSD: Makefile,v 1.21 2015/12/03 21:24:29 sthen Exp $
COMMENT= specific Python bindings for OpenBSD
V= 0.1.2
DISTNAME= pyopenbsd-${V}
PKGNAME= py-openbsd-${V}
REVISION= 17
CATEGORIES= devel
HOMEPAGE= http://dev.nullcube.com/
MAINTAINER= Aldo Cortesi <aldo@nullcube.com>
# BSD
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ${MODPY_WANTLIB}
WANTLIB += kvm pcap pthread
MASTER_SITES= https://spacehopper.org/mirrors/
EXTRACT_SUFX= .tgz
MODULES= lang/python
DOCSDIR= ${PREFIX}/share/doc/py-openbsd
EXAMPLESDIR= ${PREFIX}/share/examples/py-openbsd
post-install:
${INSTALL_DATA_DIR} ${DOCSDIR}
cd ${WRKSRC}/doc; tar cf - * | tar xf - -C ${DOCSDIR}
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
do-test: fake
@cd ${WRKSRC}/test && ${MAKE_ENV} \
PYTHONPATH=${WRKINST}${MODPY_SITEPKG} ${MODPY_BIN} ./run_all.py
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (pyopenbsd-0.1.2.tgz) = FQjvtWPqhDqm4WwHxaEe8UkA9BHHPOVOdoGzN6qAzq4=
SIZE (pyopenbsd-0.1.2.tgz) = 110253

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-openbsd__ifconfig_c,v 1.2 2015/09/11 18:48:41 sthen Exp $
--- openbsd/_ifconfig.c.orig Tue Dec 21 07:32:04 2004
+++ openbsd/_ifconfig.c Fri Sep 11 20:48:18 2015
@@ -162,7 +162,7 @@ PyObject *decodeMediaWord(int mw){
PyObject *getifmedia(PyObject *self, PyObject *args){
struct ifmediareq ifmr;
char *ifname;
- int *media_list;
+ uint64_t *media_list;
int s, i;
PyObject *retdict, *optionlist, *tmp, *tmp2;
@@ -186,7 +186,7 @@ PyObject *getifmedia(PyObject *self, PyObject *args){
if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0)
goto error;
- media_list = malloc(ifmr.ifm_count * sizeof(int));
+ media_list = malloc(ifmr.ifm_count * sizeof(uint64_t));
if (media_list == NULL)
goto error;
ifmr.ifm_ulist = media_list;

View File

@ -1,58 +0,0 @@
$OpenBSD: patch-openbsd__netstat_c,v 1.5 2014/01/28 13:31:18 sthen Exp $
--- openbsd/_netstat.c.orig Tue Dec 21 06:32:04 2004
+++ openbsd/_netstat.c Tue Jan 28 13:26:51 2014
@@ -30,6 +30,7 @@
#include <sys/socket.h>
#include <net/if.h>
#include <net/if_types.h>
+#include <net/if_var.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
#include <netinet/ip_var.h>
@@ -54,10 +55,6 @@
#include <netinet/ip_esp.h>
#include <netinet/ip_ipip.h>
#include <netinet/ip_ipcomp.h>
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
#include <kvm.h>
#include <Python.h>
@@ -140,8 +137,6 @@ PyObject *ipstats(PyObject *self, PyObject *args){
if (!addULongLong(retdict, "toolong", (unsigned long long)ips.ips_toolong)) return NULL;
if (!addULongLong(retdict, "nogif", (unsigned long long)ips.ips_nogif)) return NULL;
if (!addULongLong(retdict, "badaddr", (unsigned long long)ips.ips_badaddr)) return NULL;
- if (!addULongLong(retdict, "inhwcsum", (unsigned long long)ips.ips_inhwcsum)) return NULL;
- if (!addULongLong(retdict, "outhwcsum", (unsigned long long)ips.ips_outhwcsum)) return NULL;
return retdict;
}
@@ -186,7 +181,6 @@ PyObject *ip6stats(PyObject *self, PyObject *args){
//FIXME m2m, an array of 32 long longs.
if (!addULongLong(retdict, "mext1", (unsigned long long)ip6s.ip6s_mext1)) return NULL;
if (!addULongLong(retdict, "mext2m", (unsigned long long)ip6s.ip6s_mext2m)) return NULL;
- if (!addULongLong(retdict, "exthdrtoolong", (unsigned long long)ip6s.ip6s_exthdrtoolong)) return NULL;
if (!addULongLong(retdict, "nogif", (unsigned long long)ip6s.ip6s_nogif)) return NULL;
if (!addULongLong(retdict, "toomanyhdr", (unsigned long long)ip6s.ip6s_toomanyhdr)) return NULL;
return retdict;
@@ -334,8 +328,6 @@ PyObject *tcpstats(PyObject *self, PyObject *args){
if (!addULongLong(retdict, "badsyn", (unsigned long long)tcps.tcps_badsyn)) return NULL;
if (!addULongLong(retdict, "rcvbadsig", (unsigned long long)tcps.tcps_rcvbadsig)) return NULL;
if (!addULongLong(retdict, "rcvgoodsig", (unsigned long long)tcps.tcps_rcvgoodsig)) return NULL;
- if (!addULongLong(retdict, "inhwcsum", (unsigned long long)tcps.tcps_inhwcsum)) return NULL;
- if (!addULongLong(retdict, "outhwcsum", (unsigned long long)tcps.tcps_outhwcsum)) return NULL;
if (!addULongLong(retdict, "ecn_accepts", (unsigned long long)tcps.tcps_ecn_accepts)) return NULL;
if (!addULongLong(retdict, "ecn_rcvece", (unsigned long long)tcps.tcps_ecn_rcvece)) return NULL;
if (!addULongLong(retdict, "ecn_rcvcwr", (unsigned long long)tcps.tcps_ecn_rcvcwr)) return NULL;
@@ -371,9 +363,7 @@ PyObject *udpstats(PyObject *self, PyObject *args){
if (!addULongLong(retdict, "nosec", (unsigned long long)udps.udps_nosec)) return NULL;
if (!addULongLong(retdict, "fullsock", (unsigned long long)udps.udps_fullsock)) return NULL;
if (!addULongLong(retdict, "pcbhashmiss", (unsigned long long)udps.udps_pcbhashmiss)) return NULL;
- if (!addULongLong(retdict, "inhwcsum", (unsigned long long)udps.udps_inhwcsum)) return NULL;
if (!addULongLong(retdict, "opackets", (unsigned long long)udps.udps_opackets)) return NULL;
- if (!addULongLong(retdict, "outhwcsum", (unsigned long long)udps.udps_outhwcsum)) return NULL;
return retdict;
}

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-openbsd__pcap_c,v 1.1 2010/07/13 15:21:18 naddy Exp $
--- openbsd/_pcap.c.orig Sun Jul 11 22:27:34 2010
+++ openbsd/_pcap.c Sun Jul 11 22:27:46 2010
@@ -436,7 +436,6 @@ void init_pcap(void){
PyModule_AddIntConstant(module, "DLT_RAW", (long) DLT_RAW);
PyModule_AddIntConstant(module, "DLT_SLIP_BSDOS", (long) DLT_SLIP_BSDOS);
PyModule_AddIntConstant(module, "DLT_PPP_BSDOS", (long) DLT_PPP_BSDOS);
- PyModule_AddIntConstant(module, "DLT_OLD_PFLOG", (long) DLT_OLD_PFLOG);
PyModule_AddIntConstant(module, "DLT_PFSYNC", (long) DLT_PFSYNC);
PyModule_AddIntConstant(module, "DLT_IEEE802_11", (long) DLT_IEEE802_11);
PyModule_AddIntConstant(module, "DLT_PFLOG", (long) DLT_PFLOG);

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-openbsd__sysvar_c,v 1.2 2015/01/22 12:25:51 naddy Exp $
--- openbsd/_sysvar.c.orig Tue Dec 21 07:32:04 2004
+++ openbsd/_sysvar.c Thu Jan 22 13:22:43 2015
@@ -29,6 +29,7 @@
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/mbuf.h>
+#include <netinet/in.h>
#include <net/if.h>
#include <net/pfvar.h>
#include <net/if_pflog.h>
@@ -85,5 +86,4 @@ void init_sysvar(void){
/* enc interface packet format flags */
PyModule_AddIntConstant(module, "ENC_CONF", (long) M_CONF);
PyModule_AddIntConstant(module, "ENC_AUTH", (long) M_AUTH);
- PyModule_AddIntConstant(module, "ENC_AUTH_AH", (long) M_AUTH_AH);
}

View File

@ -1,46 +0,0 @@
$OpenBSD: patch-openbsd_packet_py,v 1.2 2012/09/27 21:27:43 naddy Exp $
--- openbsd/packet.py.orig Tue Dec 21 07:32:04 2004
+++ openbsd/packet.py Thu Sep 27 22:59:44 2012
@@ -1592,34 +1592,6 @@ class _PFBase(Protocol):
)
-class PFOld(_PFBase):
- TYPE = "PFOld"
- _SIZEHINT = _sysvar.IFNAMSIZ + 12
- # Fields
- safamily = IntField(0, 4, options=_PFBase.SAFamilyOptions)
- ifname = PaddedString(4, _sysvar.IFNAMSIZ)
- ruleno = IntField(4+_sysvar.IFNAMSIZ, 2)
- reason = IntField(4+_sysvar.IFNAMSIZ+2, 2, options=_PFBase.ReasonOptions)
- action = IntField(4+_sysvar.IFNAMSIZ+4, 2, options=_PFBase.ActionOptions)
- direction = IntField(4+_sysvar.IFNAMSIZ+6, 2, options=_PFBase.DirectionOptions)
- length = _sysvar.IFNAMSIZ + 12
- payload = Payload()
- def _constructNext(self):
- if AF_JUMPER.has_key(self.safamily):
- self._addProtocol(AF_JUMPER[self.safamily], self.length)
-
- def _getPayloadOffsets(self):
- offset = self.length
- dataLength = len(self.packet._data) - offset
- return offset, dataLength
-
- def __repr__(self):
- reason = self.ReasonOptions.toStr(self.reason)
- action = self.ActionOptions.toStr(self.action)
- direction = self.DirectionOptions.toStr(self.direction)
- return "Old PF rule %s (%s) %s %s on %s"%(self.ruleno, reason, action, direction, self.ifname)
-
-
class PF(_PFBase):
"""
OpenBSD Specific : PF
@@ -1669,7 +1641,6 @@ class Enc(Protocol):
FlagsOptions = Options(
CONF = _sysvar.ENC_CONF,
AUTH = _sysvar.ENC_AUTH,
- AUTH_AH = _sysvar.ENC_AUTH_AH
)
TYPE = "Enc"
addressFamily = HOInt32Field(0)

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-openbsd_pcap_py,v 1.1 2010/07/13 15:21:18 naddy Exp $
--- openbsd/pcap.py.orig Sun Jul 11 22:26:54 2010
+++ openbsd/pcap.py Sun Jul 11 22:27:18 2010
@@ -44,7 +44,6 @@ DLT_ENC = _pcap.DLT_ENC
DLT_RAW = _pcap.DLT_RAW
DLT_SLIP_BSDOS = _pcap.DLT_SLIP_BSDOS
DLT_PPP_BSDOS = _pcap.DLT_PPP_BSDOS
-DLT_OLD_PFLOG = _pcap.DLT_OLD_PFLOG
DLT_PFSYNC = _pcap.DLT_PFSYNC
DLT_IEEE802_11 = _pcap.DLT_IEEE802_11
DLT_PFLOG = _pcap.DLT_PFLOG
@@ -91,7 +90,6 @@ class Interpreter:
DLT_LOOP: packet.Loopback,
DLT_EN10MB: packet.Ethernet,
DLT_PFLOG: packet.PF,
- DLT_OLD_PFLOG: packet.PFOld,
DLT_ENC: packet.Enc,
}
def __init__(self, dlt, callback):

View File

@ -1,61 +0,0 @@
$OpenBSD: patch-test_test_packet_realworld_py,v 1.1 2010/07/13 15:21:18 naddy Exp $
--- test/test_packet_realworld.py.orig Sun Jul 11 22:37:05 2010
+++ test/test_packet_realworld.py Sun Jul 11 22:37:20 2010
@@ -603,57 +603,6 @@ class uICMP_AddressMaskReply(pcaptester.pcapTester):
-class uPfOld(pcaptester.pcapTester):
- def setUp(self):
- self.p = self.getpacket("pf.old")
-
- def test_safamily(self):
- p = self.p["pfold"]
- self.failUnlessEqual(self.p["pfold"].safamily, self.p["pfold"].SAFamilyOptions["INET"])
- self.p["pfold"].safamily = 5
- self.failUnlessEqual(self.p["pfold"].safamily, 5)
-
- def test_ifname(self):
- p = self.p["pfold"]
- self.failUnlessEqual(self.p["pfold"].ifname, "tun0")
- self.p["pfold"].ifname = "bomb"
- self.failUnlessEqual(self.p["pfold"].ifname, "bomb")
-
- def test_ruleno(self):
- p = self.p["pfold"]
- self.failUnlessEqual(self.p["pfold"].ruleno, 0)
- self.p["pfold"].ruleno = 5
- self.failUnlessEqual(self.p["pfold"].ruleno, 5)
-
- def test_reason(self):
- self.failUnlessEqual(self.p["pfold"].reason, openbsd.packet.PFOld.ReasonOptions["MATCH"])
- self.p["pfold"].reason = 4
- self.failUnlessEqual(self.p["pfold"].reason, 4)
-
- def test_action(self):
- self.failUnlessEqual(self.p["pfold"].action, openbsd.packet.PFOld.ActionOptions["DROP"])
- self.p["pfold"].action = 5
- self.failUnlessEqual(self.p["pfold"].action, 5)
-
- def test_direction(self):
- self.failUnlessEqual(self.p["pfold"].direction, openbsd.packet.PFOld.DirectionOptions["IN"])
- self.p["pfold"].direction = 5
- self.failUnlessEqual(self.p["pfold"].direction, 5)
-
- def test_encap(self):
- self.failUnlessEqual(self.p["pfold"]._next.src, "68.18.67.181")
-
- def test_payload(self):
- self.failUnless(self.p["pfold"].payload)
- self.p["pfold"].safamily = self.p["pfold"].SAFamilyOptions["UNSPEC"]
- self.p["pfold"].payload = "asdf"
- self.p.finalise()
- self.failUnlessEqual(self.p["pfold"].payload, "asdf")
-
- def test_repr(self):
- repr(self.p)
-
-
class uPf(pcaptester.pcapTester):
def setUp(self):
self.p = self.getpacket("pf")

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-test_test_pcap_py,v 1.1 2010/07/13 15:21:18 naddy Exp $
--- test/test_pcap.py.orig Sun Jul 11 22:28:42 2010
+++ test/test_pcap.py Sun Jul 11 22:29:01 2010
@@ -159,13 +159,6 @@ class uPacketFactory(unittest.TestCase):
for i in tf.packets:
self.failUnlessEqual(i.protostack.TYPE, "PF")
- def test_pfold(self):
- feed = openbsd.pcap.Offline("pcap_data/pf.old")
- tf = PacketCap()
- feed.loop(10, tf, 1)
- for i in tf.packets:
- self.failUnlessEqual(i.protostack.TYPE, "PFOld")
-
class uMisc(unittest.TestCase):
def test_isPCapFile(self):

View File

@ -1,8 +0,0 @@
The PyOpenBSD library allows Python programs to interact with the
OpenBSD operating system in a smooth and seamless way. It consists of a
set of bindings for various system libraries, as well as interfaces for
inspecting in-kernel variables using kvm.
PyOpenBSD also contains some useful functionality not directly or solely
related to OpenBSD. At this stage there are no concrete plans to "spin
off" architecture-independent projects.

View File

@ -1,75 +0,0 @@
@comment $OpenBSD: PLIST,v 1.2 2009/10/11 20:59:37 jasper Exp $
bin/pfreport
bin/plog
lib/python${MODPY_VERSION}/site-packages/Python_OpenBSD_bindings-0.1.2-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/openbsd/
lib/python${MODPY_VERSION}/site-packages/openbsd/__init__.py
lib/python${MODPY_VERSION}/site-packages/openbsd/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/openbsd/_ifconfig.so
lib/python${MODPY_VERSION}/site-packages/openbsd/_kqueue.so
lib/python${MODPY_VERSION}/site-packages/openbsd/_kvm.so
lib/python${MODPY_VERSION}/site-packages/openbsd/_netstat.so
lib/python${MODPY_VERSION}/site-packages/openbsd/_packetDescriptors.py
lib/python${MODPY_VERSION}/site-packages/openbsd/_packetDescriptors.pyc
lib/python${MODPY_VERSION}/site-packages/openbsd/_pcap.so
lib/python${MODPY_VERSION}/site-packages/openbsd/_sysvar.so
lib/python${MODPY_VERSION}/site-packages/openbsd/arc4random.so
lib/python${MODPY_VERSION}/site-packages/openbsd/ifconfig.py
lib/python${MODPY_VERSION}/site-packages/openbsd/ifconfig.pyc
lib/python${MODPY_VERSION}/site-packages/openbsd/kqueue.py
lib/python${MODPY_VERSION}/site-packages/openbsd/kqueue.pyc
lib/python${MODPY_VERSION}/site-packages/openbsd/netstat.py
lib/python${MODPY_VERSION}/site-packages/openbsd/netstat.pyc
lib/python${MODPY_VERSION}/site-packages/openbsd/packet.py
lib/python${MODPY_VERSION}/site-packages/openbsd/packet.pyc
lib/python${MODPY_VERSION}/site-packages/openbsd/pcap.py
lib/python${MODPY_VERSION}/site-packages/openbsd/pcap.pyc
lib/python${MODPY_VERSION}/site-packages/openbsd/utils.py
lib/python${MODPY_VERSION}/site-packages/openbsd/utils.pyc
share/doc/py-openbsd/
share/doc/py-openbsd/admin.html
share/doc/py-openbsd/arc4random.html
share/doc/py-openbsd/ifconfig/
share/doc/py-openbsd/ifconfig.html
share/doc/py-openbsd/ifconfig/ifconfig.html
share/doc/py-openbsd/ifconfig/interface.html
share/doc/py-openbsd/ifconfig/media.html
share/doc/py-openbsd/index.html
share/doc/py-openbsd/intro.html
share/doc/py-openbsd/kqueue/
share/doc/py-openbsd/kqueue.html
share/doc/py-openbsd/kqueue/kevents.html
share/doc/py-openbsd/kqueue/kqueue.html
share/doc/py-openbsd/netstat/
share/doc/py-openbsd/netstat.html
share/doc/py-openbsd/netstat/ahstats.html
share/doc/py-openbsd/netstat/espstats.html
share/doc/py-openbsd/netstat/icmpstats.html
share/doc/py-openbsd/netstat/ifstats.html
share/doc/py-openbsd/netstat/igmpstats.html
share/doc/py-openbsd/netstat/ip6stats.html
share/doc/py-openbsd/netstat/ipcompstats.html
share/doc/py-openbsd/netstat/ipipstats.html
share/doc/py-openbsd/netstat/ipstats.html
share/doc/py-openbsd/netstat/tcpstats.html
share/doc/py-openbsd/netstat/udpstats.html
share/doc/py-openbsd/packet/
share/doc/py-openbsd/packet.html
share/doc/py-openbsd/packet/packet.html
share/doc/py-openbsd/packet/protocol/
share/doc/py-openbsd/packet/protocol.html
share/doc/py-openbsd/packet/protocol/descriptors.html
share/doc/py-openbsd/pcap/
share/doc/py-openbsd/pcap.html
share/doc/py-openbsd/pcap/dumper.html
share/doc/py-openbsd/pcap/feeds/
share/doc/py-openbsd/pcap/feeds.html
share/doc/py-openbsd/pcap/feeds/live.html
share/doc/py-openbsd/pcap/feeds/offline.html
share/doc/py-openbsd/style/
share/doc/py-openbsd/style/style.css
share/examples/py-openbsd/
share/examples/py-openbsd/README
share/examples/py-openbsd/pdump.py
share/examples/py-openbsd/ping.py
share/examples/py-openbsd/proctrace.py

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.320 2015/12/06 13:05:57 jasper Exp $
# $OpenBSD: Makefile,v 1.321 2015/12/07 18:42:53 jca Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-2.165
PKGNAME = quirks-2.166
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.330 2015/12/06 13:05:57 jasper Exp $
# $OpenBSD: Quirks.pm,v 1.331 2015/12/07 18:42:53 jca Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -686,6 +686,7 @@ my $obsolete_reason = {
'mrtd' => 3,
'openobex' => 6,
'obexftp' => 6,
'py-openbsd' => 3,
};
my @msg = (