pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
*: remove users of py-m2crypto, which is obsolete and doesn't build
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <tk%giga.or.at@localhost>
Pushed By: wiz
Date: Mon Dec 6 15:50:31 2021 +0100
Changeset: 897d3d4224b7274ea3af447552b9f2419e4383c3
Modified Files:
Makefile
Removed Files:
euca2ools/DESCR
euca2ools/Makefile
euca2ools/PLIST
euca2ools/distinfo
py-PythonDirector/DESCR
py-PythonDirector/Makefile
py-PythonDirector/PLIST
py-PythonDirector/distinfo
py-gwpy/DESCR
py-gwpy/Makefile
py-gwpy/PLIST
py-gwpy/distinfo
py-lscsoft-glue/DESCR
py-lscsoft-glue/Makefile
py-lscsoft-glue/PLIST
py-lscsoft-glue/distinfo
py-m2ext/DESCR
py-m2ext/Makefile
py-m2ext/PLIST
py-m2ext/distinfo
spade/DEINSTALL
spade/DESCR
spade/INSTALL
spade/MESSAGE
spade/Makefile
spade/PLIST
spade/distinfo
spade/files/tls.py
spade/files/tlsdb.py
spade/patches/patch-aa
spade/patches/patch-ab
spade/patches/patch-ac
spade/patches/patch-ad
spade/patches/patch-ae
Log Message:
*: remove users of py-m2crypto, which is obsolete and doesn't build
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=897d3d4224b7274ea3af447552b9f2419e4383c3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 8 +-
euca2ools/DESCR | 3 -
euca2ools/Makefile | 31 --
euca2ools/PLIST | 523 ----------------------
euca2ools/distinfo | 4 -
py-PythonDirector/DESCR | 3 -
py-PythonDirector/Makefile | 22 -
py-PythonDirector/PLIST | 2 -
py-PythonDirector/distinfo | 5 -
py-gwpy/DESCR | 6 -
py-gwpy/Makefile | 32 --
py-gwpy/PLIST | 402 -----------------
py-gwpy/distinfo | 5 -
py-lscsoft-glue/DESCR | 4 -
py-lscsoft-glue/Makefile | 24 -
py-lscsoft-glue/PLIST | 238 ----------
py-lscsoft-glue/distinfo | 5 -
py-m2ext/DESCR | 4 -
py-m2ext/Makefile | 23 -
py-m2ext/PLIST | 11 -
py-m2ext/distinfo | 5 -
spade/DEINSTALL | 9 -
spade/DESCR | 8 -
spade/INSTALL | 9 -
spade/MESSAGE | 11 -
spade/Makefile | 46 --
spade/PLIST | 402 -----------------
spade/distinfo | 9 -
spade/files/tls.py | 1045 --------------------------------------------
spade/files/tlsdb.py | 194 --------
spade/patches/patch-aa | 53 ---
spade/patches/patch-ab | 61 ---
spade/patches/patch-ac | 72 ---
spade/patches/patch-ad | 48 --
spade/patches/patch-ae | 31 --
35 files changed, 1 insertion(+), 3357 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 2446d2196e..5f1457478a 100644
--- a/Makefile
+++ b/Makefile
@@ -799,7 +799,6 @@ SUBDIR+= etoile
SUBDIR+= etoile-core
SUBDIR+= etoile-services
SUBDIR+= etos
-SUBDIR+= euca2ools
SUBDIR+= eureka-devel
SUBDIR+= eventd
SUBDIR+= eventviews
@@ -3308,7 +3307,6 @@ SUBDIR+= py-OT
SUBDIR+= py-OpenAL
SUBDIR+= py-Py2Play
SUBDIR+= py-PyPE
-SUBDIR+= py-PythonDirector
SUBDIR+= py-PythonMagick
SUBDIR+= py-RXP
SUBDIR+= py-Robinhood
@@ -3865,7 +3863,6 @@ SUBDIR+= py-gtrie
SUBDIR+= py-gts
SUBDIR+= py-guppy3
SUBDIR+= py-gvar
-SUBDIR+= py-gwpy
SUBDIR+= py-gwsurrogate
SUBDIR+= py-hal-cgp
SUBDIR+= py-halp
@@ -4033,12 +4030,10 @@ SUBDIR+= py-loky
SUBDIR+= py-louie
SUBDIR+= py-louvain
SUBDIR+= py-lrparsing
-SUBDIR+= py-lscsoft-glue
SUBDIR+= py-lsqfit
SUBDIR+= py-luminous
SUBDIR+= py-lxmlproc
SUBDIR+= py-lzma
-SUBDIR+= py-m2ext
SUBDIR+= py-macs2
SUBDIR+= py-magnitude
SUBDIR+= py-mahotas
@@ -5284,7 +5279,6 @@ SUBDIR+= sonic-visualiser
SUBDIR+= sophia
SUBDIR+= soqt
SUBDIR+= spacefm
-SUBDIR+= spade
SUBDIR+= spai
SUBDIR+= spamassassin-cvs
SUBDIR+= spamd-devel
@@ -5979,11 +5973,11 @@ SUBDIR+= xmms2
SUBDIR+= xmoto
SUBDIR+= xnedit
SUBDIR+= xnee
-SUBDIR+= xoscope
SUBDIR+= xoo
SUBDIR+= xoreos
SUBDIR+= xoreos-tools
SUBDIR+= xorgxrdp
+SUBDIR+= xoscope
SUBDIR+= xournalpp-git
SUBDIR+= xpaint
SUBDIR+= xpde
diff --git a/euca2ools/DESCR b/euca2ools/DESCR
deleted file mode 100644
index b93671291e..0000000000
--- a/euca2ools/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Euca2ools are command line tools for interacting with
-Amazon Web Services (AWS) and other AWS-compatible web services,
-such as Eucalyptus and OpenStack.
diff --git a/euca2ools/Makefile b/euca2ools/Makefile
deleted file mode 100644
index 3b92f4305f..0000000000
--- a/euca2ools/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2015/04/06 09:13:02 thomasklausner Exp $
-
-GIT_PKG= euca2ools
-GIT_LEVEL= 2.1.3
-
-DISTNAME= ${GIT_LEVEL}
-PKGNAME= ${GIT_PKG}-${GIT_LEVEL}
-CATEGORIES= sysutils
-MASTER_SITES= https://github.com/eucalyptus/${GIT_PKG}/archive/
-EXTRACT_SUFX= .zip
-
-MAINTAINER= noud4%users.sourceforge.net@localhost
-HOMEPAGE= http://www.eucalyptus.com/download/${GIT_PKG}
-COMMENT= Amazon Web Services (AWS) interactor
-LICENSE= 2-clause-bsd
-
-DEPENDS+= ${PYPKGPREFIX}-boto>=2.2:../../net/py-boto
-DEPENDS+= ${PYPKGPREFIX}-m2crypto>=0.20.2:../../security/py-m2crypto
-
-PYTHON_VERSIONS_ACCEPTED= 27 # py-m2crypto
-
-DIST_SUBDIR= ${GIT_PKG}
-USE_LANGUAGES= # python
-USE_TOOLS+= gmake
-
-WRKSRC= ${WRKDIR}/${GIT_PKG}-${GIT_LEVEL}
-
-.include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
-EGG_NAME=${GIT_PKG}-0.0.0
-.include "../../mk/bsd.pkg.mk"
diff --git a/euca2ools/PLIST b/euca2ools/PLIST
deleted file mode 100644
index 0790eec431..0000000000
--- a/euca2ools/PLIST
+++ /dev/null
@@ -1,523 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2013/06/13 11:40:35 noud4 Exp $
-bin/euare-accountaliascreate
-bin/euare-accountaliasdelete
-bin/euare-accountaliaslist
-bin/euare-accountcreate
-bin/euare-accountdel
-bin/euare-accountdelpolicy
-bin/euare-accountgetpolicy
-bin/euare-accountgetsummary
-bin/euare-accountlist
-bin/euare-accountlistpolicies
-bin/euare-accountuploadpolicy
-bin/euare-getldapsyncstatus
-bin/euare-groupaddpolicy
-bin/euare-groupadduser
-bin/euare-groupcreate
-bin/euare-groupdel
-bin/euare-groupdelpolicy
-bin/euare-groupgetpolicy
-bin/euare-grouplistbypath
-bin/euare-grouplistpolicies
-bin/euare-grouplistusers
-bin/euare-groupmod
-bin/euare-groupremoveuser
-bin/euare-groupuploadpolicy
-bin/euare-servercertdel
-bin/euare-servercertgetattributes
-bin/euare-servercertlistbypath
-bin/euare-servercertmod
-bin/euare-servercertupload
-bin/euare-useraddcert
-bin/euare-useraddkey
-bin/euare-useraddloginprofile
-bin/euare-useraddpolicy
-bin/euare-usercreate
-bin/euare-usercreatecert
-bin/euare-userdeactivatemfadevice
-bin/euare-userdel
-bin/euare-userdelcert
-bin/euare-userdelkey
-bin/euare-userdelloginprofile
-bin/euare-userdelpolicy
-bin/euare-userenablemfadevice
-bin/euare-usergetattributes
-bin/euare-usergetinfo
-bin/euare-usergetloginprofile
-bin/euare-usergetpolicy
-bin/euare-userlistbypath
-bin/euare-userlistcerts
-bin/euare-userlistgroups
-bin/euare-userlistkeys
-bin/euare-userlistmfadevices
-bin/euare-userlistpolicies
-bin/euare-usermod
-bin/euare-usermodcert
-bin/euare-usermodkey
-bin/euare-usermodloginprofile
-bin/euare-userresyncmfadevice
-bin/euare-userupdateinfo
-bin/euare-useruploadpolicy
-bin/euca-add-group
-bin/euca-add-keypair
-bin/euca-allocate-address
-bin/euca-associate-address
-bin/euca-attach-volume
-bin/euca-authorize
-bin/euca-bundle-image
-bin/euca-bundle-instance
-bin/euca-bundle-upload
-bin/euca-bundle-vol
-bin/euca-cancel-bundle-task
-bin/euca-check-bucket
-bin/euca-confirm-product-instance
-bin/euca-create-group
-bin/euca-create-image
-bin/euca-create-keypair
-bin/euca-create-snapshot
-bin/euca-create-tags
-bin/euca-create-volume
-bin/euca-delete-bundle
-bin/euca-delete-group
-bin/euca-delete-keypair
-bin/euca-delete-snapshot
-bin/euca-delete-tags
-bin/euca-delete-volume
-bin/euca-deregister
-bin/euca-describe-addresses
-bin/euca-describe-availability-zones
-bin/euca-describe-bundle-tasks
-bin/euca-describe-group
-bin/euca-describe-groups
-bin/euca-describe-image-attribute
-bin/euca-describe-images
-bin/euca-describe-instances
-bin/euca-describe-keypairs
-bin/euca-describe-regions
-bin/euca-describe-snapshots
-bin/euca-describe-tags
-bin/euca-describe-volumes
-bin/euca-detach-volume
-bin/euca-disassociate-address
-bin/euca-download-bundle
-bin/euca-get-console-output
-bin/euca-get-password
-bin/euca-get-password-data
-bin/euca-import-keypair
-bin/euca-modify-image-attribute
-bin/euca-monitor-instances
-bin/euca-reboot-instances
-bin/euca-register
-bin/euca-release-address
-bin/euca-reset-image-attribute
-bin/euca-revoke
-bin/euca-run-instances
-bin/euca-start-instances
-bin/euca-stop-instances
-bin/euca-terminate-instances
-bin/euca-unbundle
-bin/euca-unmonitor-instances
-bin/euca-upload-bundle
-bin/euca-version
-bin/eustore-describe-images
-bin/eustore-install-image
-${PYSITELIB}/${EGG_FILE}
-${PYSITELIB}/euca2ools/__init__.py
-${PYSITELIB}/euca2ools/__init__.pyc
-${PYSITELIB}/euca2ools/__init__.pyo
-${PYSITELIB}/euca2ools/bundler.py
-${PYSITELIB}/euca2ools/bundler.pyc
-${PYSITELIB}/euca2ools/bundler.pyo
-${PYSITELIB}/euca2ools/commands/__init__.py
-${PYSITELIB}/euca2ools/commands/__init__.pyc
-${PYSITELIB}/euca2ools/commands/__init__.pyo
-${PYSITELIB}/euca2ools/commands/euare/__init__.py
-${PYSITELIB}/euca2ools/commands/euare/__init__.pyc
-${PYSITELIB}/euca2ools/commands/euare/__init__.pyo
-${PYSITELIB}/euca2ools/commands/euare/addgrouppolicy.py
-${PYSITELIB}/euca2ools/commands/euare/addgrouppolicy.pyc
-${PYSITELIB}/euca2ools/commands/euare/addgrouppolicy.pyo
-${PYSITELIB}/euca2ools/commands/euare/adduserpolicy.py
-${PYSITELIB}/euca2ools/commands/euare/adduserpolicy.pyc
-${PYSITELIB}/euca2ools/commands/euare/adduserpolicy.pyo
-${PYSITELIB}/euca2ools/commands/euare/addusertogroup.py
-${PYSITELIB}/euca2ools/commands/euare/addusertogroup.pyc
-${PYSITELIB}/euca2ools/commands/euare/addusertogroup.pyo
-${PYSITELIB}/euca2ools/commands/euare/createaccesskey.py
-${PYSITELIB}/euca2ools/commands/euare/createaccesskey.pyc
-${PYSITELIB}/euca2ools/commands/euare/createaccesskey.pyo
-${PYSITELIB}/euca2ools/commands/euare/createaccount.py
-${PYSITELIB}/euca2ools/commands/euare/createaccount.pyc
-${PYSITELIB}/euca2ools/commands/euare/createaccount.pyo
-${PYSITELIB}/euca2ools/commands/euare/createaccountalias.py
-${PYSITELIB}/euca2ools/commands/euare/createaccountalias.pyc
-${PYSITELIB}/euca2ools/commands/euare/createaccountalias.pyo
-${PYSITELIB}/euca2ools/commands/euare/creategroup.py
-${PYSITELIB}/euca2ools/commands/euare/creategroup.pyc
-${PYSITELIB}/euca2ools/commands/euare/creategroup.pyo
-${PYSITELIB}/euca2ools/commands/euare/createloginprofile.py
-${PYSITELIB}/euca2ools/commands/euare/createloginprofile.pyc
-${PYSITELIB}/euca2ools/commands/euare/createloginprofile.pyo
-${PYSITELIB}/euca2ools/commands/euare/createsigningcertificate.py
-${PYSITELIB}/euca2ools/commands/euare/createsigningcertificate.pyc
-${PYSITELIB}/euca2ools/commands/euare/createsigningcertificate.pyo
-${PYSITELIB}/euca2ools/commands/euare/createuser.py
-${PYSITELIB}/euca2ools/commands/euare/createuser.pyc
-${PYSITELIB}/euca2ools/commands/euare/createuser.pyo
-${PYSITELIB}/euca2ools/commands/euare/deactivatemfadevice.py
-${PYSITELIB}/euca2ools/commands/euare/deactivatemfadevice.pyc
-${PYSITELIB}/euca2ools/commands/euare/deactivatemfadevice.pyo
-${PYSITELIB}/euca2ools/commands/euare/deleteaccesskey.py
-${PYSITELIB}/euca2ools/commands/euare/deleteaccesskey.pyc
-${PYSITELIB}/euca2ools/commands/euare/deleteaccesskey.pyo
-${PYSITELIB}/euca2ools/commands/euare/deleteaccount.py
-${PYSITELIB}/euca2ools/commands/euare/deleteaccount.pyc
-${PYSITELIB}/euca2ools/commands/euare/deleteaccount.pyo
-${PYSITELIB}/euca2ools/commands/euare/deleteaccountalias.py
-${PYSITELIB}/euca2ools/commands/euare/deleteaccountalias.pyc
-${PYSITELIB}/euca2ools/commands/euare/deleteaccountalias.pyo
-${PYSITELIB}/euca2ools/commands/euare/deleteaccountpolicy.py
-${PYSITELIB}/euca2ools/commands/euare/deleteaccountpolicy.pyc
-${PYSITELIB}/euca2ools/commands/euare/deleteaccountpolicy.pyo
-${PYSITELIB}/euca2ools/commands/euare/deletegroup.py
-${PYSITELIB}/euca2ools/commands/euare/deletegroup.pyc
-${PYSITELIB}/euca2ools/commands/euare/deletegroup.pyo
-${PYSITELIB}/euca2ools/commands/euare/deletegrouppolicy.py
-${PYSITELIB}/euca2ools/commands/euare/deletegrouppolicy.pyc
-${PYSITELIB}/euca2ools/commands/euare/deletegrouppolicy.pyo
-${PYSITELIB}/euca2ools/commands/euare/deleteloginprofile.py
-${PYSITELIB}/euca2ools/commands/euare/deleteloginprofile.pyc
-${PYSITELIB}/euca2ools/commands/euare/deleteloginprofile.pyo
-${PYSITELIB}/euca2ools/commands/euare/deleteservercertificate.py
-${PYSITELIB}/euca2ools/commands/euare/deleteservercertificate.pyc
-${PYSITELIB}/euca2ools/commands/euare/deleteservercertificate.pyo
-${PYSITELIB}/euca2ools/commands/euare/deletesigningcertificate.py
-${PYSITELIB}/euca2ools/commands/euare/deletesigningcertificate.pyc
-${PYSITELIB}/euca2ools/commands/euare/deletesigningcertificate.pyo
-${PYSITELIB}/euca2ools/commands/euare/deleteuser.py
-${PYSITELIB}/euca2ools/commands/euare/deleteuser.pyc
-${PYSITELIB}/euca2ools/commands/euare/deleteuser.pyo
-${PYSITELIB}/euca2ools/commands/euare/deleteuserpolicy.py
-${PYSITELIB}/euca2ools/commands/euare/deleteuserpolicy.pyc
-${PYSITELIB}/euca2ools/commands/euare/deleteuserpolicy.pyo
-${PYSITELIB}/euca2ools/commands/euare/enablemfadevice.py
-${PYSITELIB}/euca2ools/commands/euare/enablemfadevice.pyc
-${PYSITELIB}/euca2ools/commands/euare/enablemfadevice.pyo
-${PYSITELIB}/euca2ools/commands/euare/getaccountpolicy.py
-${PYSITELIB}/euca2ools/commands/euare/getaccountpolicy.pyc
-${PYSITELIB}/euca2ools/commands/euare/getaccountpolicy.pyo
-${PYSITELIB}/euca2ools/commands/euare/getaccountsummary.py
-${PYSITELIB}/euca2ools/commands/euare/getaccountsummary.pyc
-${PYSITELIB}/euca2ools/commands/euare/getaccountsummary.pyo
-${PYSITELIB}/euca2ools/commands/euare/getgroup.py
-${PYSITELIB}/euca2ools/commands/euare/getgroup.pyc
-${PYSITELIB}/euca2ools/commands/euare/getgroup.pyo
-${PYSITELIB}/euca2ools/commands/euare/getgrouppolicy.py
-${PYSITELIB}/euca2ools/commands/euare/getgrouppolicy.pyc
-${PYSITELIB}/euca2ools/commands/euare/getgrouppolicy.pyo
-${PYSITELIB}/euca2ools/commands/euare/getldapsyncstatus.py
-${PYSITELIB}/euca2ools/commands/euare/getldapsyncstatus.pyc
-${PYSITELIB}/euca2ools/commands/euare/getldapsyncstatus.pyo
-${PYSITELIB}/euca2ools/commands/euare/getloginprofile.py
-${PYSITELIB}/euca2ools/commands/euare/getloginprofile.pyc
-${PYSITELIB}/euca2ools/commands/euare/getloginprofile.pyo
-${PYSITELIB}/euca2ools/commands/euare/getservercertificate.py
-${PYSITELIB}/euca2ools/commands/euare/getservercertificate.pyc
-${PYSITELIB}/euca2ools/commands/euare/getservercertificate.pyo
-${PYSITELIB}/euca2ools/commands/euare/getuser.py
-${PYSITELIB}/euca2ools/commands/euare/getuser.pyc
-${PYSITELIB}/euca2ools/commands/euare/getuser.pyo
-${PYSITELIB}/euca2ools/commands/euare/getuserinfo.py
-${PYSITELIB}/euca2ools/commands/euare/getuserinfo.pyc
-${PYSITELIB}/euca2ools/commands/euare/getuserinfo.pyo
-${PYSITELIB}/euca2ools/commands/euare/getuserpolicy.py
-${PYSITELIB}/euca2ools/commands/euare/getuserpolicy.pyc
-${PYSITELIB}/euca2ools/commands/euare/getuserpolicy.pyo
-${PYSITELIB}/euca2ools/commands/euare/listaccesskeys.py
-${PYSITELIB}/euca2ools/commands/euare/listaccesskeys.pyc
-${PYSITELIB}/euca2ools/commands/euare/listaccesskeys.pyo
-${PYSITELIB}/euca2ools/commands/euare/listaccountaliases.py
-${PYSITELIB}/euca2ools/commands/euare/listaccountaliases.pyc
-${PYSITELIB}/euca2ools/commands/euare/listaccountaliases.pyo
-${PYSITELIB}/euca2ools/commands/euare/listaccountpolicies.py
-${PYSITELIB}/euca2ools/commands/euare/listaccountpolicies.pyc
-${PYSITELIB}/euca2ools/commands/euare/listaccountpolicies.pyo
-${PYSITELIB}/euca2ools/commands/euare/listaccounts.py
-${PYSITELIB}/euca2ools/commands/euare/listaccounts.pyc
-${PYSITELIB}/euca2ools/commands/euare/listaccounts.pyo
-${PYSITELIB}/euca2ools/commands/euare/listgrouppolicies.py
-${PYSITELIB}/euca2ools/commands/euare/listgrouppolicies.pyc
-${PYSITELIB}/euca2ools/commands/euare/listgrouppolicies.pyo
-${PYSITELIB}/euca2ools/commands/euare/listgroups.py
-${PYSITELIB}/euca2ools/commands/euare/listgroups.pyc
-${PYSITELIB}/euca2ools/commands/euare/listgroups.pyo
-${PYSITELIB}/euca2ools/commands/euare/listgroupsforuser.py
-${PYSITELIB}/euca2ools/commands/euare/listgroupsforuser.pyc
-${PYSITELIB}/euca2ools/commands/euare/listgroupsforuser.pyo
-${PYSITELIB}/euca2ools/commands/euare/listmfadevices.py
-${PYSITELIB}/euca2ools/commands/euare/listmfadevices.pyc
-${PYSITELIB}/euca2ools/commands/euare/listmfadevices.pyo
-${PYSITELIB}/euca2ools/commands/euare/listservercertificates.py
-${PYSITELIB}/euca2ools/commands/euare/listservercertificates.pyc
-${PYSITELIB}/euca2ools/commands/euare/listservercertificates.pyo
-${PYSITELIB}/euca2ools/commands/euare/listsigningcertificates.py
-${PYSITELIB}/euca2ools/commands/euare/listsigningcertificates.pyc
-${PYSITELIB}/euca2ools/commands/euare/listsigningcertificates.pyo
-${PYSITELIB}/euca2ools/commands/euare/listuserpolicies.py
-${PYSITELIB}/euca2ools/commands/euare/listuserpolicies.pyc
-${PYSITELIB}/euca2ools/commands/euare/listuserpolicies.pyo
-${PYSITELIB}/euca2ools/commands/euare/listusers.py
-${PYSITELIB}/euca2ools/commands/euare/listusers.pyc
-${PYSITELIB}/euca2ools/commands/euare/listusers.pyo
-${PYSITELIB}/euca2ools/commands/euare/putaccountpolicy.py
-${PYSITELIB}/euca2ools/commands/euare/putaccountpolicy.pyc
-${PYSITELIB}/euca2ools/commands/euare/putaccountpolicy.pyo
-${PYSITELIB}/euca2ools/commands/euare/putgrouppolicy.py
-${PYSITELIB}/euca2ools/commands/euare/putgrouppolicy.pyc
-${PYSITELIB}/euca2ools/commands/euare/putgrouppolicy.pyo
-${PYSITELIB}/euca2ools/commands/euare/putuserpolicy.py
-${PYSITELIB}/euca2ools/commands/euare/putuserpolicy.pyc
-${PYSITELIB}/euca2ools/commands/euare/putuserpolicy.pyo
-${PYSITELIB}/euca2ools/commands/euare/removeuserfromgroup.py
-${PYSITELIB}/euca2ools/commands/euare/removeuserfromgroup.pyc
-${PYSITELIB}/euca2ools/commands/euare/removeuserfromgroup.pyo
-${PYSITELIB}/euca2ools/commands/euare/resyncmfadevice.py
-${PYSITELIB}/euca2ools/commands/euare/resyncmfadevice.pyc
-${PYSITELIB}/euca2ools/commands/euare/resyncmfadevice.pyo
-${PYSITELIB}/euca2ools/commands/euare/templaterequest.py
-${PYSITELIB}/euca2ools/commands/euare/templaterequest.pyc
-${PYSITELIB}/euca2ools/commands/euare/templaterequest.pyo
-${PYSITELIB}/euca2ools/commands/euare/updateaccesskey.py
-${PYSITELIB}/euca2ools/commands/euare/updateaccesskey.pyc
-${PYSITELIB}/euca2ools/commands/euare/updateaccesskey.pyo
-${PYSITELIB}/euca2ools/commands/euare/updategroup.py
-${PYSITELIB}/euca2ools/commands/euare/updategroup.pyc
-${PYSITELIB}/euca2ools/commands/euare/updategroup.pyo
-${PYSITELIB}/euca2ools/commands/euare/updateloginprofile.py
-${PYSITELIB}/euca2ools/commands/euare/updateloginprofile.pyc
-${PYSITELIB}/euca2ools/commands/euare/updateloginprofile.pyo
-${PYSITELIB}/euca2ools/commands/euare/updateservercertificate.py
-${PYSITELIB}/euca2ools/commands/euare/updateservercertificate.pyc
-${PYSITELIB}/euca2ools/commands/euare/updateservercertificate.pyo
-${PYSITELIB}/euca2ools/commands/euare/updatesigningcertificate.py
-${PYSITELIB}/euca2ools/commands/euare/updatesigningcertificate.pyc
-${PYSITELIB}/euca2ools/commands/euare/updatesigningcertificate.pyo
-${PYSITELIB}/euca2ools/commands/euare/updateuser.py
-${PYSITELIB}/euca2ools/commands/euare/updateuser.pyc
-${PYSITELIB}/euca2ools/commands/euare/updateuser.pyo
-${PYSITELIB}/euca2ools/commands/euare/updateuserinfo.py
-${PYSITELIB}/euca2ools/commands/euare/updateuserinfo.pyc
-${PYSITELIB}/euca2ools/commands/euare/updateuserinfo.pyo
-${PYSITELIB}/euca2ools/commands/euare/uploadservercertificate.py
-${PYSITELIB}/euca2ools/commands/euare/uploadservercertificate.pyc
-${PYSITELIB}/euca2ools/commands/euare/uploadservercertificate.pyo
-${PYSITELIB}/euca2ools/commands/euare/uploadsigningcertificate.py
-${PYSITELIB}/euca2ools/commands/euare/uploadsigningcertificate.pyc
-${PYSITELIB}/euca2ools/commands/euare/uploadsigningcertificate.pyo
-${PYSITELIB}/euca2ools/commands/euca/__init__.py
-${PYSITELIB}/euca2ools/commands/euca/__init__.pyc
-${PYSITELIB}/euca2ools/commands/euca/__init__.pyo
-${PYSITELIB}/euca2ools/commands/euca/allocateaddress.py
-${PYSITELIB}/euca2ools/commands/euca/allocateaddress.pyc
-${PYSITELIB}/euca2ools/commands/euca/allocateaddress.pyo
-${PYSITELIB}/euca2ools/commands/euca/associateaddress.py
-${PYSITELIB}/euca2ools/commands/euca/associateaddress.pyc
-${PYSITELIB}/euca2ools/commands/euca/associateaddress.pyo
-${PYSITELIB}/euca2ools/commands/euca/attachvolume.py
-${PYSITELIB}/euca2ools/commands/euca/attachvolume.pyc
-${PYSITELIB}/euca2ools/commands/euca/attachvolume.pyo
-${PYSITELIB}/euca2ools/commands/euca/authorize.py
-${PYSITELIB}/euca2ools/commands/euca/authorize.pyc
-${PYSITELIB}/euca2ools/commands/euca/authorize.pyo
-${PYSITELIB}/euca2ools/commands/euca/bundleimage.py
-${PYSITELIB}/euca2ools/commands/euca/bundleimage.pyc
-${PYSITELIB}/euca2ools/commands/euca/bundleimage.pyo
-${PYSITELIB}/euca2ools/commands/euca/bundleinstance.py
-${PYSITELIB}/euca2ools/commands/euca/bundleinstance.pyc
-${PYSITELIB}/euca2ools/commands/euca/bundleinstance.pyo
-${PYSITELIB}/euca2ools/commands/euca/bundleupload.py
-${PYSITELIB}/euca2ools/commands/euca/bundleupload.pyc
-${PYSITELIB}/euca2ools/commands/euca/bundleupload.pyo
-${PYSITELIB}/euca2ools/commands/euca/bundlevol.py
-${PYSITELIB}/euca2ools/commands/euca/bundlevol.pyc
-${PYSITELIB}/euca2ools/commands/euca/bundlevol.pyo
-${PYSITELIB}/euca2ools/commands/euca/cancelbundletask.py
-${PYSITELIB}/euca2ools/commands/euca/cancelbundletask.pyc
-${PYSITELIB}/euca2ools/commands/euca/cancelbundletask.pyo
-${PYSITELIB}/euca2ools/commands/euca/checkbucket.py
-${PYSITELIB}/euca2ools/commands/euca/checkbucket.pyc
-${PYSITELIB}/euca2ools/commands/euca/checkbucket.pyo
-${PYSITELIB}/euca2ools/commands/euca/confirmproductinstance.py
-${PYSITELIB}/euca2ools/commands/euca/confirmproductinstance.pyc
-${PYSITELIB}/euca2ools/commands/euca/confirmproductinstance.pyo
-${PYSITELIB}/euca2ools/commands/euca/createimage.py
-${PYSITELIB}/euca2ools/commands/euca/createimage.pyc
-${PYSITELIB}/euca2ools/commands/euca/createimage.pyo
-${PYSITELIB}/euca2ools/commands/euca/createkeypair.py
-${PYSITELIB}/euca2ools/commands/euca/createkeypair.pyc
-${PYSITELIB}/euca2ools/commands/euca/createkeypair.pyo
-${PYSITELIB}/euca2ools/commands/euca/createsecuritygroup.py
-${PYSITELIB}/euca2ools/commands/euca/createsecuritygroup.pyc
-${PYSITELIB}/euca2ools/commands/euca/createsecuritygroup.pyo
-${PYSITELIB}/euca2ools/commands/euca/createsnapshot.py
-${PYSITELIB}/euca2ools/commands/euca/createsnapshot.pyc
-${PYSITELIB}/euca2ools/commands/euca/createsnapshot.pyo
-${PYSITELIB}/euca2ools/commands/euca/createtags.py
-${PYSITELIB}/euca2ools/commands/euca/createtags.pyc
-${PYSITELIB}/euca2ools/commands/euca/createtags.pyo
-${PYSITELIB}/euca2ools/commands/euca/createvolume.py
-${PYSITELIB}/euca2ools/commands/euca/createvolume.pyc
-${PYSITELIB}/euca2ools/commands/euca/createvolume.pyo
-${PYSITELIB}/euca2ools/commands/euca/deletebundle.py
-${PYSITELIB}/euca2ools/commands/euca/deletebundle.pyc
-${PYSITELIB}/euca2ools/commands/euca/deletebundle.pyo
-${PYSITELIB}/euca2ools/commands/euca/deletegroup.py
-${PYSITELIB}/euca2ools/commands/euca/deletegroup.pyc
-${PYSITELIB}/euca2ools/commands/euca/deletegroup.pyo
-${PYSITELIB}/euca2ools/commands/euca/deletekeypair.py
-${PYSITELIB}/euca2ools/commands/euca/deletekeypair.pyc
-${PYSITELIB}/euca2ools/commands/euca/deletekeypair.pyo
-${PYSITELIB}/euca2ools/commands/euca/deletesnapshot.py
-${PYSITELIB}/euca2ools/commands/euca/deletesnapshot.pyc
-${PYSITELIB}/euca2ools/commands/euca/deletesnapshot.pyo
-${PYSITELIB}/euca2ools/commands/euca/deletetags.py
-${PYSITELIB}/euca2ools/commands/euca/deletetags.pyc
-${PYSITELIB}/euca2ools/commands/euca/deletetags.pyo
-${PYSITELIB}/euca2ools/commands/euca/deletevolume.py
-${PYSITELIB}/euca2ools/commands/euca/deletevolume.pyc
-${PYSITELIB}/euca2ools/commands/euca/deletevolume.pyo
-${PYSITELIB}/euca2ools/commands/euca/deregister.py
-${PYSITELIB}/euca2ools/commands/euca/deregister.pyc
-${PYSITELIB}/euca2ools/commands/euca/deregister.pyo
-${PYSITELIB}/euca2ools/commands/euca/describeaddresses.py
-${PYSITELIB}/euca2ools/commands/euca/describeaddresses.pyc
-${PYSITELIB}/euca2ools/commands/euca/describeaddresses.pyo
-${PYSITELIB}/euca2ools/commands/euca/describeavailabilityzones.py
-${PYSITELIB}/euca2ools/commands/euca/describeavailabilityzones.pyc
-${PYSITELIB}/euca2ools/commands/euca/describeavailabilityzones.pyo
-${PYSITELIB}/euca2ools/commands/euca/describebundletasks.py
-${PYSITELIB}/euca2ools/commands/euca/describebundletasks.pyc
-${PYSITELIB}/euca2ools/commands/euca/describebundletasks.pyo
-${PYSITELIB}/euca2ools/commands/euca/describegroups.py
-${PYSITELIB}/euca2ools/commands/euca/describegroups.pyc
-${PYSITELIB}/euca2ools/commands/euca/describegroups.pyo
-${PYSITELIB}/euca2ools/commands/euca/describeimageattribute.py
-${PYSITELIB}/euca2ools/commands/euca/describeimageattribute.pyc
-${PYSITELIB}/euca2ools/commands/euca/describeimageattribute.pyo
-${PYSITELIB}/euca2ools/commands/euca/describeimages.py
-${PYSITELIB}/euca2ools/commands/euca/describeimages.pyc
-${PYSITELIB}/euca2ools/commands/euca/describeimages.pyo
-${PYSITELIB}/euca2ools/commands/euca/describeinstances.py
-${PYSITELIB}/euca2ools/commands/euca/describeinstances.pyc
-${PYSITELIB}/euca2ools/commands/euca/describeinstances.pyo
-${PYSITELIB}/euca2ools/commands/euca/describekeypairs.py
-${PYSITELIB}/euca2ools/commands/euca/describekeypairs.pyc
-${PYSITELIB}/euca2ools/commands/euca/describekeypairs.pyo
-${PYSITELIB}/euca2ools/commands/euca/describeregions.py
-${PYSITELIB}/euca2ools/commands/euca/describeregions.pyc
-${PYSITELIB}/euca2ools/commands/euca/describeregions.pyo
-${PYSITELIB}/euca2ools/commands/euca/describesnapshots.py
-${PYSITELIB}/euca2ools/commands/euca/describesnapshots.pyc
-${PYSITELIB}/euca2ools/commands/euca/describesnapshots.pyo
-${PYSITELIB}/euca2ools/commands/euca/describetags.py
-${PYSITELIB}/euca2ools/commands/euca/describetags.pyc
-${PYSITELIB}/euca2ools/commands/euca/describetags.pyo
-${PYSITELIB}/euca2ools/commands/euca/describevolumes.py
-${PYSITELIB}/euca2ools/commands/euca/describevolumes.pyc
-${PYSITELIB}/euca2ools/commands/euca/describevolumes.pyo
-${PYSITELIB}/euca2ools/commands/euca/detachvolume.py
-${PYSITELIB}/euca2ools/commands/euca/detachvolume.pyc
-${PYSITELIB}/euca2ools/commands/euca/detachvolume.pyo
-${PYSITELIB}/euca2ools/commands/euca/disassociateaddress.py
-${PYSITELIB}/euca2ools/commands/euca/disassociateaddress.pyc
-${PYSITELIB}/euca2ools/commands/euca/disassociateaddress.pyo
-${PYSITELIB}/euca2ools/commands/euca/downloadbundle.py
-${PYSITELIB}/euca2ools/commands/euca/downloadbundle.pyc
-${PYSITELIB}/euca2ools/commands/euca/downloadbundle.pyo
-${PYSITELIB}/euca2ools/commands/euca/getconsoleoutput.py
-${PYSITELIB}/euca2ools/commands/euca/getconsoleoutput.pyc
-${PYSITELIB}/euca2ools/commands/euca/getconsoleoutput.pyo
-${PYSITELIB}/euca2ools/commands/euca/getpassword.py
-${PYSITELIB}/euca2ools/commands/euca/getpassword.pyc
-${PYSITELIB}/euca2ools/commands/euca/getpassword.pyo
-${PYSITELIB}/euca2ools/commands/euca/getpassworddata.py
-${PYSITELIB}/euca2ools/commands/euca/getpassworddata.pyc
-${PYSITELIB}/euca2ools/commands/euca/getpassworddata.pyo
-${PYSITELIB}/euca2ools/commands/euca/importkeypair.py
-${PYSITELIB}/euca2ools/commands/euca/importkeypair.pyc
-${PYSITELIB}/euca2ools/commands/euca/importkeypair.pyo
-${PYSITELIB}/euca2ools/commands/euca/modifyimageattribute.py
-${PYSITELIB}/euca2ools/commands/euca/modifyimageattribute.pyc
-${PYSITELIB}/euca2ools/commands/euca/modifyimageattribute.pyo
-${PYSITELIB}/euca2ools/commands/euca/monitorinstances.py
-${PYSITELIB}/euca2ools/commands/euca/monitorinstances.pyc
-${PYSITELIB}/euca2ools/commands/euca/monitorinstances.pyo
-${PYSITELIB}/euca2ools/commands/euca/rebootinstances.py
-${PYSITELIB}/euca2ools/commands/euca/rebootinstances.pyc
-${PYSITELIB}/euca2ools/commands/euca/rebootinstances.pyo
-${PYSITELIB}/euca2ools/commands/euca/register.py
-${PYSITELIB}/euca2ools/commands/euca/register.pyc
-${PYSITELIB}/euca2ools/commands/euca/register.pyo
-${PYSITELIB}/euca2ools/commands/euca/releaseaddress.py
-${PYSITELIB}/euca2ools/commands/euca/releaseaddress.pyc
-${PYSITELIB}/euca2ools/commands/euca/releaseaddress.pyo
-${PYSITELIB}/euca2ools/commands/euca/resetimageattribute.py
-${PYSITELIB}/euca2ools/commands/euca/resetimageattribute.pyc
-${PYSITELIB}/euca2ools/commands/euca/resetimageattribute.pyo
-${PYSITELIB}/euca2ools/commands/euca/revoke.py
-${PYSITELIB}/euca2ools/commands/euca/revoke.pyc
-${PYSITELIB}/euca2ools/commands/euca/revoke.pyo
-${PYSITELIB}/euca2ools/commands/euca/runinstances.py
-${PYSITELIB}/euca2ools/commands/euca/runinstances.pyc
-${PYSITELIB}/euca2ools/commands/euca/runinstances.pyo
-${PYSITELIB}/euca2ools/commands/euca/startinstances.py
-${PYSITELIB}/euca2ools/commands/euca/startinstances.pyc
-${PYSITELIB}/euca2ools/commands/euca/startinstances.pyo
-${PYSITELIB}/euca2ools/commands/euca/stopinstances.py
-${PYSITELIB}/euca2ools/commands/euca/stopinstances.pyc
-${PYSITELIB}/euca2ools/commands/euca/stopinstances.pyo
-${PYSITELIB}/euca2ools/commands/euca/terminateinstances.py
-${PYSITELIB}/euca2ools/commands/euca/terminateinstances.pyc
-${PYSITELIB}/euca2ools/commands/euca/terminateinstances.pyo
-${PYSITELIB}/euca2ools/commands/euca/unbundle.py
-${PYSITELIB}/euca2ools/commands/euca/unbundle.pyc
-${PYSITELIB}/euca2ools/commands/euca/unbundle.pyo
-${PYSITELIB}/euca2ools/commands/euca/unmonitorinstances.py
-${PYSITELIB}/euca2ools/commands/euca/unmonitorinstances.pyc
-${PYSITELIB}/euca2ools/commands/euca/unmonitorinstances.pyo
-${PYSITELIB}/euca2ools/commands/euca/uploadbundle.py
-${PYSITELIB}/euca2ools/commands/euca/uploadbundle.pyc
-${PYSITELIB}/euca2ools/commands/euca/uploadbundle.pyo
-${PYSITELIB}/euca2ools/commands/eucacommand.py
-${PYSITELIB}/euca2ools/commands/eucacommand.pyc
-${PYSITELIB}/euca2ools/commands/eucacommand.pyo
-${PYSITELIB}/euca2ools/commands/eustore/__init__.py
-${PYSITELIB}/euca2ools/commands/eustore/__init__.pyc
-${PYSITELIB}/euca2ools/commands/eustore/__init__.pyo
-${PYSITELIB}/euca2ools/commands/eustore/describeimages.py
-${PYSITELIB}/euca2ools/commands/eustore/describeimages.pyc
-${PYSITELIB}/euca2ools/commands/eustore/describeimages.pyo
-${PYSITELIB}/euca2ools/commands/eustore/installimage.py
-${PYSITELIB}/euca2ools/commands/eustore/installimage.pyc
-${PYSITELIB}/euca2ools/commands/eustore/installimage.pyo
-${PYSITELIB}/euca2ools/exceptions.py
-${PYSITELIB}/euca2ools/exceptions.pyc
-${PYSITELIB}/euca2ools/exceptions.pyo
-${PYSITELIB}/euca2ools/image.py
-${PYSITELIB}/euca2ools/image.pyc
-${PYSITELIB}/euca2ools/image.pyo
-${PYSITELIB}/euca2ools/metadata.py
-${PYSITELIB}/euca2ools/metadata.pyc
-${PYSITELIB}/euca2ools/metadata.pyo
-${PYSITELIB}/euca2ools/nc/__init__.py
-${PYSITELIB}/euca2ools/nc/__init__.pyc
-${PYSITELIB}/euca2ools/nc/__init__.pyo
-${PYSITELIB}/euca2ools/nc/auth.py
-${PYSITELIB}/euca2ools/nc/auth.pyc
-${PYSITELIB}/euca2ools/nc/auth.pyo
-${PYSITELIB}/euca2ools/nc/connection.py
-${PYSITELIB}/euca2ools/nc/connection.pyc
-${PYSITELIB}/euca2ools/nc/connection.pyo
-${PYSITELIB}/euca2ools/utils.py
-${PYSITELIB}/euca2ools/utils.pyc
-${PYSITELIB}/euca2ools/utils.pyo
diff --git a/euca2ools/distinfo b/euca2ools/distinfo
deleted file mode 100644
index 0eda196a86..0000000000
--- a/euca2ools/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2013/06/13 11:40:35 noud4 Exp $
-
-RMD160 (euca2ools/2.1.3.zip) = c0f57d80812cf7e63f62aa9592f8723d93b85139
-Size (euca2ools/2.1.3.zip) = 439937 bytes
diff --git a/py-PythonDirector/DESCR b/py-PythonDirector/DESCR
deleted file mode 100644
index 5daf166785..0000000000
--- a/py-PythonDirector/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-PythonDirector is a flexible fast TCP loadbalancer written entirely in python.
-It takes inbound TCP connections and connects them to one of a number of
-backend servers using a variety of scheduling algorithms.
diff --git a/py-PythonDirector/Makefile b/py-PythonDirector/Makefile
deleted file mode 100644
index 782d2ead5f..0000000000
--- a/py-PythonDirector/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2014/05/09 07:38:44 thomasklausner Exp $
-
-DISTNAME= pydirector-1.0.0
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 1
-CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pythondirector/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://pythondirector.sourceforge.net/
-COMMENT= Pure-python TCP load balancer
-
-DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
-DEPENDS+= ${PYPKGPREFIX}-m2crypto>=0.13:../../security/py-m2crypto
-
-PY_PATCHPLIST= yes
-PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 27 # py-m2crypto
-USE_LANGUAGES= # none
-
-.include "../../lang/python/extension.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/py-PythonDirector/PLIST b/py-PythonDirector/PLIST
deleted file mode 100644
index 228bf6bdd1..0000000000
--- a/py-PythonDirector/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/03/25 14:16:44 jihbed Exp $
-bin/pydir.py
diff --git a/py-PythonDirector/distinfo b/py-PythonDirector/distinfo
deleted file mode 100644
index 572aafb72a..0000000000
--- a/py-PythonDirector/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2009/03/25 14:16:44 jihbed Exp $
-
-RMD160 (pydirector-1.0.0.tar.gz) = 1ec09e5b4f623bf7b52b75df6388e6d873d41ddf
-SHA512 (pydirector-1.0.0.tar.gz) = 09537f9fbdcbcebd48df9f75058b5d8ba8acb9d3ec0a533e7ff2e3fbde9799645f71a2464d3927b4ff41d91e7c07348a6aa48eaacba1877141754111b3a17cc1
-Size (pydirector-1.0.0.tar.gz) = 32569 bytes
diff --git a/py-gwpy/DESCR b/py-gwpy/DESCR
deleted file mode 100644
index bd41ccd890..0000000000
--- a/py-gwpy/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-GWpy is a collaboration-driven Python package providing tools for
-studying data from ground-based gravitational-wave detectors.
-
-GWpy provides a user-friendly, intuitive interface to the common
-time-domain and frequency-domain data produced by the LIGO and Virgo
-instruments and their analysis, with easy-to-follow tutorials at each step
diff --git a/py-gwpy/Makefile b/py-gwpy/Makefile
deleted file mode 100644
index 6ea3177439..0000000000
--- a/py-gwpy/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/08/05 20:41:42 jihbed Exp $
-
-DISTNAME= gwpy-0.6.1
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_PYPI:=g/gwpy/}
-
-MAINTAINER= jihbed.research%gmail.com@localhost
-HOMEPAGE= https://gwpy.github.io/
-COMMENT= Package to enable gravitational-wave astrophysics in Python
-LICENSE= gnu-gpl-v3
-
-DEPENDS+= ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
-DEPENDS+= ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
-DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.4.0:../../time/py-dateutil
-DEPENDS+= ${PYPKGPREFIX}-astropy>=1.2.1:../../math/py-astropy
-DEPENDS+= ${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
-DEPENDS+= ${PYPKGPREFIX}-lscsoft-glue-[0-9]*:../../wip/py-lscsoft-glue
-DEPENDS+= ${PYPKGPREFIX}-ligotimegps-[0-9]*:../../time/py-ligotimegps
-
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-BUILD_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-BUILD_DEPENDS+= ${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sqlparse-[0-9]*:../../databases/py-sqlparse
-
-USE_LANGUAGES= # none
-
-PYTHON_VERSIONS_ACCEPTED= 27 # py-m2crypto via py-lscsoft-glue
-
-.include "../../lang/python/egg.mk"
-.include "../../math/py-numpy/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/py-gwpy/PLIST b/py-gwpy/PLIST
deleted file mode 100644
index 93ac8575ca..0000000000
--- a/py-gwpy/PLIST
+++ /dev/null
@@ -1,402 +0,0 @@
-@comment $NetBSD$
-bin/gwpy-plot
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/gwpy/__init__.py
-${PYSITELIB}/gwpy/__init__.pyc
-${PYSITELIB}/gwpy/__init__.pyo
-${PYSITELIB}/gwpy/_version.py
-${PYSITELIB}/gwpy/_version.pyc
-${PYSITELIB}/gwpy/_version.pyo
-${PYSITELIB}/gwpy/_version_helper.py
-${PYSITELIB}/gwpy/_version_helper.pyc
-${PYSITELIB}/gwpy/_version_helper.pyo
-${PYSITELIB}/gwpy/astro/__init__.py
-${PYSITELIB}/gwpy/astro/__init__.pyc
-${PYSITELIB}/gwpy/astro/__init__.pyo
-${PYSITELIB}/gwpy/astro/range.py
-${PYSITELIB}/gwpy/astro/range.pyc
-${PYSITELIB}/gwpy/astro/range.pyo
-${PYSITELIB}/gwpy/cli/__init__.py
-${PYSITELIB}/gwpy/cli/__init__.pyc
-${PYSITELIB}/gwpy/cli/__init__.pyo
-${PYSITELIB}/gwpy/cli/cliproduct.py
-${PYSITELIB}/gwpy/cli/cliproduct.pyc
-${PYSITELIB}/gwpy/cli/cliproduct.pyo
-${PYSITELIB}/gwpy/cli/coherence.py
-${PYSITELIB}/gwpy/cli/coherence.pyc
-${PYSITELIB}/gwpy/cli/coherence.pyo
-${PYSITELIB}/gwpy/cli/coherencegram.py
-${PYSITELIB}/gwpy/cli/coherencegram.pyc
-${PYSITELIB}/gwpy/cli/coherencegram.pyo
-${PYSITELIB}/gwpy/cli/spectrogram.py
-${PYSITELIB}/gwpy/cli/spectrogram.pyc
-${PYSITELIB}/gwpy/cli/spectrogram.pyo
-${PYSITELIB}/gwpy/cli/spectrum.py
-${PYSITELIB}/gwpy/cli/spectrum.pyc
-${PYSITELIB}/gwpy/cli/spectrum.pyo
-${PYSITELIB}/gwpy/cli/timeseries.py
-${PYSITELIB}/gwpy/cli/timeseries.pyc
-${PYSITELIB}/gwpy/cli/timeseries.pyo
-${PYSITELIB}/gwpy/detector/__init__.py
-${PYSITELIB}/gwpy/detector/__init__.pyc
-${PYSITELIB}/gwpy/detector/__init__.pyo
-${PYSITELIB}/gwpy/detector/channel.py
-${PYSITELIB}/gwpy/detector/channel.pyc
-${PYSITELIB}/gwpy/detector/channel.pyo
-${PYSITELIB}/gwpy/detector/io/__init__.py
-${PYSITELIB}/gwpy/detector/io/__init__.pyc
-${PYSITELIB}/gwpy/detector/io/__init__.pyo
-${PYSITELIB}/gwpy/detector/io/cis.py
-${PYSITELIB}/gwpy/detector/io/cis.pyc
-${PYSITELIB}/gwpy/detector/io/cis.pyo
-${PYSITELIB}/gwpy/detector/io/clf.py
-${PYSITELIB}/gwpy/detector/io/clf.pyc
-${PYSITELIB}/gwpy/detector/io/clf.pyo
-${PYSITELIB}/gwpy/detector/io/omega.py
-${PYSITELIB}/gwpy/detector/io/omega.pyc
-${PYSITELIB}/gwpy/detector/io/omega.pyo
-${PYSITELIB}/gwpy/detector/units.py
-${PYSITELIB}/gwpy/detector/units.pyc
-${PYSITELIB}/gwpy/detector/units.pyo
-${PYSITELIB}/gwpy/frequencyseries/__init__.py
-${PYSITELIB}/gwpy/frequencyseries/__init__.pyc
-${PYSITELIB}/gwpy/frequencyseries/__init__.pyo
-${PYSITELIB}/gwpy/frequencyseries/core.py
-${PYSITELIB}/gwpy/frequencyseries/core.pyc
-${PYSITELIB}/gwpy/frequencyseries/core.pyo
-${PYSITELIB}/gwpy/frequencyseries/hist.py
-${PYSITELIB}/gwpy/frequencyseries/hist.pyc
-${PYSITELIB}/gwpy/frequencyseries/hist.pyo
-${PYSITELIB}/gwpy/frequencyseries/io/__init__.py
-${PYSITELIB}/gwpy/frequencyseries/io/__init__.pyc
-${PYSITELIB}/gwpy/frequencyseries/io/__init__.pyo
-${PYSITELIB}/gwpy/frequencyseries/io/ascii.py
-${PYSITELIB}/gwpy/frequencyseries/io/ascii.pyc
-${PYSITELIB}/gwpy/frequencyseries/io/ascii.pyo
-${PYSITELIB}/gwpy/frequencyseries/io/hdf5.py
-${PYSITELIB}/gwpy/frequencyseries/io/hdf5.pyc
-${PYSITELIB}/gwpy/frequencyseries/io/hdf5.pyo
-${PYSITELIB}/gwpy/io/__init__.py
-${PYSITELIB}/gwpy/io/__init__.pyc
-${PYSITELIB}/gwpy/io/__init__.pyo
-${PYSITELIB}/gwpy/io/cache.py
-${PYSITELIB}/gwpy/io/cache.pyc
-${PYSITELIB}/gwpy/io/cache.pyo
-${PYSITELIB}/gwpy/io/datafind.py
-${PYSITELIB}/gwpy/io/datafind.pyc
-${PYSITELIB}/gwpy/io/datafind.pyo
-${PYSITELIB}/gwpy/io/gwf.py
-${PYSITELIB}/gwpy/io/gwf.pyc
-${PYSITELIB}/gwpy/io/gwf.pyo
-${PYSITELIB}/gwpy/io/hdf5.py
-${PYSITELIB}/gwpy/io/hdf5.pyc
-${PYSITELIB}/gwpy/io/hdf5.pyo
-${PYSITELIB}/gwpy/io/kerberos.py
-${PYSITELIB}/gwpy/io/kerberos.pyc
-${PYSITELIB}/gwpy/io/kerberos.pyo
-${PYSITELIB}/gwpy/io/ligolw.py
-${PYSITELIB}/gwpy/io/ligolw.pyc
-${PYSITELIB}/gwpy/io/ligolw.pyo
-${PYSITELIB}/gwpy/io/mp.py
-${PYSITELIB}/gwpy/io/mp.pyc
-${PYSITELIB}/gwpy/io/mp.pyo
-${PYSITELIB}/gwpy/io/nds2.py
-${PYSITELIB}/gwpy/io/nds2.pyc
-${PYSITELIB}/gwpy/io/nds2.pyo
-${PYSITELIB}/gwpy/io/registry.py
-${PYSITELIB}/gwpy/io/registry.pyc
-${PYSITELIB}/gwpy/io/registry.pyo
-${PYSITELIB}/gwpy/io/utils.py
-${PYSITELIB}/gwpy/io/utils.pyc
-${PYSITELIB}/gwpy/io/utils.pyo
-${PYSITELIB}/gwpy/plotter/__init__.py
-${PYSITELIB}/gwpy/plotter/__init__.pyc
-${PYSITELIB}/gwpy/plotter/__init__.pyo
-${PYSITELIB}/gwpy/plotter/axes.py
-${PYSITELIB}/gwpy/plotter/axes.pyc
-${PYSITELIB}/gwpy/plotter/axes.pyo
-${PYSITELIB}/gwpy/plotter/colors.py
-${PYSITELIB}/gwpy/plotter/colors.pyc
-${PYSITELIB}/gwpy/plotter/colors.pyo
-${PYSITELIB}/gwpy/plotter/core.py
-${PYSITELIB}/gwpy/plotter/core.pyc
-${PYSITELIB}/gwpy/plotter/core.pyo
-${PYSITELIB}/gwpy/plotter/decorators.py
-${PYSITELIB}/gwpy/plotter/decorators.pyc
-${PYSITELIB}/gwpy/plotter/decorators.pyo
-${PYSITELIB}/gwpy/plotter/filter.py
-${PYSITELIB}/gwpy/plotter/filter.pyc
-${PYSITELIB}/gwpy/plotter/filter.pyo
-${PYSITELIB}/gwpy/plotter/frequencyseries.py
-${PYSITELIB}/gwpy/plotter/frequencyseries.pyc
-${PYSITELIB}/gwpy/plotter/frequencyseries.pyo
-${PYSITELIB}/gwpy/plotter/gps.py
-${PYSITELIB}/gwpy/plotter/gps.pyc
-${PYSITELIB}/gwpy/plotter/gps.pyo
-${PYSITELIB}/gwpy/plotter/histogram.py
-${PYSITELIB}/gwpy/plotter/histogram.pyc
-${PYSITELIB}/gwpy/plotter/histogram.pyo
-${PYSITELIB}/gwpy/plotter/html.py
-${PYSITELIB}/gwpy/plotter/html.pyc
-${PYSITELIB}/gwpy/plotter/html.pyo
-${PYSITELIB}/gwpy/plotter/log.py
-${PYSITELIB}/gwpy/plotter/log.pyc
-${PYSITELIB}/gwpy/plotter/log.pyo
-${PYSITELIB}/gwpy/plotter/rc.py
-${PYSITELIB}/gwpy/plotter/rc.pyc
-${PYSITELIB}/gwpy/plotter/rc.pyo
-${PYSITELIB}/gwpy/plotter/segments.py
-${PYSITELIB}/gwpy/plotter/segments.pyc
-${PYSITELIB}/gwpy/plotter/segments.pyo
-${PYSITELIB}/gwpy/plotter/spectrogram.py
-${PYSITELIB}/gwpy/plotter/spectrogram.pyc
-${PYSITELIB}/gwpy/plotter/spectrogram.pyo
-${PYSITELIB}/gwpy/plotter/table.py
-${PYSITELIB}/gwpy/plotter/table.pyc
-${PYSITELIB}/gwpy/plotter/table.pyo
-${PYSITELIB}/gwpy/plotter/tex.py
-${PYSITELIB}/gwpy/plotter/tex.pyc
-${PYSITELIB}/gwpy/plotter/tex.pyo
-${PYSITELIB}/gwpy/plotter/text.py
-${PYSITELIB}/gwpy/plotter/text.pyc
-${PYSITELIB}/gwpy/plotter/text.pyo
-${PYSITELIB}/gwpy/plotter/timeseries.py
-${PYSITELIB}/gwpy/plotter/timeseries.pyc
-${PYSITELIB}/gwpy/plotter/timeseries.pyo
-${PYSITELIB}/gwpy/plotter/utils.py
-${PYSITELIB}/gwpy/plotter/utils.pyc
-${PYSITELIB}/gwpy/plotter/utils.pyo
-${PYSITELIB}/gwpy/segments/__init__.py
-${PYSITELIB}/gwpy/segments/__init__.pyc
-${PYSITELIB}/gwpy/segments/__init__.pyo
-${PYSITELIB}/gwpy/segments/flag.py
-${PYSITELIB}/gwpy/segments/flag.pyc
-${PYSITELIB}/gwpy/segments/flag.pyo
-${PYSITELIB}/gwpy/segments/io/__init__.py
-${PYSITELIB}/gwpy/segments/io/__init__.pyc
-${PYSITELIB}/gwpy/segments/io/__init__.pyo
-${PYSITELIB}/gwpy/segments/io/hdf5.py
-${PYSITELIB}/gwpy/segments/io/hdf5.pyc
-${PYSITELIB}/gwpy/segments/io/hdf5.pyo
-${PYSITELIB}/gwpy/segments/io/json.py
-${PYSITELIB}/gwpy/segments/io/json.pyc
-${PYSITELIB}/gwpy/segments/io/json.pyo
-${PYSITELIB}/gwpy/segments/io/ligolw.py
-${PYSITELIB}/gwpy/segments/io/ligolw.pyc
-${PYSITELIB}/gwpy/segments/io/ligolw.pyo
-${PYSITELIB}/gwpy/segments/io/segwizard.py
-${PYSITELIB}/gwpy/segments/io/segwizard.pyc
-${PYSITELIB}/gwpy/segments/io/segwizard.pyo
-${PYSITELIB}/gwpy/segments/segments.py
-${PYSITELIB}/gwpy/segments/segments.pyc
-${PYSITELIB}/gwpy/segments/segments.pyo
-${PYSITELIB}/gwpy/signal/__init__.py
-${PYSITELIB}/gwpy/signal/__init__.pyc
-${PYSITELIB}/gwpy/signal/__init__.pyo
-${PYSITELIB}/gwpy/signal/fft/__init__.py
-${PYSITELIB}/gwpy/signal/fft/__init__.pyc
-${PYSITELIB}/gwpy/signal/fft/__init__.pyo
-${PYSITELIB}/gwpy/signal/fft/lal.py
-${PYSITELIB}/gwpy/signal/fft/lal.pyc
-${PYSITELIB}/gwpy/signal/fft/lal.pyo
-${PYSITELIB}/gwpy/signal/fft/registry.py
-${PYSITELIB}/gwpy/signal/fft/registry.pyc
-${PYSITELIB}/gwpy/signal/fft/registry.pyo
-${PYSITELIB}/gwpy/signal/fft/scipy.py
-${PYSITELIB}/gwpy/signal/fft/scipy.pyc
-${PYSITELIB}/gwpy/signal/fft/scipy.pyo
-${PYSITELIB}/gwpy/signal/fft/ui.py
-${PYSITELIB}/gwpy/signal/fft/ui.pyc
-${PYSITELIB}/gwpy/signal/fft/ui.pyo
-${PYSITELIB}/gwpy/signal/fft/utils.py
-${PYSITELIB}/gwpy/signal/fft/utils.pyc
-${PYSITELIB}/gwpy/signal/fft/utils.pyo
-${PYSITELIB}/gwpy/signal/filter.py
-${PYSITELIB}/gwpy/signal/filter.pyc
-${PYSITELIB}/gwpy/signal/filter.pyo
-${PYSITELIB}/gwpy/signal/filter_design.py
-${PYSITELIB}/gwpy/signal/filter_design.pyc
-${PYSITELIB}/gwpy/signal/filter_design.pyo
-${PYSITELIB}/gwpy/signal/qtransform.py
-${PYSITELIB}/gwpy/signal/qtransform.pyc
-${PYSITELIB}/gwpy/signal/qtransform.pyo
-${PYSITELIB}/gwpy/signal/window.py
-${PYSITELIB}/gwpy/signal/window.pyc
-${PYSITELIB}/gwpy/signal/window.pyo
-${PYSITELIB}/gwpy/spectrogram/__init__.py
-${PYSITELIB}/gwpy/spectrogram/__init__.pyc
-${PYSITELIB}/gwpy/spectrogram/__init__.pyo
-${PYSITELIB}/gwpy/spectrogram/coherence.py
-${PYSITELIB}/gwpy/spectrogram/coherence.pyc
-${PYSITELIB}/gwpy/spectrogram/coherence.pyo
-${PYSITELIB}/gwpy/spectrogram/core.py
-${PYSITELIB}/gwpy/spectrogram/core.pyc
-${PYSITELIB}/gwpy/spectrogram/core.pyo
-${PYSITELIB}/gwpy/spectrogram/io/__init__.py
-${PYSITELIB}/gwpy/spectrogram/io/__init__.pyc
-${PYSITELIB}/gwpy/spectrogram/io/__init__.pyo
-${PYSITELIB}/gwpy/spectrogram/io/hdf5.py
-${PYSITELIB}/gwpy/spectrogram/io/hdf5.pyc
-${PYSITELIB}/gwpy/spectrogram/io/hdf5.pyo
-${PYSITELIB}/gwpy/table/__init__.py
-${PYSITELIB}/gwpy/table/__init__.pyc
-${PYSITELIB}/gwpy/table/__init__.pyo
-${PYSITELIB}/gwpy/table/filter.py
-${PYSITELIB}/gwpy/table/filter.pyc
-${PYSITELIB}/gwpy/table/filter.pyo
-${PYSITELIB}/gwpy/table/gravityspy.py
-${PYSITELIB}/gwpy/table/gravityspy.pyc
-${PYSITELIB}/gwpy/table/gravityspy.pyo
-${PYSITELIB}/gwpy/table/io/__init__.py
-${PYSITELIB}/gwpy/table/io/__init__.pyc
-${PYSITELIB}/gwpy/table/io/__init__.pyo
-${PYSITELIB}/gwpy/table/io/cwb.py
-${PYSITELIB}/gwpy/table/io/cwb.pyc
-${PYSITELIB}/gwpy/table/io/cwb.pyo
-${PYSITELIB}/gwpy/table/io/fetch.py
-${PYSITELIB}/gwpy/table/io/fetch.pyc
-${PYSITELIB}/gwpy/table/io/fetch.pyo
-${PYSITELIB}/gwpy/table/io/gravityspy.py
-${PYSITELIB}/gwpy/table/io/gravityspy.pyc
-${PYSITELIB}/gwpy/table/io/gravityspy.pyo
-${PYSITELIB}/gwpy/table/io/gwf.py
-${PYSITELIB}/gwpy/table/io/gwf.pyc
-${PYSITELIB}/gwpy/table/io/gwf.pyo
-${PYSITELIB}/gwpy/table/io/hacr.py
-${PYSITELIB}/gwpy/table/io/hacr.pyc
-${PYSITELIB}/gwpy/table/io/hacr.pyo
-${PYSITELIB}/gwpy/table/io/ligolw.py
-${PYSITELIB}/gwpy/table/io/ligolw.pyc
-${PYSITELIB}/gwpy/table/io/ligolw.pyo
-${PYSITELIB}/gwpy/table/io/omega.py
-${PYSITELIB}/gwpy/table/io/omega.pyc
-${PYSITELIB}/gwpy/table/io/omega.pyo
-${PYSITELIB}/gwpy/table/io/omicron.py
-${PYSITELIB}/gwpy/table/io/omicron.pyc
-${PYSITELIB}/gwpy/table/io/omicron.pyo
-${PYSITELIB}/gwpy/table/io/pycbc.py
-${PYSITELIB}/gwpy/table/io/pycbc.pyc
-${PYSITELIB}/gwpy/table/io/pycbc.pyo
-${PYSITELIB}/gwpy/table/io/root.py
-${PYSITELIB}/gwpy/table/io/root.pyc
-${PYSITELIB}/gwpy/table/io/root.pyo
-${PYSITELIB}/gwpy/table/io/sql.py
-${PYSITELIB}/gwpy/table/io/sql.pyc
-${PYSITELIB}/gwpy/table/io/sql.pyo
-${PYSITELIB}/gwpy/table/io/utils.py
-${PYSITELIB}/gwpy/table/io/utils.pyc
-${PYSITELIB}/gwpy/table/io/utils.pyo
-${PYSITELIB}/gwpy/table/table.py
-${PYSITELIB}/gwpy/table/table.pyc
-${PYSITELIB}/gwpy/table/table.pyo
-${PYSITELIB}/gwpy/tests/data/H1-LDAS_STRAIN-968654552-10.xml.gz
-${PYSITELIB}/gwpy/tests/data/HLV-GW100916-968654552-1.gwf
-${PYSITELIB}/gwpy/tests/data/HLV-GW100916-968654552-1.hdf
-${PYSITELIB}/gwpy/tests/data/X1-GWPY_TEST_SEGMENTS-0-10.txt
-${PYSITELIB}/gwpy/tests/data/X1-GWPY_TEST_SEGMENTS-0-10.xml.gz
-${PYSITELIB}/gwpy/time/__init__.py
-${PYSITELIB}/gwpy/time/__init__.pyc
-${PYSITELIB}/gwpy/time/__init__.pyo
-${PYSITELIB}/gwpy/time/_tconvert.py
-${PYSITELIB}/gwpy/time/_tconvert.pyc
-${PYSITELIB}/gwpy/time/_tconvert.pyo
-${PYSITELIB}/gwpy/timeseries/__init__.py
-${PYSITELIB}/gwpy/timeseries/__init__.pyc
-${PYSITELIB}/gwpy/timeseries/__init__.pyo
-${PYSITELIB}/gwpy/timeseries/core.py
-${PYSITELIB}/gwpy/timeseries/core.pyc
-${PYSITELIB}/gwpy/timeseries/core.pyo
-${PYSITELIB}/gwpy/timeseries/io/__init__.py
-${PYSITELIB}/gwpy/timeseries/io/__init__.pyc
-${PYSITELIB}/gwpy/timeseries/io/__init__.pyo
-${PYSITELIB}/gwpy/timeseries/io/ascii.py
-${PYSITELIB}/gwpy/timeseries/io/ascii.pyc
-${PYSITELIB}/gwpy/timeseries/io/ascii.pyo
-${PYSITELIB}/gwpy/timeseries/io/cache.py
-${PYSITELIB}/gwpy/timeseries/io/cache.pyc
-${PYSITELIB}/gwpy/timeseries/io/cache.pyo
-${PYSITELIB}/gwpy/timeseries/io/gwf/__init__.py
-${PYSITELIB}/gwpy/timeseries/io/gwf/__init__.pyc
-${PYSITELIB}/gwpy/timeseries/io/gwf/__init__.pyo
-${PYSITELIB}/gwpy/timeseries/io/gwf/framecpp.py
-${PYSITELIB}/gwpy/timeseries/io/gwf/framecpp.pyc
-${PYSITELIB}/gwpy/timeseries/io/gwf/framecpp.pyo
-${PYSITELIB}/gwpy/timeseries/io/gwf/lalframe.py
-${PYSITELIB}/gwpy/timeseries/io/gwf/lalframe.pyc
-${PYSITELIB}/gwpy/timeseries/io/gwf/lalframe.pyo
-${PYSITELIB}/gwpy/timeseries/io/hdf5.py
-${PYSITELIB}/gwpy/timeseries/io/hdf5.pyc
-${PYSITELIB}/gwpy/timeseries/io/hdf5.pyo
-${PYSITELIB}/gwpy/timeseries/io/losc.py
-${PYSITELIB}/gwpy/timeseries/io/losc.pyc
-${PYSITELIB}/gwpy/timeseries/io/losc.pyo
-${PYSITELIB}/gwpy/timeseries/io/nds2.py
-${PYSITELIB}/gwpy/timeseries/io/nds2.pyc
-${PYSITELIB}/gwpy/timeseries/io/nds2.pyo
-${PYSITELIB}/gwpy/timeseries/io/wav.py
-${PYSITELIB}/gwpy/timeseries/io/wav.pyc
-${PYSITELIB}/gwpy/timeseries/io/wav.pyo
-${PYSITELIB}/gwpy/timeseries/statevector.py
-${PYSITELIB}/gwpy/timeseries/statevector.pyc
-${PYSITELIB}/gwpy/timeseries/statevector.pyo
-${PYSITELIB}/gwpy/timeseries/timeseries.py
-${PYSITELIB}/gwpy/timeseries/timeseries.pyc
-${PYSITELIB}/gwpy/timeseries/timeseries.pyo
-${PYSITELIB}/gwpy/types/__init__.py
-${PYSITELIB}/gwpy/types/__init__.pyc
-${PYSITELIB}/gwpy/types/__init__.pyo
-${PYSITELIB}/gwpy/types/array.py
-${PYSITELIB}/gwpy/types/array.pyc
-${PYSITELIB}/gwpy/types/array.pyo
-${PYSITELIB}/gwpy/types/array2d.py
-${PYSITELIB}/gwpy/types/array2d.pyc
-${PYSITELIB}/gwpy/types/array2d.pyo
-${PYSITELIB}/gwpy/types/index.py
-${PYSITELIB}/gwpy/types/index.pyc
-${PYSITELIB}/gwpy/types/index.pyo
-${PYSITELIB}/gwpy/types/io/__init__.py
-${PYSITELIB}/gwpy/types/io/__init__.pyc
-${PYSITELIB}/gwpy/types/io/__init__.pyo
-${PYSITELIB}/gwpy/types/io/ascii.py
-${PYSITELIB}/gwpy/types/io/ascii.pyc
-${PYSITELIB}/gwpy/types/io/ascii.pyo
-${PYSITELIB}/gwpy/types/io/hdf5.py
-${PYSITELIB}/gwpy/types/io/hdf5.pyc
-${PYSITELIB}/gwpy/types/io/hdf5.pyo
-${PYSITELIB}/gwpy/types/series.py
-${PYSITELIB}/gwpy/types/series.pyc
-${PYSITELIB}/gwpy/types/series.pyo
-${PYSITELIB}/gwpy/utils/__init__.py
-${PYSITELIB}/gwpy/utils/__init__.pyc
-${PYSITELIB}/gwpy/utils/__init__.pyo
-${PYSITELIB}/gwpy/utils/compat.py
-${PYSITELIB}/gwpy/utils/compat.pyc
-${PYSITELIB}/gwpy/utils/compat.pyo
-${PYSITELIB}/gwpy/utils/deps.py
-${PYSITELIB}/gwpy/utils/deps.pyc
-${PYSITELIB}/gwpy/utils/deps.pyo
-${PYSITELIB}/gwpy/utils/lal.py
-${PYSITELIB}/gwpy/utils/lal.pyc
-${PYSITELIB}/gwpy/utils/lal.pyo
-${PYSITELIB}/gwpy/utils/mp.py
-${PYSITELIB}/gwpy/utils/mp.pyc
-${PYSITELIB}/gwpy/utils/mp.pyo
-${PYSITELIB}/gwpy/utils/shell.py
-${PYSITELIB}/gwpy/utils/shell.pyc
-${PYSITELIB}/gwpy/utils/shell.pyo
-${PYSITELIB}/gwpy/utils/sphinx/__init__.py
-${PYSITELIB}/gwpy/utils/sphinx/__init__.pyc
-${PYSITELIB}/gwpy/utils/sphinx/__init__.pyo
-${PYSITELIB}/gwpy/utils/sphinx/autoclassapi.py
-${PYSITELIB}/gwpy/utils/sphinx/autoclassapi.pyc
-${PYSITELIB}/gwpy/utils/sphinx/autoclassapi.pyo
-${PYSITELIB}/gwpy/utils/sphinx/directives.py
-${PYSITELIB}/gwpy/utils/sphinx/directives.pyc
-${PYSITELIB}/gwpy/utils/sphinx/directives.pyo
-${PYSITELIB}/gwpy/utils/sphinx/numpydoc.py
-${PYSITELIB}/gwpy/utils/sphinx/numpydoc.pyc
-${PYSITELIB}/gwpy/utils/sphinx/numpydoc.pyo
diff --git a/py-gwpy/distinfo b/py-gwpy/distinfo
deleted file mode 100644
index b1505596ef..0000000000
--- a/py-gwpy/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2015/08/05 20:41:42 jihbed Exp $
-
-RMD160 (gwpy-0.6.1.tar.gz) = b504468f47996a013c53e63df734a3685167c156
-SHA512 (gwpy-0.6.1.tar.gz) = cce11c76c76e4ff5c316e40d91df519ea0d795ecacd55da28513d5e998d26030aae72d10fb2d88fb3cae264c5fdaa484cdb4bd8f3fcbe2aa37fb5ba1eb0411cf
-Size (gwpy-0.6.1.tar.gz) = 1068077 bytes
diff --git a/py-lscsoft-glue/DESCR b/py-lscsoft-glue/DESCR
deleted file mode 100644
index ee87ae7e1d..0000000000
--- a/py-lscsoft-glue/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Glue is a collection of utilities for running data analysis pipelines
-for online and offline analysis as well as accessing various grid
-utilities. It also provides the infrastructure for the segment
-database.
diff --git a/py-lscsoft-glue/Makefile b/py-lscsoft-glue/Makefile
deleted file mode 100644
index 317a1de32f..0000000000
--- a/py-lscsoft-glue/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2017/09/17 13:35:03 adam Exp $
-
-DISTNAME= lscsoft-glue-1.56.0
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES= math python
-MASTER_SITES= ${MASTER_SITE_PYPI:=l/lscsoft-glue/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.lsc-group.phys.uwm.edu/daswg/projects/glue.html
-COMMENT= Grid LSC User Environment
-LICENSE= gnu-gpl-v3
-
-DEPENDS+= ${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
-DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-DEPENDS+= ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
-DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
-DEPENDS+= ${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto
-
-PYTHON_VERSIONS_ACCEPTED= 27 # py-m2crypto
-
-USE_LANGUAGES= c
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/py-lscsoft-glue/PLIST b/py-lscsoft-glue/PLIST
deleted file mode 100644
index 29b79fc5d0..0000000000
--- a/py-lscsoft-glue/PLIST
+++ /dev/null
@@ -1,238 +0,0 @@
-@comment $NetBSD$
-bin/LSCdataFind
-bin/dmtdq_seg_insert
-bin/glue_nmi_genbuild
-bin/gw_data_find
-bin/ldbdc
-bin/ldbdd
-bin/ldg_submit_dax
-bin/ligo_data_find
-bin/ligolw_add
-bin/ligolw_cbc_glitch_page
-bin/ligolw_combine_segments
-bin/ligolw_cut
-bin/ligolw_diff
-bin/ligolw_dq_active
-bin/ligolw_dq_active_cats
-bin/ligolw_dq_grapher
-bin/ligolw_dq_query
-bin/ligolw_geo_fr_to_dq
-bin/ligolw_inspiral2mon
-bin/ligolw_print
-bin/ligolw_print_tables
-bin/ligolw_publish_dqxml
-bin/ligolw_segment_diff
-bin/ligolw_segment_insert
-bin/ligolw_segment_intersect
-bin/ligolw_segment_query
-bin/ligolw_segment_union
-bin/ligolw_segments_from_cats
-bin/ligolw_segments_from_cats_split
-bin/ligolw_sqlite
-bin/ligolw_veto_def_check
-bin/ligolw_veto_sngl_trigger
-bin/segdb_coalesce
-etc/LDBDWServer.wsgi
-etc/cbcwebpage.css
-etc/glue-user-env.csh
-etc/glue-user-env.fish
-etc/glue-user-env.sh
-etc/httpd/conf.d/segdb.conf
-etc/ldbdserver.ini
-etc/ldbduser.ini
-etc/ldg-sites.xml
-etc/ligolw.js
-etc/ligolw.xsl
-etc/ligolw_dtd.txt
-etc/pegasus-properties.bundle
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/glue/LDBDClient.py
-${PYSITELIB}/glue/LDBDClient.pyc
-${PYSITELIB}/glue/LDBDClient.pyo
-${PYSITELIB}/glue/LDBDServer.py
-${PYSITELIB}/glue/LDBDServer.pyc
-${PYSITELIB}/glue/LDBDServer.pyo
-${PYSITELIB}/glue/LDBDWClient.py
-${PYSITELIB}/glue/LDBDWClient.pyc
-${PYSITELIB}/glue/LDBDWClient.pyo
-${PYSITELIB}/glue/LDBDWServer.py
-${PYSITELIB}/glue/LDBDWServer.pyc
-${PYSITELIB}/glue/LDBDWServer.pyo
-${PYSITELIB}/glue/LDRdataFindClient.py
-${PYSITELIB}/glue/LDRdataFindClient.pyc
-${PYSITELIB}/glue/LDRdataFindClient.pyo
-${PYSITELIB}/glue/VnPublish.py
-${PYSITELIB}/glue/VnPublish.pyc
-${PYSITELIB}/glue/VnPublish.pyo
-${PYSITELIB}/glue/__init__.py
-${PYSITELIB}/glue/__init__.pyc
-${PYSITELIB}/glue/__init__.pyo
-${PYSITELIB}/glue/__segments.so
-${PYSITELIB}/glue/auth/__init__.py
-${PYSITELIB}/glue/auth/__init__.pyc
-${PYSITELIB}/glue/auth/__init__.pyo
-${PYSITELIB}/glue/auth/saml.py
-${PYSITELIB}/glue/auth/saml.pyc
-${PYSITELIB}/glue/auth/saml.pyo
-${PYSITELIB}/glue/cbcwebpage.py
-${PYSITELIB}/glue/cbcwebpage.pyc
-${PYSITELIB}/glue/cbcwebpage.pyo
-${PYSITELIB}/glue/cis.py
-${PYSITELIB}/glue/cis.pyc
-${PYSITELIB}/glue/cis.pyo
-${PYSITELIB}/glue/dagfile.py
-${PYSITELIB}/glue/dagfile.pyc
-${PYSITELIB}/glue/dagfile.pyo
-${PYSITELIB}/glue/datafind.py
-${PYSITELIB}/glue/datafind.pyc
-${PYSITELIB}/glue/datafind.pyo
-${PYSITELIB}/glue/git_version.py
-${PYSITELIB}/glue/git_version.pyc
-${PYSITELIB}/glue/git_version.pyo
-${PYSITELIB}/glue/gpstime.py
-${PYSITELIB}/glue/gpstime.pyc
-${PYSITELIB}/glue/gpstime.pyo
-${PYSITELIB}/glue/gsiserverutils.py
-${PYSITELIB}/glue/gsiserverutils.pyc
-${PYSITELIB}/glue/gsiserverutils.pyo
-${PYSITELIB}/glue/iterutils.py
-${PYSITELIB}/glue/iterutils.pyc
-${PYSITELIB}/glue/iterutils.pyo
-${PYSITELIB}/glue/lal.py
-${PYSITELIB}/glue/lal.pyc
-${PYSITELIB}/glue/lal.pyo
-${PYSITELIB}/glue/ldbd.py
-${PYSITELIB}/glue/ldbd.pyc
-${PYSITELIB}/glue/ldbd.pyo
-${PYSITELIB}/glue/ligolw/__init__.py
-${PYSITELIB}/glue/ligolw/__init__.pyc
-${PYSITELIB}/glue/ligolw/__init__.pyo
-${PYSITELIB}/glue/ligolw/_ilwd.so
-${PYSITELIB}/glue/ligolw/array.py
-${PYSITELIB}/glue/ligolw/array.pyc
-${PYSITELIB}/glue/ligolw/array.pyo
-${PYSITELIB}/glue/ligolw/dbtables.py
-${PYSITELIB}/glue/ligolw/dbtables.pyc
-${PYSITELIB}/glue/ligolw/dbtables.pyo
-${PYSITELIB}/glue/ligolw/ilwd.py
-${PYSITELIB}/glue/ligolw/ilwd.pyc
-${PYSITELIB}/glue/ligolw/ilwd.pyo
-${PYSITELIB}/glue/ligolw/ligolw.py
-${PYSITELIB}/glue/ligolw/ligolw.pyc
-${PYSITELIB}/glue/ligolw/ligolw.pyo
-${PYSITELIB}/glue/ligolw/lsctables.py
-${PYSITELIB}/glue/ligolw/lsctables.pyc
-${PYSITELIB}/glue/ligolw/lsctables.pyo
-${PYSITELIB}/glue/ligolw/param.py
-${PYSITELIB}/glue/ligolw/param.pyc
-${PYSITELIB}/glue/ligolw/param.pyo
-${PYSITELIB}/glue/ligolw/table.py
-${PYSITELIB}/glue/ligolw/table.pyc
-${PYSITELIB}/glue/ligolw/table.pyo
-${PYSITELIB}/glue/ligolw/tokenizer.so
-${PYSITELIB}/glue/ligolw/types.py
-${PYSITELIB}/glue/ligolw/types.pyc
-${PYSITELIB}/glue/ligolw/types.pyo
-${PYSITELIB}/glue/ligolw/utils/__init__.py
-${PYSITELIB}/glue/ligolw/utils/__init__.pyc
-${PYSITELIB}/glue/ligolw/utils/__init__.pyo
-${PYSITELIB}/glue/ligolw/utils/coalesce_db.py
-${PYSITELIB}/glue/ligolw/utils/coalesce_db.pyc
-${PYSITELIB}/glue/ligolw/utils/coalesce_db.pyo
-${PYSITELIB}/glue/ligolw/utils/coincs.py
-${PYSITELIB}/glue/ligolw/utils/coincs.pyc
-${PYSITELIB}/glue/ligolw/utils/coincs.pyo
-${PYSITELIB}/glue/ligolw/utils/ligolw_add.py
-${PYSITELIB}/glue/ligolw/utils/ligolw_add.pyc
-${PYSITELIB}/glue/ligolw/utils/ligolw_add.pyo
-${PYSITELIB}/glue/ligolw/utils/ligolw_sqlite.py
-${PYSITELIB}/glue/ligolw/utils/ligolw_sqlite.pyc
-${PYSITELIB}/glue/ligolw/utils/ligolw_sqlite.pyo
-${PYSITELIB}/glue/ligolw/utils/print_tables.py
-${PYSITELIB}/glue/ligolw/utils/print_tables.pyc
-${PYSITELIB}/glue/ligolw/utils/print_tables.pyo
-${PYSITELIB}/glue/ligolw/utils/process.py
-${PYSITELIB}/glue/ligolw/utils/process.pyc
-${PYSITELIB}/glue/ligolw/utils/process.pyo
-${PYSITELIB}/glue/ligolw/utils/search_summary.py
-${PYSITELIB}/glue/ligolw/utils/search_summary.pyc
-${PYSITELIB}/glue/ligolw/utils/search_summary.pyo
-${PYSITELIB}/glue/ligolw/utils/segments.py
-${PYSITELIB}/glue/ligolw/utils/segments.pyc
-${PYSITELIB}/glue/ligolw/utils/segments.pyo
-${PYSITELIB}/glue/ligolw/utils/time_slide.py
-${PYSITELIB}/glue/ligolw/utils/time_slide.pyc
-${PYSITELIB}/glue/ligolw/utils/time_slide.pyo
-${PYSITELIB}/glue/markup.py
-${PYSITELIB}/glue/markup.pyc
-${PYSITELIB}/glue/markup.pyo
-${PYSITELIB}/glue/nmi/__init__.py
-${PYSITELIB}/glue/nmi/__init__.pyc
-${PYSITELIB}/glue/nmi/__init__.pyo
-${PYSITELIB}/glue/nmi/opts.py
-${PYSITELIB}/glue/nmi/opts.pyc
-${PYSITELIB}/glue/nmi/opts.pyo
-${PYSITELIB}/glue/nmi/util.py
-${PYSITELIB}/glue/nmi/util.pyc
-${PYSITELIB}/glue/nmi/util.pyo
-${PYSITELIB}/glue/offsetvector.py
-${PYSITELIB}/glue/offsetvector.pyc
-${PYSITELIB}/glue/offsetvector.pyo
-${PYSITELIB}/glue/pidfile.py
-${PYSITELIB}/glue/pidfile.pyc
-${PYSITELIB}/glue/pidfile.pyo
-${PYSITELIB}/glue/pipeline.py
-${PYSITELIB}/glue/pipeline.pyc
-${PYSITELIB}/glue/pipeline.pyo
-${PYSITELIB}/glue/segmentdb/__init__.py
-${PYSITELIB}/glue/segmentdb/__init__.pyc
-${PYSITELIB}/glue/segmentdb/__init__.pyo
-${PYSITELIB}/glue/segmentdb/logic.py
-${PYSITELIB}/glue/segmentdb/logic.pyc
-${PYSITELIB}/glue/segmentdb/logic.pyo
-${PYSITELIB}/glue/segmentdb/query_engine.py
-${PYSITELIB}/glue/segmentdb/query_engine.pyc
-${PYSITELIB}/glue/segmentdb/query_engine.pyo
-${PYSITELIB}/glue/segmentdb/segmentdb_utils.py
-${PYSITELIB}/glue/segmentdb/segmentdb_utils.pyc
-${PYSITELIB}/glue/segmentdb/segmentdb_utils.pyo
-${PYSITELIB}/glue/segments.py
-${PYSITELIB}/glue/segments.pyc
-${PYSITELIB}/glue/segments.pyo
-${PYSITELIB}/glue/segmentsUtils.py
-${PYSITELIB}/glue/segmentsUtils.pyc
-${PYSITELIB}/glue/segmentsUtils.pyo
-${PYSITELIB}/glue/text_progress_bar.py
-${PYSITELIB}/glue/text_progress_bar.pyc
-${PYSITELIB}/glue/text_progress_bar.pyo
-${PYSITELIB}/glue/utils.py
-${PYSITELIB}/glue/utils.pyc
-${PYSITELIB}/glue/utils.pyo
-${PYSITELIB}/glue/workflow.py
-${PYSITELIB}/glue/workflow.pyc
-${PYSITELIB}/glue/workflow.pyo
-share/nmi/lalsuite-build-scripts.location
-var/php/dq_report/get_report.php
-var/php/dq_report/header.php
-var/php/dq_report/index.php
-var/php/seginsert/flagcheck.php
-var/php/seginsert/img/LIGOLogo.gif
-var/php/seginsert/img/brace.gif
-var/php/seginsert/img/lsc.gif
-var/php/seginsert/img/plus.gif
-var/php/seginsert/index.php
-var/php/seginsert/ligolw.xsl
-var/php/seginsert/listflags.php
-var/php/seginsert/scripts/footer.php
-var/php/seginsert/scripts/form_day_list.php
-var/php/seginsert/scripts/form_month_list.php
-var/php/seginsert/scripts/form_year_list.php
-var/php/seginsert/scripts/header.php
-var/php/seginsert/scripts/style.css
-var/php/seginsert/scripts/styletitle.php
-var/php/seginsert/scripts/time_conv_functions.php
-var/php/seginsert/submitflag.php
diff --git a/py-lscsoft-glue/distinfo b/py-lscsoft-glue/distinfo
deleted file mode 100644
index 75efc0b27b..0000000000
--- a/py-lscsoft-glue/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2017/09/17 13:35:03 adam Exp $
-
-RMD160 (lscsoft-glue-1.56.0.tar.gz) = 00c39851af438250e6260963819f862a61e419b3
-SHA512 (lscsoft-glue-1.56.0.tar.gz) = 4535d4db700a590f84d29ba04896c4b825c853a90b3207b73b93ab4a28ecc7b17ddfc7e950ab1adde451cf88f5c12a7f82caced9b2e9e6e0b9de965b83117f0e
-Size (lscsoft-glue-1.56.0.tar.gz) = 2652916 bytes
diff --git a/py-m2ext/DESCR b/py-m2ext/DESCR
deleted file mode 100644
index 41d70b71ec..0000000000
--- a/py-m2ext/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-T his package contains some extended functions which are not (yet)
-available in M2Crypto trunk.
-
-It should be built using the same SWIG and OpenSSL version as M2Crypto
diff --git a/py-m2ext/Makefile b/py-m2ext/Makefile
deleted file mode 100644
index fe82005d12..0000000000
--- a/py-m2ext/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/02/20 19:28:47 jihbed Exp $
-
-DISTNAME= m2ext-0.1
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES= security python
-MASTER_SITES= ${MASTER_SITE_PYPI:=m/m2ext/}
-
-MAINTAINER= kamelderouiche%yahoo.com@localhost
-HOMEPAGE= https://github.com/abbot/m2ext
-COMMENT= M2Crypto Extensions
-LICENSE= modified-bsd
-
-DEPENDS+= ${PYPKGPREFIX}-m2crypto>=0.22.3:../../security/py-m2crypto
-
-USE_LANGUAGES= c
-
-PYDISTUTILSPKG= yes
-
-BUILD_TARGET= _m2ext.so
-
-.include "../../devel/swig/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/py-m2ext/PLIST b/py-m2ext/PLIST
deleted file mode 100644
index 697eb5271d..0000000000
--- a/py-m2ext/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/20 19:28:47 jihbed Exp $
-${PYSITELIB}/m2ext/SSL.py
-${PYSITELIB}/m2ext/SSL.pyc
-${PYSITELIB}/m2ext/SSL.pyo
-${PYSITELIB}/m2ext/__init__.py
-${PYSITELIB}/m2ext/__init__.pyc
-${PYSITELIB}/m2ext/__init__.pyo
-${PYSITELIB}/m2ext/_m2ext.so
-${PYSITELIB}/m2ext/m2.py
-${PYSITELIB}/m2ext/m2.pyc
-${PYSITELIB}/m2ext/m2.pyo
diff --git a/py-m2ext/distinfo b/py-m2ext/distinfo
deleted file mode 100644
index a64a65449a..0000000000
--- a/py-m2ext/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2015/02/20 19:28:47 jihbed Exp $
-
-RMD160 (m2ext-0.1.tar.gz) = 00b77952d820dbbbf9178bd8418b9046cf005435
-SHA512 (m2ext-0.1.tar.gz) = 433d822212b043220c7a1fda34e08a6bb3db685adc18a873113b234a45888684dd98beac0470df329b7ee84bbbb362970349e503c4650354cae606b281e6befc
-Size (m2ext-0.1.tar.gz) = 2911 bytes
diff --git a/spade/DEINSTALL b/spade/DEINSTALL
deleted file mode 100644
index 78192f4b5e..0000000000
--- a/spade/DEINSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2010/07/14 00:38:02 jihbed Exp $
-
-case ${STAGE} in
-DEINSTALL)
- ${RM} -f -r ${PREFIX}/etc/spade
- ;;
-esac
diff --git a/spade/DESCR b/spade/DESCR
deleted file mode 100644
index 45b5f6604c..0000000000
--- a/spade/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-SPADE (Smart Python multi-Agent Development Environment) is a Multiagent and
-Organizations Platform based on the XMPP/Jabber technology and written in the
-Python programming language. This technology offers by itself many features and
-facilities that ease the construction of MAS, such as an existing communication
-channel, the concepts of users (agents) and servers (platforms) and an
-extensible communication protocol based on XML, just like FIPA-ACL. Many other
-agent platforms exist, but SPADE is the first to base its roots on
-the XMPP technology
diff --git a/spade/INSTALL b/spade/INSTALL
deleted file mode 100644
index 6138480dfa..0000000000
--- a/spade/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2010/07/14 00:38:02 jihbed Exp $
-
-case ${STAGE} in
-POST-INSTALL)
- ${MKDIR} ${PREFIX}/etc/spade && configure.py
- ;;
-esac
diff --git a/spade/MESSAGE b/spade/MESSAGE
deleted file mode 100644
index a50fd5a5a1..0000000000
--- a/spade/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2012/08/26 12:50:07 noud4 Exp $
-
-Create file configuration using configure.py:
-
- ${PREFIX}/etc/spade/spade.xml
- ${PREFIX}/etc/spade/xmppd.xml
-
-
-
-===========================================================================
diff --git a/spade/Makefile b/spade/Makefile
deleted file mode 100644
index 04730233cf..0000000000
--- a/spade/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2014/05/09 07:38:52 thomasklausner Exp $
-
-DISTNAME= spade-2.0rc4
-PKGREVISION= 1
-CATEGORIES= devel python
-MASTER_SITES= http://spade2.googlecode.com/files/
-
-MAINTAINER= jihbed.research%gmail.com@localhost
-HOMEPAGE= http://code.google.com/p/spade2/
-COMMENT= SPADE is an agent platform based on the XMPP/Jabber technology
-LICENSE= gnu-lgpl-v2.1
-
-DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
-DEPENDS+= ${PYPKGPREFIX}-gmpy>=1.01:../../math/py-gmpy
-DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
-DEPENDS+= ${PYPKGPREFIX}-crypto>=2.0:../../security/py-crypto
-DEPENDS+= ${PYPKGPREFIX}-m2crypto>=0.13:../../security/py-m2crypto
-DEPENDS+= ${PYPKGPREFIX}-event>=0.3:../../wip/py-event
-DEPENDS+= jython>=2.5.1:../../wip/jython
-
-WRKSRC= ${WRKDIR}/spade
-
-PYTHON_VERSIONS_ACCEPTED= 27 # py-m2crypto
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= pre-configure
-SUBST_SED.paths+= -e 's,tlslite/scripts/tlsdb.py,tlsdb${PYVERSSUFFIX},g'
-SUBST_SED.paths+= -e 's,tlslite/scripts/tls.py,tls${PYVERSSUFFIX},g'
-SUBST_SED.paths+= -e 's,/usr/share/doc/spade,${PREFIX}/share/doc/spade,g'
-SUBST_FILES.paths+= setup.py
-SUBST_MESSAGE.paths= Fixing header search paths.
-
-REPLACE_PYTHON+= tls${PYVERSSUFFIX} tlsdb${PYVERSSUFFIX}
-
-post-extract:
- ${CP} ${FILESDIR}/tls.py ${WRKSRC}/tls${PYVERSSUFFIX}
- ${CP} ${FILESDIR}/tlsdb.py ${WRKSRC}/tlsdb${PYVERSSUFFIX}
-
-TEST_ENV+= PYTHONPATH=${WRKSRC}/examples/unittests
-do-test:
- ${RUN} cd ${WRKSRC}/examples/unittests; \
- ${SETENV} ${TEST_ENV} ${PYTHONBIN} unittests.py
-
-.include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/spade/PLIST b/spade/PLIST
deleted file mode 100644
index dadd7867df..0000000000
--- a/spade/PLIST
+++ /dev/null
@@ -1,402 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2010/07/14 00:38:02 jihbed Exp $
-bin/configure.py
-bin/runspade.py
-bin/tls2.6
-bin/tlsdb2.6
-${PYSITELIB}/spade/ACLMessage.py
-${PYSITELIB}/spade/ACLMessage.pyc
-${PYSITELIB}/spade/ACLMessage.pyo
-${PYSITELIB}/spade/ACLParser.py
-${PYSITELIB}/spade/ACLParser.pyc
-${PYSITELIB}/spade/ACLParser.pyo
-${PYSITELIB}/spade/AID.py
-${PYSITELIB}/spade/AID.pyc
-${PYSITELIB}/spade/AID.pyo
-${PYSITELIB}/spade/AMS.py
-${PYSITELIB}/spade/AMS.pyc
-${PYSITELIB}/spade/AMS.pyo
-${PYSITELIB}/spade/Agent.py
-${PYSITELIB}/spade/Agent.pyc
-${PYSITELIB}/spade/Agent.pyo
-${PYSITELIB}/spade/BasicFipaDateTime.py
-${PYSITELIB}/spade/BasicFipaDateTime.pyc
-${PYSITELIB}/spade/BasicFipaDateTime.pyo
-${PYSITELIB}/spade/Behaviour.py
-${PYSITELIB}/spade/Behaviour.pyc
-${PYSITELIB}/spade/Behaviour.pyo
-${PYSITELIB}/spade/DF.py
-${PYSITELIB}/spade/DF.pyc
-${PYSITELIB}/spade/DF.pyo
-${PYSITELIB}/spade/Envelope.py
-${PYSITELIB}/spade/Envelope.pyc
-${PYSITELIB}/spade/Envelope.pyo
-${PYSITELIB}/spade/FIPAMessage.py
-${PYSITELIB}/spade/FIPAMessage.pyc
-${PYSITELIB}/spade/FIPAMessage.pyo
-${PYSITELIB}/spade/MTP.py
-${PYSITELIB}/spade/MTP.pyc
-${PYSITELIB}/spade/MTP.pyo
-${PYSITELIB}/spade/MessageReceiver.py
-${PYSITELIB}/spade/MessageReceiver.pyc
-${PYSITELIB}/spade/MessageReceiver.pyo
-${PYSITELIB}/spade/Organization.py
-${PYSITELIB}/spade/Organization.pyc
-${PYSITELIB}/spade/Organization.pyo
-${PYSITELIB}/spade/Organization_new.py
-${PYSITELIB}/spade/Organization_new.pyc
-${PYSITELIB}/spade/Organization_new.pyo
-${PYSITELIB}/spade/Platform.py
-${PYSITELIB}/spade/Platform.pyc
-${PYSITELIB}/spade/Platform.pyo
-${PYSITELIB}/spade/RDF0Parser.py
-${PYSITELIB}/spade/RDF0Parser.pyc
-${PYSITELIB}/spade/RDF0Parser.pyo
-${PYSITELIB}/spade/ReceivedObject.py
-${PYSITELIB}/spade/ReceivedObject.pyc
-${PYSITELIB}/spade/ReceivedObject.pyo
-${PYSITELIB}/spade/SIMBA.py
-${PYSITELIB}/spade/SIMBA.pyc
-${PYSITELIB}/spade/SIMBA.pyo
-${PYSITELIB}/spade/SL0Parser.py
-${PYSITELIB}/spade/SL0Parser.pyc
-${PYSITELIB}/spade/SL0Parser.pyo
-${PYSITELIB}/spade/SpadeConfigParser.py
-${PYSITELIB}/spade/SpadeConfigParser.pyc
-${PYSITELIB}/spade/SpadeConfigParser.pyo
-${PYSITELIB}/spade/Unit.py
-${PYSITELIB}/spade/Unit.pyc
-${PYSITELIB}/spade/Unit.pyo
-${PYSITELIB}/spade/Unit_new.py
-${PYSITELIB}/spade/Unit_new.pyc
-${PYSITELIB}/spade/Unit_new.pyo
-${PYSITELIB}/spade/XMLCodec.py
-${PYSITELIB}/spade/XMLCodec.pyc
-${PYSITELIB}/spade/XMLCodec.pyo
-${PYSITELIB}/spade/__init__.py
-${PYSITELIB}/spade/__init__.pyc
-${PYSITELIB}/spade/__init__.pyo
-${PYSITELIB}/spade/bdi.py
-${PYSITELIB}/spade/bdi.pyc
-${PYSITELIB}/spade/bdi.pyo
-${PYSITELIB}/spade/colors.py
-${PYSITELIB}/spade/colors.pyc
-${PYSITELIB}/spade/colors.pyo
-${PYSITELIB}/spade/content.py
-${PYSITELIB}/spade/content.pyc
-${PYSITELIB}/spade/content.pyo
-${PYSITELIB}/spade/fipa.py
-${PYSITELIB}/spade/fipa.pyc
-${PYSITELIB}/spade/fipa.pyo
-${PYSITELIB}/spade/logic.py
-${PYSITELIB}/spade/logic.pyc
-${PYSITELIB}/spade/logic.pyo
-${PYSITELIB}/spade/msgtypes.py
-${PYSITELIB}/spade/msgtypes.pyc
-${PYSITELIB}/spade/msgtypes.pyo
-${PYSITELIB}/spade/mtp/http.py
-${PYSITELIB}/spade/mtp/http.pyc
-${PYSITELIB}/spade/mtp/http.pyo
-${PYSITELIB}/spade/mtp/simba.py
-${PYSITELIB}/spade/mtp/simba.pyc
-${PYSITELIB}/spade/mtp/simba.pyo
-${PYSITELIB}/spade/peer2peer.py
-${PYSITELIB}/spade/peer2peer.pyc
-${PYSITELIB}/spade/peer2peer.pyo
-${PYSITELIB}/spade/pyparsing.py
-${PYSITELIB}/spade/pyparsing.pyc
-${PYSITELIB}/spade/pyparsing.pyo
-${PYSITELIB}/spade/pyratemp.py
-${PYSITELIB}/spade/pyratemp.pyc
-${PYSITELIB}/spade/pyratemp.pyo
-${PYSITELIB}/spade/socialnetwork.py
-${PYSITELIB}/spade/socialnetwork.pyc
-${PYSITELIB}/spade/socialnetwork.pyo
-${PYSITELIB}/spade/spade_backend.py
-${PYSITELIB}/spade/spade_backend.pyc
-${PYSITELIB}/spade/spade_backend.pyo
-${PYSITELIB}/spade/wui.py
-${PYSITELIB}/spade/wui.pyc
-${PYSITELIB}/spade/wui.pyo
-${PYSITELIB}/tlslite/BaseDB.py
-${PYSITELIB}/tlslite/BaseDB.pyc
-${PYSITELIB}/tlslite/BaseDB.pyo
-${PYSITELIB}/tlslite/Checker.py
-${PYSITELIB}/tlslite/Checker.pyc
-${PYSITELIB}/tlslite/Checker.pyo
-${PYSITELIB}/tlslite/FileObject.py
-${PYSITELIB}/tlslite/FileObject.pyc
-${PYSITELIB}/tlslite/FileObject.pyo
-${PYSITELIB}/tlslite/HandshakeSettings.py
-${PYSITELIB}/tlslite/HandshakeSettings.pyc
-${PYSITELIB}/tlslite/HandshakeSettings.pyo
-${PYSITELIB}/tlslite/Session.py
-${PYSITELIB}/tlslite/Session.pyc
-${PYSITELIB}/tlslite/Session.pyo
-${PYSITELIB}/tlslite/SessionCache.py
-${PYSITELIB}/tlslite/SessionCache.pyc
-${PYSITELIB}/tlslite/SessionCache.pyo
-${PYSITELIB}/tlslite/SharedKeyDB.py
-${PYSITELIB}/tlslite/SharedKeyDB.pyc
-${PYSITELIB}/tlslite/SharedKeyDB.pyo
-${PYSITELIB}/tlslite/TLSConnection.py
-${PYSITELIB}/tlslite/TLSConnection.pyc
-${PYSITELIB}/tlslite/TLSConnection.pyo
-${PYSITELIB}/tlslite/TLSRecordLayer.py
-${PYSITELIB}/tlslite/TLSRecordLayer.pyc
-${PYSITELIB}/tlslite/TLSRecordLayer.pyo
-${PYSITELIB}/tlslite/VerifierDB.py
-${PYSITELIB}/tlslite/VerifierDB.pyc
-${PYSITELIB}/tlslite/VerifierDB.pyo
-${PYSITELIB}/tlslite/X509.py
-${PYSITELIB}/tlslite/X509.pyc
-${PYSITELIB}/tlslite/X509.pyo
-${PYSITELIB}/tlslite/X509CertChain.py
-${PYSITELIB}/tlslite/X509CertChain.pyc
-${PYSITELIB}/tlslite/X509CertChain.pyo
-${PYSITELIB}/tlslite/__init__.py
-${PYSITELIB}/tlslite/__init__.pyc
-${PYSITELIB}/tlslite/__init__.pyo
-${PYSITELIB}/tlslite/api.py
-${PYSITELIB}/tlslite/api.pyc
-${PYSITELIB}/tlslite/api.pyo
-${PYSITELIB}/tlslite/constants.py
-${PYSITELIB}/tlslite/constants.pyc
-${PYSITELIB}/tlslite/constants.pyo
-${PYSITELIB}/tlslite/errors.py
-${PYSITELIB}/tlslite/errors.pyc
-${PYSITELIB}/tlslite/errors.pyo
-${PYSITELIB}/tlslite/integration/AsyncStateMachine.py
-${PYSITELIB}/tlslite/integration/AsyncStateMachine.pyc
-${PYSITELIB}/tlslite/integration/AsyncStateMachine.pyo
-${PYSITELIB}/tlslite/integration/ClientHelper.py
-${PYSITELIB}/tlslite/integration/ClientHelper.pyc
-${PYSITELIB}/tlslite/integration/ClientHelper.pyo
-${PYSITELIB}/tlslite/integration/HTTPTLSConnection.py
-${PYSITELIB}/tlslite/integration/HTTPTLSConnection.pyc
-${PYSITELIB}/tlslite/integration/HTTPTLSConnection.pyo
-${PYSITELIB}/tlslite/integration/IMAP4_TLS.py
-${PYSITELIB}/tlslite/integration/IMAP4_TLS.pyc
-${PYSITELIB}/tlslite/integration/IMAP4_TLS.pyo
-${PYSITELIB}/tlslite/integration/IntegrationHelper.py
-${PYSITELIB}/tlslite/integration/IntegrationHelper.pyc
-${PYSITELIB}/tlslite/integration/IntegrationHelper.pyo
-${PYSITELIB}/tlslite/integration/POP3_TLS.py
-${PYSITELIB}/tlslite/integration/POP3_TLS.pyc
-${PYSITELIB}/tlslite/integration/POP3_TLS.pyo
-${PYSITELIB}/tlslite/integration/SMTP_TLS.py
-${PYSITELIB}/tlslite/integration/SMTP_TLS.pyc
-${PYSITELIB}/tlslite/integration/SMTP_TLS.pyo
-${PYSITELIB}/tlslite/integration/TLSAsyncDispatcherMixIn.py
-${PYSITELIB}/tlslite/integration/TLSAsyncDispatcherMixIn.pyc
-${PYSITELIB}/tlslite/integration/TLSAsyncDispatcherMixIn.pyo
-${PYSITELIB}/tlslite/integration/TLSSocketServerMixIn.py
-${PYSITELIB}/tlslite/integration/TLSSocketServerMixIn.pyc
-${PYSITELIB}/tlslite/integration/TLSSocketServerMixIn.pyo
-${PYSITELIB}/tlslite/integration/TLSTwistedProtocolWrapper.py
-${PYSITELIB}/tlslite/integration/TLSTwistedProtocolWrapper.pyc
-${PYSITELIB}/tlslite/integration/TLSTwistedProtocolWrapper.pyo
-${PYSITELIB}/tlslite/integration/XMLRPCTransport.py
-${PYSITELIB}/tlslite/integration/XMLRPCTransport.pyc
-${PYSITELIB}/tlslite/integration/XMLRPCTransport.pyo
-${PYSITELIB}/tlslite/integration/__init__.py
-${PYSITELIB}/tlslite/integration/__init__.pyc
-${PYSITELIB}/tlslite/integration/__init__.pyo
-${PYSITELIB}/tlslite/mathtls.py
-${PYSITELIB}/tlslite/mathtls.pyc
-${PYSITELIB}/tlslite/mathtls.pyo
-${PYSITELIB}/tlslite/messages.py
-${PYSITELIB}/tlslite/messages.pyc
-${PYSITELIB}/tlslite/messages.pyo
-${PYSITELIB}/tlslite/utils/AES.py
-${PYSITELIB}/tlslite/utils/AES.pyc
-${PYSITELIB}/tlslite/utils/AES.pyo
-${PYSITELIB}/tlslite/utils/ASN1Parser.py
-${PYSITELIB}/tlslite/utils/ASN1Parser.pyc
-${PYSITELIB}/tlslite/utils/ASN1Parser.pyo
-${PYSITELIB}/tlslite/utils/Cryptlib_AES.py
-${PYSITELIB}/tlslite/utils/Cryptlib_AES.pyc
-${PYSITELIB}/tlslite/utils/Cryptlib_AES.pyo
-${PYSITELIB}/tlslite/utils/Cryptlib_RC4.py
-${PYSITELIB}/tlslite/utils/Cryptlib_RC4.pyc
-${PYSITELIB}/tlslite/utils/Cryptlib_RC4.pyo
-${PYSITELIB}/tlslite/utils/Cryptlib_TripleDES.py
-${PYSITELIB}/tlslite/utils/Cryptlib_TripleDES.pyc
-${PYSITELIB}/tlslite/utils/Cryptlib_TripleDES.pyo
-${PYSITELIB}/tlslite/utils/OpenSSL_AES.py
-${PYSITELIB}/tlslite/utils/OpenSSL_AES.pyc
-${PYSITELIB}/tlslite/utils/OpenSSL_AES.pyo
-${PYSITELIB}/tlslite/utils/OpenSSL_RC4.py
-${PYSITELIB}/tlslite/utils/OpenSSL_RC4.pyc
-${PYSITELIB}/tlslite/utils/OpenSSL_RC4.pyo
-${PYSITELIB}/tlslite/utils/OpenSSL_RSAKey.py
-${PYSITELIB}/tlslite/utils/OpenSSL_RSAKey.pyc
-${PYSITELIB}/tlslite/utils/OpenSSL_RSAKey.pyo
-${PYSITELIB}/tlslite/utils/OpenSSL_TripleDES.py
-${PYSITELIB}/tlslite/utils/OpenSSL_TripleDES.pyc
-${PYSITELIB}/tlslite/utils/OpenSSL_TripleDES.pyo
-${PYSITELIB}/tlslite/utils/PyCrypto_AES.py
-${PYSITELIB}/tlslite/utils/PyCrypto_AES.pyc
-${PYSITELIB}/tlslite/utils/PyCrypto_AES.pyo
-${PYSITELIB}/tlslite/utils/PyCrypto_RC4.py
-${PYSITELIB}/tlslite/utils/PyCrypto_RC4.pyc
-${PYSITELIB}/tlslite/utils/PyCrypto_RC4.pyo
-${PYSITELIB}/tlslite/utils/PyCrypto_RSAKey.py
-${PYSITELIB}/tlslite/utils/PyCrypto_RSAKey.pyc
-${PYSITELIB}/tlslite/utils/PyCrypto_RSAKey.pyo
-${PYSITELIB}/tlslite/utils/PyCrypto_TripleDES.py
-${PYSITELIB}/tlslite/utils/PyCrypto_TripleDES.pyc
-${PYSITELIB}/tlslite/utils/PyCrypto_TripleDES.pyo
-${PYSITELIB}/tlslite/utils/Python_AES.py
-${PYSITELIB}/tlslite/utils/Python_AES.pyc
-${PYSITELIB}/tlslite/utils/Python_AES.pyo
-${PYSITELIB}/tlslite/utils/Python_RC4.py
-${PYSITELIB}/tlslite/utils/Python_RC4.pyc
-${PYSITELIB}/tlslite/utils/Python_RC4.pyo
-${PYSITELIB}/tlslite/utils/Python_RSAKey.py
-${PYSITELIB}/tlslite/utils/Python_RSAKey.pyc
-${PYSITELIB}/tlslite/utils/Python_RSAKey.pyo
-${PYSITELIB}/tlslite/utils/RC4.py
-${PYSITELIB}/tlslite/utils/RC4.pyc
-${PYSITELIB}/tlslite/utils/RC4.pyo
-${PYSITELIB}/tlslite/utils/RSAKey.py
-${PYSITELIB}/tlslite/utils/RSAKey.pyc
-${PYSITELIB}/tlslite/utils/RSAKey.pyo
-${PYSITELIB}/tlslite/utils/TripleDES.py
-${PYSITELIB}/tlslite/utils/TripleDES.pyc
-${PYSITELIB}/tlslite/utils/TripleDES.pyo
-${PYSITELIB}/tlslite/utils/__init__.py
-${PYSITELIB}/tlslite/utils/__init__.pyc
-${PYSITELIB}/tlslite/utils/__init__.pyo
-${PYSITELIB}/tlslite/utils/cipherfactory.py
-${PYSITELIB}/tlslite/utils/cipherfactory.pyc
-${PYSITELIB}/tlslite/utils/cipherfactory.pyo
-${PYSITELIB}/tlslite/utils/codec.py
-${PYSITELIB}/tlslite/utils/codec.pyc
-${PYSITELIB}/tlslite/utils/codec.pyo
-${PYSITELIB}/tlslite/utils/compat.py
-${PYSITELIB}/tlslite/utils/compat.pyc
-${PYSITELIB}/tlslite/utils/compat.pyo
-${PYSITELIB}/tlslite/utils/cryptomath.py
-${PYSITELIB}/tlslite/utils/cryptomath.pyc
-${PYSITELIB}/tlslite/utils/cryptomath.pyo
-${PYSITELIB}/tlslite/utils/dateFuncs.py
-${PYSITELIB}/tlslite/utils/dateFuncs.pyc
-${PYSITELIB}/tlslite/utils/dateFuncs.pyo
-${PYSITELIB}/tlslite/utils/hmac.py
-${PYSITELIB}/tlslite/utils/hmac.pyc
-${PYSITELIB}/tlslite/utils/hmac.pyo
-${PYSITELIB}/tlslite/utils/jython_compat.py
-${PYSITELIB}/tlslite/utils/jython_compat.pyc
-${PYSITELIB}/tlslite/utils/jython_compat.pyo
-${PYSITELIB}/tlslite/utils/keyfactory.py
-${PYSITELIB}/tlslite/utils/keyfactory.pyc
-${PYSITELIB}/tlslite/utils/keyfactory.pyo
-${PYSITELIB}/tlslite/utils/rijndael.py
-${PYSITELIB}/tlslite/utils/rijndael.pyc
-${PYSITELIB}/tlslite/utils/rijndael.pyo
-${PYSITELIB}/tlslite/utils/xmltools.py
-${PYSITELIB}/tlslite/utils/xmltools.pyc
-${PYSITELIB}/tlslite/utils/xmltools.pyo
-${PYSITELIB}/xmpp/__init__.py
-${PYSITELIB}/xmpp/__init__.pyc
-${PYSITELIB}/xmpp/__init__.pyo
-${PYSITELIB}/xmpp/auth.py
-${PYSITELIB}/xmpp/auth.pyc
-${PYSITELIB}/xmpp/auth.pyo
-${PYSITELIB}/xmpp/browser.py
-${PYSITELIB}/xmpp/browser.pyc
-${PYSITELIB}/xmpp/browser.pyo
-${PYSITELIB}/xmpp/client.py
-${PYSITELIB}/xmpp/client.pyc
-${PYSITELIB}/xmpp/client.pyo
-${PYSITELIB}/xmpp/commands.py
-${PYSITELIB}/xmpp/commands.pyc
-${PYSITELIB}/xmpp/commands.pyo
-${PYSITELIB}/xmpp/debug.py
-${PYSITELIB}/xmpp/debug.pyc
-${PYSITELIB}/xmpp/debug.pyo
-${PYSITELIB}/xmpp/dispatcher.py
-${PYSITELIB}/xmpp/dispatcher.pyc
-${PYSITELIB}/xmpp/dispatcher.pyo
-${PYSITELIB}/xmpp/features.py
-${PYSITELIB}/xmpp/features.pyc
-${PYSITELIB}/xmpp/features.pyo
-${PYSITELIB}/xmpp/filetransfer.py
-${PYSITELIB}/xmpp/filetransfer.pyc
-${PYSITELIB}/xmpp/filetransfer.pyo
-${PYSITELIB}/xmpp/protocol.py
-${PYSITELIB}/xmpp/protocol.pyc
-${PYSITELIB}/xmpp/protocol.pyo
-${PYSITELIB}/xmpp/roster.py
-${PYSITELIB}/xmpp/roster.pyc
-${PYSITELIB}/xmpp/roster.pyo
-${PYSITELIB}/xmpp/session.py
-${PYSITELIB}/xmpp/session.pyc
-${PYSITELIB}/xmpp/session.pyo
-${PYSITELIB}/xmpp/simplexml.py
-${PYSITELIB}/xmpp/simplexml.pyc
-${PYSITELIB}/xmpp/simplexml.pyo
-${PYSITELIB}/xmpp/transports.py
-${PYSITELIB}/xmpp/transports.pyc
-${PYSITELIB}/xmpp/transports.pyo
-${PYSITELIB}/xmppd/__init__.py
-${PYSITELIB}/xmppd/__init__.pyc
-${PYSITELIB}/xmppd/__init__.pyo
-${PYSITELIB}/xmppd/generate-cert.py
-${PYSITELIB}/xmppd/generate-cert.pyc
-${PYSITELIB}/xmppd/generate-cert.pyo
-${PYSITELIB}/xmppd/locales.py
-${PYSITELIB}/xmppd/locales.pyc
-${PYSITELIB}/xmppd/locales.pyo
-${PYSITELIB}/xmppd/modules/__init__.py
-${PYSITELIB}/xmppd/modules/__init__.pyc
-${PYSITELIB}/xmppd/modules/__init__.pyo
-${PYSITELIB}/xmppd/modules/config.py
-${PYSITELIB}/xmppd/modules/config.pyc
-${PYSITELIB}/xmppd/modules/config.pyo
-${PYSITELIB}/xmppd/modules/db_fake.py
-${PYSITELIB}/xmppd/modules/db_fake.pyc
-${PYSITELIB}/xmppd/modules/db_fake.pyo
-${PYSITELIB}/xmppd/modules/dialback.py
-${PYSITELIB}/xmppd/modules/dialback.pyc
-${PYSITELIB}/xmppd/modules/dialback.pyo
-${PYSITELIB}/xmppd/modules/jep0077.py
-${PYSITELIB}/xmppd/modules/jep0077.pyc
-${PYSITELIB}/xmppd/modules/jep0077.pyo
-${PYSITELIB}/xmppd/modules/jep0078.py
-${PYSITELIB}/xmppd/modules/jep0078.pyc
-${PYSITELIB}/xmppd/modules/jep0078.pyo
-${PYSITELIB}/xmppd/modules/message.py
-${PYSITELIB}/xmppd/modules/message.pyc
-${PYSITELIB}/xmppd/modules/message.pyo
-${PYSITELIB}/xmppd/modules/muc.py
-${PYSITELIB}/xmppd/modules/muc.pyc
-${PYSITELIB}/xmppd/modules/muc.pyo
-${PYSITELIB}/xmppd/modules/oob.py
-${PYSITELIB}/xmppd/modules/oob.pyc
-${PYSITELIB}/xmppd/modules/oob.pyo
-${PYSITELIB}/xmppd/modules/roster.py
-${PYSITELIB}/xmppd/modules/roster.pyc
-${PYSITELIB}/xmppd/modules/roster.pyo
-${PYSITELIB}/xmppd/modules/router.py
-${PYSITELIB}/xmppd/modules/router.pyc
-${PYSITELIB}/xmppd/modules/router.pyo
-${PYSITELIB}/xmppd/modules/stream.py
-${PYSITELIB}/xmppd/modules/stream.pyc
-${PYSITELIB}/xmppd/modules/stream.pyo
-${PYSITELIB}/xmppd/modules/webadmin.py
-${PYSITELIB}/xmppd/modules/webadmin.pyc
-${PYSITELIB}/xmppd/modules/webadmin.pyo
-${PYSITELIB}/xmppd/modules/wq.py
-${PYSITELIB}/xmppd/modules/wq.pyc
-${PYSITELIB}/xmppd/modules/wq.pyo
-${PYSITELIB}/xmppd/socker/router.py
-${PYSITELIB}/xmppd/socker/router.pyc
-${PYSITELIB}/xmppd/socker/router.pyo
-${PYSITELIB}/xmppd/socker/socker.py
-${PYSITELIB}/xmppd/socker/socker.pyc
-${PYSITELIB}/xmppd/socker/socker.pyo
-${PYSITELIB}/xmppd/xmppd.py
-${PYSITELIB}/xmppd/xmppd.pyc
-${PYSITELIB}/xmppd/xmppd.pyo
-share/doc/spade/api.tar.gz
diff --git a/spade/distinfo b/spade/distinfo
deleted file mode 100644
index 660cc65fe3..0000000000
--- a/spade/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.11 2012/08/26 12:50:07 noud4 Exp $
-
-RMD160 (spade-2.0rc4.tar.gz) = 8347ccb8d559e9a018548b82b3de06ee80a36504
-Size (spade-2.0rc4.tar.gz) = 551115 bytes
-SHA1 (patch-aa) = 4bebaeeb5b33614d6fe1f017daa07d8924b56836
-SHA1 (patch-ab) = 3806bb6d8da7e15c3d9e69efb7cbc8514d7465ef
-SHA1 (patch-ac) = c7a4ed9a83f7cdb97669feffcb77dffb4d2dd94c
-SHA1 (patch-ad) = 95e6063b4ee83cda1b4effe3cde7ffa7e3e5bcd4
-SHA1 (patch-ae) = 5f3ec59828b6fd6c264d6502ac386435773b5ab6
diff --git a/spade/files/tls.py b/spade/files/tls.py
deleted file mode 100644
index 6559a4d7f6..0000000000
--- a/spade/files/tls.py
+++ /dev/null
@@ -1,1045 +0,0 @@
-#!/usr/pkg/bin/env python
-
-import sys
-import os
-import os.path
-import socket
-import thread
-import time
-import httplib
-import BaseHTTPServer
-import SimpleHTTPServer
-
-
-try:
- from cryptoIDlib.api import *
- cryptoIDlibLoaded = True
-except:
- cryptoIDlibLoaded = False
-
-if __name__ != "__main__":
- raise "This must be run as a command, not used as a module!"
-
-#import tlslite
-#from tlslite.constants import AlertDescription, Fault
-
-#from tlslite.utils.jython_compat import formatExceptionTrace
-#from tlslite.X509 import X509, X509CertChain
-
-from tlslite.api import *
-
-def parsePrivateKey(s):
- try:
- return parsePEMKey(s, private=True)
- except Exception, e:
- print e
- return parseXMLKey(s, private=True)
-
-
-def clientTest(address, dir):
-
- #Split address into hostname/port tuple
- address = address.split(":")
- if len(address)==1:
- address.append("4443")
- address = ( address[0], int(address[1]) )
-
- def connect():
- sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- if hasattr(sock, 'settimeout'): #It's a python 2.3 feature
- sock.settimeout(5)
- sock.connect(address)
- c = TLSConnection(sock)
- return c
-
- test = 0
-
- badFault = False
-
- print "Test 1 - good shared key"
- connection = connect()
- connection.handshakeClientSharedKey("shared", "key")
- connection.close()
- connection.sock.close()
-
- print "Test 2 - shared key faults"
- for fault in Fault.clientSharedKeyFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeClientSharedKey("shared", "key")
- print " Good Fault %s" % (Fault.faultNames[fault])
- except TLSFaultError, e:
- print " BAD FAULT %s: %s" % (Fault.faultNames[fault], str(e))
- badFault = True
- connection.sock.close()
-
- print "Test 3 - good SRP"
- connection = connect()
- connection.handshakeClientSRP("test", "password")
- connection.close()
-
- print "Test 4 - SRP faults"
- for fault in Fault.clientSrpFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeClientSRP("test", "password")
- print " Good Fault %s" % (Fault.faultNames[fault])
- except TLSFaultError, e:
- print " BAD FAULT %s: %s" % (Fault.faultNames[fault], str(e))
- badFault = True
- connection.sock.close()
-
- print "Test 5 - good SRP: unknown_srp_username idiom"
- def srpCallback():
- return ("test", "password")
- connection = connect()
- connection.handshakeClientUnknown(srpCallback=srpCallback)
- connection.close()
- connection.sock.close()
-
- print "Test 6 - good SRP: with X.509 certificate"
- connection = connect()
- connection.handshakeClientSRP("test", "password")
- assert(isinstance(connection.session.serverCertChain, X509CertChain))
- connection.close()
- connection.sock.close()
-
- print "Test 7 - X.509 with SRP faults"
- for fault in Fault.clientSrpFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeClientSRP("test", "password")
- print " Good Fault %s" % (Fault.faultNames[fault])
- except TLSFaultError, e:
- print " BAD FAULT %s: %s" % (Fault.faultNames[fault], str(e))
- badFault = True
- connection.sock.close()
-
- if cryptoIDlibLoaded:
- print "Test 8 - good SRP: with cryptoID certificate chain"
- connection = connect()
- connection.handshakeClientSRP("test", "password")
- assert(isinstance(connection.session.serverCertChain, CertChain))
- if not (connection.session.serverCertChain.validate()):
- print connection.session.serverCertChain.validate(listProblems=True)
-
- connection.close()
- connection.sock.close()
-
- print "Test 9 - CryptoID with SRP faults"
- for fault in Fault.clientSrpFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeClientSRP("test", "password")
- print " Good Fault %s" % (Fault.faultNames[fault])
- except TLSFaultError, e:
- print " BAD FAULT %s: %s" % (Fault.faultNames[fault], str(e))
- badFault = True
- connection.sock.close()
-
- print "Test 10 - good X509"
- connection = connect()
- connection.handshakeClientCert()
- assert(isinstance(connection.session.serverCertChain, X509CertChain))
- connection.close()
- connection.sock.close()
-
- print "Test 10.a - good X509, SSLv3"
- connection = connect()
- settings = HandshakeSettings()
- settings.minVersion = (3,0)
- settings.maxVersion = (3,0)
- connection.handshakeClientCert(settings=settings)
- assert(isinstance(connection.session.serverCertChain, X509CertChain))
- connection.close()
- connection.sock.close()
-
- print "Test 11 - X.509 faults"
- for fault in Fault.clientNoAuthFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeClientCert()
- print " Good Fault %s" % (Fault.faultNames[fault])
- except TLSFaultError, e:
- print " BAD FAULT %s: %s" % (Fault.faultNames[fault], str(e))
- badFault = True
- connection.sock.close()
-
- if cryptoIDlibLoaded:
- print "Test 12 - good cryptoID"
- connection = connect()
- connection.handshakeClientCert()
- assert(isinstance(connection.session.serverCertChain, CertChain))
- assert(connection.session.serverCertChain.validate())
- connection.close()
- connection.sock.close()
-
- print "Test 13 - cryptoID faults"
- for fault in Fault.clientNoAuthFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeClientCert()
- print " Good Fault %s" % (Fault.faultNames[fault])
- except TLSFaultError, e:
- print " BAD FAULT %s: %s" % (Fault.faultNames[fault], str(e))
- badFault = True
- connection.sock.close()
-
- print "Test 14 - good mutual X509"
- x509Cert = X509().parse(open(os.path.join(dir, "clientX509Cert.pem")).read())
- x509Chain = X509CertChain([x509Cert])
- s = open(os.path.join(dir, "clientX509Key.pem")).read()
- x509Key = parsePEMKey(s, private=True)
-
- connection = connect()
- connection.handshakeClientCert(x509Chain, x509Key)
- assert(isinstance(connection.session.serverCertChain, X509CertChain))
- connection.close()
- connection.sock.close()
-
- print "Test 14.a - good mutual X509, SSLv3"
- connection = connect()
- settings = HandshakeSettings()
- settings.minVersion = (3,0)
- settings.maxVersion = (3,0)
- connection.handshakeClientCert(x509Chain, x509Key, settings=settings)
- assert(isinstance(connection.session.serverCertChain, X509CertChain))
- connection.close()
- connection.sock.close()
-
- print "Test 15 - mutual X.509 faults"
- for fault in Fault.clientCertFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeClientCert(x509Chain, x509Key)
- print " Good Fault %s" % (Fault.faultNames[fault])
- except TLSFaultError, e:
- print " BAD FAULT %s: %s" % (Fault.faultNames[fault], str(e))
- badFault = True
- connection.sock.close()
-
- if cryptoIDlibLoaded:
- print "Test 16 - good mutual cryptoID"
- cryptoIDChain = CertChain().parse(open(os.path.join(dir, "serverCryptoIDChain.xml"), "r").read())
- cryptoIDKey = parseXMLKey(open(os.path.join(dir, "serverCryptoIDKey.xml"), "r").read(), private=True)
-
- connection = connect()
- connection.handshakeClientCert(cryptoIDChain, cryptoIDKey)
- assert(isinstance(connection.session.serverCertChain, CertChain))
- assert(connection.session.serverCertChain.validate())
- connection.close()
- connection.sock.close()
-
- print "Test 17 - mutual cryptoID faults"
- for fault in Fault.clientCertFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeClientCert(cryptoIDChain, cryptoIDKey)
- print " Good Fault %s" % (Fault.faultNames[fault])
- except TLSFaultError, e:
- print " BAD FAULT %s: %s" % (Fault.faultNames[fault], str(e))
- badFault = True
- connection.sock.close()
-
- print "Test 18 - good SRP, prepare to resume..."
- connection = connect()
- connection.handshakeClientSRP("test", "password")
- connection.close()
- connection.sock.close()
- session = connection.session
-
- print "Test 19 - resumption"
- connection = connect()
- connection.handshakeClientSRP("test", "garbage", session=session)
- #Don't close! -- see below
-
- print "Test 20 - invalidated resumption"
- connection.sock.close() #Close the socket without a close_notify!
- connection = connect()
- try:
- connection.handshakeClientSRP("test", "garbage", session=session)
- assert()
- except TLSRemoteAlert, alert:
- if alert.description != AlertDescription.bad_record_mac:
- raise
- connection.sock.close()
-
- print "Test 21 - HTTPS test X.509"
- time.sleep(2)
- htmlBody = open(os.path.join(dir, "index.html")).read()
- fingerprint = None
- address = address[0], address[1]+1
- for y in range(2):
- h = HTTPTLSConnection(\
- address[0], address[1], x509Fingerprint=fingerprint)
- for x in range(3):
- h.request("GET", "/index.html")
- r = h.getresponse()
- assert(r.status == 200)
- s = r.read()
- assert(s == htmlBody)
- fingerprint = h.tlsSession.serverCertChain.getFingerprint()
- assert(fingerprint)
- time.sleep(2)
-
- if cryptoIDlibLoaded:
- print "Test 21a - HTTPS test SRP+cryptoID"
- time.sleep(2) #Time to generate key and cryptoID
- htmlBody = open(os.path.join(dir, "index.html")).read()
- fingerprint = None
- protocol = None
- address = address[0], address[1]+1
- for y in range(2):
- h = HTTPTLSConnection(\
- address[0], address[1],
- username="test", password="password",
- cryptoID=fingerprint, protocol=protocol)
- for x in range(3):
- h.request("GET", "/index.html")
- r = h.getresponse()
- assert(r.status == 200)
- s = r.read()
- assert(s == htmlBody)
- fingerprint = h.tlsSession.serverCertChain.cryptoID
- assert(fingerprint)
- protocol = "urn:whatever"
- time.sleep(2)
-
- address = address[0], address[1]+1
-
- implementations = []
- if cryptlibpyLoaded:
- implementations.append("cryptlib")
- if m2cryptoLoaded:
- implementations.append("openssl")
- if pycryptoLoaded:
- implementations.append("pycrypto")
- implementations.append("python")
-
- print "Test 22 - different ciphers"
- for implementation in implementations:
- for cipher in ["aes128", "aes256", "rc4"]:
-
- print "Test 22:",
- connection = connect()
-
- settings = HandshakeSettings()
- settings.cipherNames = [cipher]
- settings.cipherImplementations = [implementation, "python"]
- connection.handshakeClientSharedKey("shared", "key", settings=settings)
- print ("%s %s" % (connection.getCipherName(), connection.getCipherImplementation()))
-
- connection.write("hello")
- h = connection.read(min=5, max=5)
- assert(h == "hello")
- connection.close()
- connection.sock.close()
-
- print "Test 23 - throughput test"
- for implementation in implementations:
- for cipher in ["aes128", "aes256", "3des", "rc4"]:
- if cipher == "3des" and implementation not in ("openssl", "cryptlib", "pycrypto"):
- continue
-
- print "Test 23:",
- connection = connect()
-
- settings = HandshakeSettings()
- settings.cipherNames = [cipher]
- settings.cipherImplementations = [implementation, "python"]
- connection.handshakeClientSharedKey("shared", "key", settings=settings)
- print ("%s %s:" % (connection.getCipherName(), connection.getCipherImplementation())),
-
- startTime = time.clock()
- connection.write("hello"*10000)
- h = connection.read(min=50000, max=50000)
- stopTime = time.clock()
- print "100K exchanged at rate of %d bytes/sec" % int(100000/(stopTime-startTime))
-
- assert(h == "hello"*10000)
- connection.close()
- connection.sock.close()
-
- if not badFault:
- print "Test succeeded"
- else:
- print "Test failed"
-
-
-
-
-
-def serverTest(address, dir):
- #Split address into hostname/port tuple
- address = address.split(":")
- if len(address)==1:
- address.append("4443")
- address = ( address[0], int(address[1]) )
-
- #Connect to server
- lsock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- lsock.bind(address)
- lsock.listen(5)
-
- def connect():
- return TLSConnection(lsock.accept()[0])
-
- print "Test 1 - good shared key"
- sharedKeyDB = SharedKeyDB()
- sharedKeyDB["shared"] = "key"
- sharedKeyDB["shared2"] = "key2"
- connection = connect()
- connection.handshakeServer(sharedKeyDB=sharedKeyDB)
- connection.close()
- connection.sock.close()
-
- print "Test 2 - shared key faults"
- for fault in Fault.clientSharedKeyFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeServer(sharedKeyDB=sharedKeyDB)
- assert()
- except:
- pass
- connection.sock.close()
-
- print "Test 3 - good SRP"
- #verifierDB = tlslite.VerifierDB(os.path.join(dir, "verifierDB"))
- #verifierDB.open()
- verifierDB = VerifierDB()
- verifierDB.create()
- entry = VerifierDB.makeVerifier("test", "password", 1536)
- verifierDB["test"] = entry
-
- connection = connect()
- connection.handshakeServer(verifierDB=verifierDB)
- connection.close()
- connection.sock.close()
-
- print "Test 4 - SRP faults"
- for fault in Fault.clientSrpFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeServer(verifierDB=verifierDB)
- assert()
- except:
- pass
- connection.sock.close()
-
- print "Test 5 - good SRP: unknown_srp_username idiom"
- connection = connect()
- connection.handshakeServer(verifierDB=verifierDB)
- connection.close()
- connection.sock.close()
-
- print "Test 6 - good SRP: with X.509 cert"
- x509Cert = X509().parse(open(os.path.join(dir, "serverX509Cert.pem")).read())
- x509Chain = X509CertChain([x509Cert])
- s = open(os.path.join(dir, "serverX509Key.pem")).read()
- x509Key = parsePEMKey(s, private=True)
-
- connection = connect()
- connection.handshakeServer(verifierDB=verifierDB, \
- certChain=x509Chain, privateKey=x509Key)
- connection.close()
- connection.sock.close()
-
- print "Test 7 - X.509 with SRP faults"
- for fault in Fault.clientSrpFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeServer(verifierDB=verifierDB, \
- certChain=x509Chain, privateKey=x509Key)
- assert()
- except:
- pass
- connection.sock.close()
-
- if cryptoIDlibLoaded:
- print "Test 8 - good SRP: with cryptoID certs"
- cryptoIDChain = CertChain().parse(open(os.path.join(dir, "serverCryptoIDChain.xml"), "r").read())
- cryptoIDKey = parseXMLKey(open(os.path.join(dir, "serverCryptoIDKey.xml"), "r").read(), private=True)
- connection = connect()
- connection.handshakeServer(verifierDB=verifierDB, \
- certChain=cryptoIDChain, privateKey=cryptoIDKey)
- connection.close()
- connection.sock.close()
-
- print "Test 9 - cryptoID with SRP faults"
- for fault in Fault.clientSrpFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeServer(verifierDB=verifierDB, \
- certChain=cryptoIDChain, privateKey=cryptoIDKey)
- assert()
- except:
- pass
- connection.sock.close()
-
- print "Test 10 - good X.509"
- connection = connect()
- connection.handshakeServer(certChain=x509Chain, privateKey=x509Key)
- connection.close()
- connection.sock.close()
-
- print "Test 10.a - good X.509, SSL v3"
- connection = connect()
- settings = HandshakeSettings()
- settings.minVersion = (3,0)
- settings.maxVersion = (3,0)
- connection.handshakeServer(certChain=x509Chain, privateKey=x509Key, settings=settings)
- connection.close()
- connection.sock.close()
-
- print "Test 11 - X.509 faults"
- for fault in Fault.clientNoAuthFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeServer(certChain=x509Chain, privateKey=x509Key)
- assert()
- except:
- pass
- connection.sock.close()
-
- if cryptoIDlibLoaded:
- print "Test 12 - good cryptoID"
- connection = connect()
- connection.handshakeServer(certChain=cryptoIDChain, privateKey=cryptoIDKey)
- connection.close()
- connection.sock.close()
-
- print "Test 13 - cryptoID faults"
- for fault in Fault.clientNoAuthFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeServer(certChain=cryptoIDChain, privateKey=cryptoIDKey)
- assert()
- except:
- pass
- connection.sock.close()
-
- print "Test 14 - good mutual X.509"
- connection = connect()
- connection.handshakeServer(certChain=x509Chain, privateKey=x509Key, reqCert=True)
- assert(isinstance(connection.session.serverCertChain, X509CertChain))
- connection.close()
- connection.sock.close()
-
- print "Test 14a - good mutual X.509, SSLv3"
- connection = connect()
- settings = HandshakeSettings()
- settings.minVersion = (3,0)
- settings.maxVersion = (3,0)
- connection.handshakeServer(certChain=x509Chain, privateKey=x509Key, reqCert=True, settings=settings)
- assert(isinstance(connection.session.serverCertChain, X509CertChain))
- connection.close()
- connection.sock.close()
-
- print "Test 15 - mutual X.509 faults"
- for fault in Fault.clientCertFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeServer(certChain=x509Chain, privateKey=x509Key, reqCert=True)
- assert()
- except:
- pass
- connection.sock.close()
-
- if cryptoIDlibLoaded:
- print "Test 16 - good mutual cryptoID"
- connection = connect()
- connection.handshakeServer(certChain=cryptoIDChain, privateKey=cryptoIDKey, reqCert=True)
- assert(isinstance(connection.session.serverCertChain, CertChain))
- assert(connection.session.serverCertChain.validate())
- connection.close()
- connection.sock.close()
-
- print "Test 17 - mutual cryptoID faults"
- for fault in Fault.clientCertFaults + Fault.genericFaults:
- connection = connect()
- connection.fault = fault
- try:
- connection.handshakeServer(certChain=cryptoIDChain, privateKey=cryptoIDKey, reqCert=True)
- assert()
- except:
- pass
- connection.sock.close()
-
- print "Test 18 - good SRP, prepare to resume"
- sessionCache = SessionCache()
- connection = connect()
- connection.handshakeServer(verifierDB=verifierDB, sessionCache=sessionCache)
- connection.close()
- connection.sock.close()
-
- print "Test 19 - resumption"
- connection = connect()
- connection.handshakeServer(verifierDB=verifierDB, sessionCache=sessionCache)
- #Don't close! -- see next test
-
- print "Test 20 - invalidated resumption"
- try:
- connection.read(min=1, max=1)
- assert() #Client is going to close the socket without a close_notify
- except TLSAbruptCloseError, e:
- pass
- connection = connect()
- try:
- connection.handshakeServer(verifierDB=verifierDB, sessionCache=sessionCache)
- except TLSLocalAlert, alert:
- if alert.description != AlertDescription.bad_record_mac:
- raise
- connection.sock.close()
-
- print "Test 21 - HTTPS test X.509"
-
- #Close the current listening socket
- lsock.close()
-
- #Create and run an HTTP Server using TLSSocketServerMixIn
- class MyHTTPServer(TLSSocketServerMixIn,
- BaseHTTPServer.HTTPServer):
- def handshake(self, tlsConnection):
- tlsConnection.handshakeServer(certChain=x509Chain, privateKey=x509Key)
- return True
- cd = os.getcwd()
- os.chdir(dir)
- address = address[0], address[1]+1
- httpd = MyHTTPServer(address, SimpleHTTPServer.SimpleHTTPRequestHandler)
- for x in range(6):
- httpd.handle_request()
- httpd.server_close()
- cd = os.chdir(cd)
-
- if cryptoIDlibLoaded:
- print "Test 21a - HTTPS test SRP+cryptoID"
-
- #Create and run an HTTP Server using TLSSocketServerMixIn
- class MyHTTPServer(TLSSocketServerMixIn,
- BaseHTTPServer.HTTPServer):
- def handshake(self, tlsConnection):
- tlsConnection.handshakeServer(certChain=cryptoIDChain, privateKey=cryptoIDKey,
- verifierDB=verifierDB)
- return True
- cd = os.getcwd()
- os.chdir(dir)
- address = address[0], address[1]+1
- httpd = MyHTTPServer(address, SimpleHTTPServer.SimpleHTTPRequestHandler)
- for x in range(6):
- httpd.handle_request()
- httpd.server_close()
- cd = os.chdir(cd)
-
- #Re-connect the listening socket
- lsock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- address = address[0], address[1]+1
- lsock.bind(address)
- lsock.listen(5)
-
- def connect():
- return TLSConnection(lsock.accept()[0])
-
- implementations = []
- if cryptlibpyLoaded:
- implementations.append("cryptlib")
- if m2cryptoLoaded:
- implementations.append("openssl")
- if pycryptoLoaded:
- implementations.append("pycrypto")
- implementations.append("python")
-
- print "Test 22 - different ciphers"
- for implementation in ["python"] * len(implementations):
- for cipher in ["aes128", "aes256", "rc4"]:
-
- print "Test 22:",
- connection = connect()
-
- settings = HandshakeSettings()
- settings.cipherNames = [cipher]
- settings.cipherImplementations = [implementation, "python"]
-
- connection.handshakeServer(sharedKeyDB=sharedKeyDB, settings=settings)
- print connection.getCipherName(), connection.getCipherImplementation()
- h = connection.read(min=5, max=5)
- assert(h == "hello")
- connection.write(h)
- connection.close()
- connection.sock.close()
-
- print "Test 23 - throughput test"
- for implementation in implementations:
- for cipher in ["aes128", "aes256", "3des", "rc4"]:
- if cipher == "3des" and implementation not in ("openssl", "cryptlib", "pycrypto"):
- continue
-
- print "Test 23:",
- connection = connect()
-
- settings = HandshakeSettings()
- settings.cipherNames = [cipher]
- settings.cipherImplementations = [implementation, "python"]
-
- connection.handshakeServer(sharedKeyDB=sharedKeyDB, settings=settings)
- print connection.getCipherName(), connection.getCipherImplementation()
- h = connection.read(min=50000, max=50000)
- assert(h == "hello"*10000)
- connection.write(h)
- connection.close()
- connection.sock.close()
-
- print "Test succeeded"
-
-
-
-
-
-
-
-
-
-
-
-
-if len(sys.argv) == 1 or (len(sys.argv)==2 and sys.argv[1].lower().endswith("help")):
- print ""
- print "Version: 0.3.5"
- print ""
- print "RNG: %s" % prngName
- print ""
- print "Modules:"
- if cryptlibpyLoaded:
- print " cryptlib_py : Loaded"
- else:
- print " cryptlib_py : Not Loaded"
- if m2cryptoLoaded:
- print " M2Crypto : Loaded"
- else:
- print " M2Crypto : Not Loaded"
- if pycryptoLoaded:
- print " pycrypto : Loaded"
- else:
- print " pycrypto : Not Loaded"
- if gmpyLoaded:
- print " GMPY : Loaded"
- else:
- print " GMPY : Not Loaded"
- if cryptoIDlibLoaded:
- print " cryptoIDlib : Loaded"
- else:
- print " cryptoIDlib : Not Loaded"
- print ""
- print "Commands:"
- print ""
- print " clientcert <server> [<chain> <key>]"
- print " clientsharedkey <server> <user> <pass>"
- print " clientsrp <server> <user> <pass>"
- print " clienttest <server> <dir>"
- print ""
- print " serversrp <server> <verifierDB>"
- print " servercert <server> <chain> <key> [req]"
- print " serversrpcert <server> <verifierDB> <chain> <key>"
- print " serversharedkey <server> <sharedkeyDB>"
- print " servertest <server> <dir>"
- sys.exit()
-
-cmd = sys.argv[1].lower()
-
-class Args:
- def __init__(self, argv):
- self.argv = argv
- def get(self, index):
- if len(self.argv)<=index:
- raise SyntaxError("Not enough arguments")
- return self.argv[index]
- def getLast(self, index):
- if len(self.argv)>index+1:
- raise SyntaxError("Too many arguments")
- return self.get(index)
-
-args = Args(sys.argv)
-
-def reformatDocString(s):
- lines = s.splitlines()
- newLines = []
- for line in lines:
- newLines.append(" " + line.strip())
- return "\n".join(newLines)
-
-try:
- if cmd == "clienttest":
- address = args.get(2)
- dir = args.getLast(3)
- clientTest(address, dir)
- sys.exit()
-
- elif cmd.startswith("client"):
- address = args.get(2)
-
- #Split address into hostname/port tuple
- address = address.split(":")
- if len(address)==1:
- address.append("4443")
- address = ( address[0], int(address[1]) )
-
- def connect():
- #Connect to server
- sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- if hasattr(sock, "settimeout"):
- sock.settimeout(5)
- sock.connect(address)
-
- #Instantiate TLSConnections
- return TLSConnection(sock)
-
- try:
- if cmd == "clientsrp":
- username = args.get(3)
- password = args.getLast(4)
- connection = connect()
- start = time.clock()
- connection.handshakeClientSRP(username, password)
- elif cmd == "clientsharedkey":
- username = args.get(3)
- password = args.getLast(4)
- connection = connect()
- start = time.clock()
- connection.handshakeClientSharedKey(username, password)
- elif cmd == "clientcert":
- certChain = None
- privateKey = None
- if len(sys.argv) > 3:
- certFilename = args.get(3)
- keyFilename = args.getLast(4)
-
- s1 = open(certFilename, "rb").read()
- s2 = open(keyFilename, "rb").read()
-
- #Try to create cryptoID cert chain
- if cryptoIDlibLoaded:
- try:
- certChain = CertChain().parse(s1)
- privateKey = parsePrivateKey(s2)
- except:
- certChain = None
- privateKey = None
-
- #Try to create X.509 cert chain
- if not certChain:
- x509 = X509()
- x509.parse(s1)
- certChain = X509CertChain([x509])
- privateKey = parsePrivateKey(s2)
-
- connection = connect()
- start = time.clock()
- connection.handshakeClientCert(certChain, privateKey)
- else:
- raise SyntaxError("Unknown command")
-
- except TLSLocalAlert, a:
- if a.description == AlertDescription.bad_record_mac:
- if cmd == "clientsharedkey":
- print "Bad sharedkey password"
- else:
- raise
- elif a.description == AlertDescription.user_canceled:
- print str(a)
- else:
- raise
- sys.exit()
- except TLSRemoteAlert, a:
- if a.description == AlertDescription.unknown_srp_username:
- if cmd == "clientsrp":
- print "Unknown username"
- else:
- raise
- elif a.description == AlertDescription.bad_record_mac:
- if cmd == "clientsrp":
- print "Bad username or password"
- else:
- raise
- elif a.description == AlertDescription.handshake_failure:
- print "Unable to negotiate mutually acceptable parameters"
- else:
- raise
- sys.exit()
-
- stop = time.clock()
- print "Handshake success"
- print " Handshake time: %.4f seconds" % (stop - start)
- print " Version: %s.%s" % connection.version
- print " Cipher: %s %s" % (connection.getCipherName(), connection.getCipherImplementation())
- if connection.session.srpUsername:
- print " Client SRP username: %s" % connection.session.srpUsername
- if connection.session.sharedKeyUsername:
- print " Client shared key username: %s" % connection.session.sharedKeyUsername
- if connection.session.clientCertChain:
- print " Client fingerprint: %s" % connection.session.clientCertChain.getFingerprint()
- if connection.session.serverCertChain:
- print " Server fingerprint: %s" % connection.session.serverCertChain.getFingerprint()
- connection.close()
- connection.sock.close()
-
- elif cmd.startswith("server"):
- address = args.get(2)
-
- #Split address into hostname/port tuple
- address = address.split(":")
- if len(address)==1:
- address.append("4443")
- address = ( address[0], int(address[1]) )
-
- verifierDBFilename = None
- sharedKeyDBFilename = None
- certFilename = None
- keyFilename = None
- sharedKeyDB = None
- reqCert = False
-
- if cmd == "serversrp":
- verifierDBFilename = args.getLast(3)
- elif cmd == "servercert":
- certFilename = args.get(3)
- keyFilename = args.get(4)
- if len(sys.argv)>=6:
- req = args.getLast(5)
- if req.lower() != "req":
- raise SyntaxError()
- reqCert = True
- elif cmd == "serversrpcert":
- verifierDBFilename = args.get(3)
- certFilename = args.get(4)
- keyFilename = args.getLast(5)
- elif cmd == "serversharedkey":
- sharedKeyDBFilename = args.getLast(3)
- elif cmd == "servertest":
- address = args.get(2)
- dir = args.getLast(3)
- serverTest(address, dir)
- sys.exit()
-
- verifierDB = None
- if verifierDBFilename:
- verifierDB = VerifierDB(verifierDBFilename)
- verifierDB.open()
-
- sharedKeyDB = None
- if sharedKeyDBFilename:
- sharedKeyDB = SharedKeyDB(sharedKeyDBFilename)
- sharedKeyDB.open()
-
- certChain = None
- privateKey = None
- if certFilename:
- s1 = open(certFilename, "rb").read()
- s2 = open(keyFilename, "rb").read()
-
- #Try to create cryptoID cert chain
- if cryptoIDlibLoaded:
- try:
- certChain = CertChain().parse(s1)
- privateKey = parsePrivateKey(s2)
- except:
- certChain = None
- privateKey = None
-
- #Try to create X.509 cert chain
- if not certChain:
- x509 = X509()
- x509.parse(s1)
- certChain = X509CertChain([x509])
- privateKey = parsePrivateKey(s2)
-
-
-
- #Create handler function - performs handshake, then echos all bytes received
- def handler(sock):
- try:
- connection = TLSConnection(sock)
- settings = HandshakeSettings()
- connection.handshakeServer(sharedKeyDB=sharedKeyDB, verifierDB=verifierDB, \
- certChain=certChain, privateKey=privateKey, \
- reqCert=reqCert, settings=settings)
- print "Handshake success"
- print " Version: %s.%s" % connection.version
- print " Cipher: %s %s" % (connection.getCipherName(), connection.getCipherImplementation())
- if connection.session.srpUsername:
- print " Client SRP username: %s" % connection.session.srpUsername
- if connection.session.sharedKeyUsername:
- print " Client shared key username: %s" % connection.session.sharedKeyUsername
- if connection.session.clientCertChain:
- print " Client fingerprint: %s" % connection.session.clientCertChain.getFingerprint()
- if connection.session.serverCertChain:
- print " Server fingerprint: %s" % connection.session.serverCertChain.getFingerprint()
-
- s = ""
- while 1:
- newS = connection.read()
- if not newS:
- break
- s += newS
- if s[-1]=='\n':
- connection.write(s)
- s = ""
- except TLSLocalAlert, a:
- if a.description == AlertDescription.unknown_srp_username:
- print "Unknown SRP username"
- elif a.description == AlertDescription.bad_record_mac:
- if cmd == "serversrp" or cmd == "serversrpcert":
- print "Bad SRP password for:", connection.allegedSrpUsername
- else:
- raise
- elif a.description == AlertDescription.handshake_failure:
- print "Unable to negotiate mutually acceptable parameters"
- else:
- raise
- except TLSRemoteAlert, a:
- if a.description == AlertDescription.bad_record_mac:
- if cmd == "serversharedkey":
- print "Bad sharedkey password for:", connection.allegedSharedKeyUsername
- else:
- raise
- elif a.description == AlertDescription.user_canceled:
- print "Handshake cancelled"
- elif a.description == AlertDescription.handshake_failure:
- print "Unable to negotiate mutually acceptable parameters"
- elif a.description == AlertDescription.close_notify:
- pass
- else:
- raise
-
- #Run multi-threaded server
- sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- sock.bind(address)
- sock.listen(5)
- while 1:
- (newsock, cliAddress) = sock.accept()
- thread.start_new_thread(handler, (newsock,))
-
-
- else:
- print "Bad command: '%s'" % cmd
-except TLSRemoteAlert, a:
- print str(a)
- raise
-
-
-
-
-
diff --git a/spade/files/tlsdb.py b/spade/files/tlsdb.py
deleted file mode 100644
index fc012f577a..0000000000
--- a/spade/files/tlsdb.py
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/usr/pkg/bin/env python
-
-import sys
-import os
-import socket
-import thread
-import math
-
-try:
- import cryptoIDlib
- cryptoIDlibLoaded = True
-except:
- cryptoIDlibLoaded = False
-
-
-if __name__ != "__main__":
- raise "This must be run as a command, not used as a module!"
-
-
-from tlslite.api import *
-
-if len(sys.argv) == 1 or (len(sys.argv)==2 and sys.argv[1].lower().endswith("help")):
- print ""
- print "Version: 0.3.5"
- print ""
- print "RNG: %s" % prngName
- print ""
- print "Modules:"
- if cryptlibpyLoaded:
- print " cryptlib_py : Loaded"
- else:
- print " cryptlib_py : Not Loaded"
- if m2cryptoLoaded:
- print " M2Crypto : Loaded"
- else:
- print " M2Crypto : Not Loaded"
- if pycryptoLoaded:
- print " pycrypto : Loaded"
- else:
- print " pycrypto : Not Loaded"
- if gmpyLoaded:
- print " GMPY : Loaded"
- else:
- print " GMPY : Not Loaded"
- if cryptoIDlibLoaded:
- print " cryptoIDlib : Loaded"
- else:
- print " cryptoIDlib : Not Loaded"
- print ""
- print "Commands:"
- print ""
- print " createsrp <db>"
- print " createsharedkey <db>"
- print ""
- print " add <db> <user> <pass> [<bits>]"
- print " del <db> <user>"
- print " check <db> <user> [<pass>]"
- print " list <db>"
- sys.exit()
-
-cmd = sys.argv[1].lower()
-
-class Args:
- def __init__(self, argv):
- self.argv = argv
- def get(self, index):
- if len(self.argv)<=index:
- raise SyntaxError("Not enough arguments")
- return self.argv[index]
- def getLast(self, index):
- if len(self.argv)>index+1:
- raise SyntaxError("Too many arguments")
- return self.get(index)
-
-args = Args(sys.argv)
-
-def reformatDocString(s):
- lines = s.splitlines()
- newLines = []
- for line in lines:
- newLines.append(" " + line.strip())
- return "\n".join(newLines)
-
-try:
- if cmd == "help":
- command = args.getLast(2).lower()
- if command == "valid":
- print ""
- else:
- print "Bad command: '%s'" % command
-
- elif cmd == "createsrp":
- dbName = args.get(2)
-
- db = VerifierDB(dbName)
- db.create()
-
- elif cmd == "createsharedkey":
- dbName = args.getLast(2)
-
- db = SharedKeyDB(dbName)
- db.create()
-
- elif cmd == "add":
- dbName = args.get(2)
- username = args.get(3)
- password = args.get(4)
-
- try:
- db = VerifierDB(dbName)
- db.open()
- if username in db:
- print "User already in database!"
- sys.exit()
- bits = int(args.getLast(5))
- N, g, salt, verifier = VerifierDB.makeVerifier(username, password, bits)
- db[username] = N, g, salt, verifier
- except ValueError:
- db = SharedKeyDB(dbName)
- db.open()
- if username in db:
- print "User already in database!"
- sys.exit()
- args.getLast(4)
- db[username] = password
-
- elif cmd == "del":
- dbName = args.get(2)
- username = args.getLast(3)
-
- try:
- db = VerifierDB(dbName)
- db.open()
- except ValueError:
- db = SharedKeyDB(dbName)
- db.open()
-
- del(db[username])
-
- elif cmd == "check":
- dbName = args.get(2)
- username = args.get(3)
- if len(sys.argv)>=5:
- password = args.getLast(4)
- else:
- password = None
-
- try:
- db = VerifierDB(dbName)
- db.open()
- except ValueError:
- db = SharedKeyDB(dbName)
- db.open()
-
- try:
- db[username]
- print "Username exists"
-
- if password:
- if db.check(username, password):
- print "Password is correct"
- else:
- print "Password is wrong"
- except KeyError:
- print "Username does not exist"
- sys.exit()
-
- elif cmd == "list":
- dbName = args.get(2)
-
- try:
- db = VerifierDB(dbName)
- db.open()
- except ValueError:
- db = SharedKeyDB(dbName)
- db.open()
-
- if isinstance(db, VerifierDB):
- print "Verifier Database"
- def numBits(n):
- if n==0:
- return 0
- return int(math.floor(math.log(n, 2))+1)
- for username in db.keys():
- N, g, s, v = db[username]
- print numBits(N), username
- else:
- print "Shared Key Database"
- for username in db.keys():
- print username
- else:
- print "Bad command: '%s'" % cmd
-except:
- raise
diff --git a/spade/patches/patch-aa b/spade/patches/patch-aa
deleted file mode 100644
index 60196a706f..0000000000
--- a/spade/patches/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2010/07/14 00:38:03 jihbed Exp $
-
---- setup.py.orig 2008-12-10 18:04:26.000000000 +0000
-+++ setup.py 2010-07-14 01:07:04.000000000 +0000
-@@ -4,7 +4,7 @@
- from distutils.core import setup, Extension
- import glob
-
--from runspade import VERSION
-+from runspade import __version__
-
- #if os.name != "posix":
- # import py2exe
-@@ -27,23 +27,20 @@
- if os.name == "posix":
- #if sys.platform != "darwin":
- setup(name='SPADE',
-- version=VERSION,
-+ version=__version__,
- description='Smart Python multi-Agent Development Environment',
- author='Javier Palanca, Miguel Escriva, Gustavo Aranda, Natalia Criado',
- author_email='jpalanca%dsic.upv.es@localhost',
- url='http://spade.gti-ia.dsic.upv.es',
- package_dir={'spade': 'spade'},
- #packages=['spade', 'xmpp', 'xmppd', 'xmppd.modules', 'xmppd.locale', 'xmppd.socker', 'tlslite', 'tlslite.utils', 'tlslite.integration'],
-- packages=['spade', 'xmpp', 'xmppd', 'xmppd.modules', 'xmppd.socker', 'tlslite', 'tlslite.utils', 'tlslite.integration'],
-- #scripts=['spade.sh','gspade.sh','gspade.py', 'runspade.py',"tlslite/scripts/tls.py", "tlslite/scripts/tlsdb.py"],
-- scripts=['runspade.py',"tlslite/scripts/tls.py", "tlslite/scripts/tlsdb.py"],
-+ packages=['spade', 'spade.mtp','xmpp', 'xmppd', 'xmppd.modules', 'xmppd.socker', 'tlslite', 'tlslite.utils', 'tlslite.integration'],
-+ #scripts=['spade.sh','gspade.sh','gspade.py', 'runspade.py',"tls2.6", "tlsdb2.6"],
-+ scripts=['runspade.py','configure.py',"tls2.6", "tlsdb2.6"],
- data_files=[
-- ('/etc/spade',['etc/spade.xml']),
-- ('/etc/spade',['etc/xmppd.xml']),
- #('/usr/share/spade',['usr/share/spade/rma.glade']),
- ('/usr/share/spade/mtp',glob.glob('usr/share/spade/mtp/*.py')),
-- ('/usr/share/doc/spade',['readme.txt']),
-- ('/usr/share/doc/spade/',['doc/api.tar.gz']),
-+ ('/usr/pkg/share/doc/spade/',['doc/api.tar.gz']),
- #('/usr/share/spade/jabberd',['usr/share/spade/jabberd/jabberd','usr/share/spade/jabberd/jabber.xml']),
- #('/usr/share/spade/jabberd/libs',glob.glob('usr/share/spade/jabberd/libs/*.so')),
- #('/usr/share/spade/jabberd/spool',['usr/share/spade/jabberd/spool/.spool'])
-@@ -63,8 +60,8 @@
- #packages=['spade', 'xmpp', 'xmppd', 'xmppd.filters', 'tlslite', 'tlslite.utils', 'tlslite.integration'],
- packages=['spade', 'xmpp', 'xmppd', 'xmppd.modules', 'xmppd.socker', 'tlslite', 'tlslite.utils', 'tlslite.integration'],
- #scripts=['spade-rma.py', 'runspade.py'],
-- scripts=['runspade.py',"tlslite/scripts/tls.py", "tlslite/scripts/tlsdb.py"],
-- #console=['gspade.py', 'runspade.py','configure.py',"tlslite/scripts/tls.py", "tlslite/scripts/tlsdb.py"],
-+ scripts=['runspade.py',"tls2.6", "tlsdb2.6"],
-+ #console=['gspade.py', 'runspade.py','configure.py',"tls2.6", "tlsdb2.6"],
- data_files=[
- ('etc',[]),
- #('usr/share/spade',['usr/share/spade/rma.glade']),
diff --git a/spade/patches/patch-ab b/spade/patches/patch-ab
deleted file mode 100644
index e04ddd5f79..0000000000
--- a/spade/patches/patch-ab
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2010/07/14 00:38:03 jihbed Exp $
-
---- configure.py.orig 2009-04-16 15:34:31.000000000 +0000
-+++ configure.py 2010-07-14 00:37:27.000000000 +0000
-@@ -2,11 +2,12 @@
-
- import sys
- import string
-+import platform
- import random
- import os
- import socket
-
--
-+numb = platform.python_version()[:3]
- globalhostname = ""
-
- def generateCode():
-@@ -22,7 +23,7 @@
- else:
- hostname = globalhostname
-
-- path = os.sep+"usr"+os.sep+"share"+os.sep+"spade"
-+ path = os.sep+"usr"+os.sep+"pkg"+os.sep+"share"+os.sep+"spade"
- else:
- # If no hostname was previously specified, get one from the system
- if globalhostname == "":
-@@ -73,7 +74,9 @@
-
- # Now fill the MTPs information
- mtp_str = "\n"
-- for file in os.listdir("spade/mtp"):
-+ pyvers= 'python'+str(numb)
-+ path = "/usr/pkg/lib/" + pyvers + "/site-packages/spade/mtp/"
-+ for file in os.listdir(path):
- try:
- # If its a python script
- if file[-3:] == ".py":
-@@ -87,9 +90,9 @@
- # Fill the data
- # GUS: By default, no MTPs, thank you
- #spadexml = spadexml.replace("#MTPS#", mtp_str)
-- spadexml = spadexml.replace("#MTPS#", "")
--
-- file = open("etc/spade.xml", "w+")
-+ spadexml = spadexml.replace("#MTPS#", "")
-+
-+ file = open("/usr/pkg/etc/spade/spade.xml", "w+")
- file.write(spadexml)
- file.close()
-
-@@ -132,8 +135,7 @@
- </components>
- </server>
- '''
--
-- file = open("etc/xmppd.xml", "w+")
-+ file = open("/usr/pkg/etc/spade/xmppd.xml", "w+")
- file.write(xmppdxml)
- file.close()
-
diff --git a/spade/patches/patch-ac b/spade/patches/patch-ac
deleted file mode 100644
index 3445559440..0000000000
--- a/spade/patches/patch-ac
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2010/07/12 20:17:39 jihbed Exp $
-
---- runspade.py.orig 2009-09-28 13:26:41.000000000 +0000
-+++ runspade.py 2010-07-12 21:13:10.000000000 +0000
-@@ -3,6 +3,7 @@
-
- import os #, signal
- import sys
-+import platform
- import traceback
- import time
- import thread
-@@ -29,6 +30,7 @@
- __copyright__ = "Copyright (C) 2009 Grupo de Tecnologia Informatica - Inteligencia Artificial (DSIC-UPV)"
- __license__ = "GPL"
-
-+numb = platform.python_version()[:3]
-
- def print_help():
- print
-@@ -36,8 +38,8 @@
- print " -h, --help display this help text and exit"
- print " -v, --version display the version and exit"
- print " -d, --debug enable the debug execution"
-- print " -c, --configfile load the configuration file (default /etc/spade/spade.xml)"
-- print " -j, --jabber load the jabber configuration file (default /usr/share/spade/jabberd/jabber.xml)"
-+ print " -c, --configfile load the configuration file (default /usr/pkg/etc/spade/spade.xml)"
-+ print " -j, --jabber load the jabber configuration file (default /usr/pkg/share/spade/jabberd/jabber.xml)"
- #print " -w, --web load the TurboGears(tm) web interface"
- raise SystemExit
-
-@@ -58,10 +60,14 @@
- #elif sys.argv[1] in ["--web", "-w"]: web = True
-
-
-- configfilename = "/etc/spade/spade.xml"
-- jabberxml = "/etc/spade/xmppd.xml"
-+ configfilename = "/usr/pkg/etc/spade/spade.xml"
-+ jabberxml = "/usr/pkg/etc/spade/xmppd.xml"
- dbg = []
-
-+ if sys.platform[:6] == 'netbsd':
-+ configfilename = os.sep + "usr" + os.sep + "pkg" + os.sep + configfilename
-+ jabberxml = os.sep+ "usr" + os.sep + "pkg" + os.sep + jabberxml
-+
- if os.name != "posix" or not os.path.exists(jabberxml) or not os.path.exists(configfilename):
- configfilename = "./etc" + os.sep + "spade.xml"
- configfilename = os.path.abspath(configfilename)
-@@ -94,7 +100,7 @@
-
- #print "Using config file " + str(configfilename)
- #print "Using jabber file " + str(jabberxml)
-- sys.stdout.write("Starting SPADE")
-+ sys.stdout.write(colors.color_green +"Starting SPADE"+"\x1b[00m\n")
- sys.stdout.flush()
-
- #parser = SpadeConfigParser.ConfigParser()
-@@ -105,7 +111,13 @@
-
- jabberxml = os.path.abspath(jabberxml)
- #s = xmppd.xmppd.Server(cfgfile=jabberxml, debug = dbg)
-- os.chdir("xmppd")
-+ if sys.platform[:6] == 'netbsd':
-+ pyvers= 'python'+str(numb)
-+ path = "/usr/pkg/lib/" + pyvers + "/site-packages/xmppd/"
-+ os.chdir(path)
-+ else:
-+ os.chdir("xmppd")
-+
- #s = xmppd.Server(cfgfile=jabberxml, cmd_options={'enable_debug':dbg, 'enable_psyco':True})
- #s = Server(cfgfile=jabberxml, cmd_options={'enable_debug':dbg, 'enable_psyco':True})
- s = Server(cfgfile=jabberxml, cmd_options={'enable_debug':dbg, 'enable_psyco':False})
diff --git a/spade/patches/patch-ad b/spade/patches/patch-ad
deleted file mode 100644
index 7fe5e03826..0000000000
--- a/spade/patches/patch-ad
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2010/07/13 13:13:55 jihbed Exp $
-
---- ./xmpp/auth.py.orig 2009-10-02 17:16:19.000000000 +0000
-+++ ./xmpp/auth.py 2010-07-13 14:00:30.000000000 +0000
-@@ -21,11 +21,11 @@
-
- from protocol import *
- from client import PlugIn
--import sha,base64,random,dispatcher
--import md5
-+import base64,random,dispatcher
-+import hashlib
-
--def HH(some): return md5.new(some).hexdigest()
--def H(some): return md5.new(some).digest()
-+def HH(some): return hashlib.md5(some).hexdigest()
-+def H(some): return hashlib.md5(some).digest()
- def C(some): return ':'.join(some)
-
- class NonSASL(PlugIn):
-@@ -54,15 +54,15 @@
-
- if query.getTag('digest'):
- self.DEBUG("Performing digest authentication",'ok')
-- query.setTagData('digest',sha.new(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest())
-+ query.setTagData('digest',hashlib.sha1(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest())
- if query.getTag('password'): query.delChild('password')
- method='digest'
- elif query.getTag('token'):
- token=query.getTagData('token')
- seq=query.getTagData('sequence')
- self.DEBUG("Performing zero-k authentication",'ok')
-- hash = sha.new(sha.new(self.password).hexdigest()+token).hexdigest()
-- for foo in xrange(int(seq)): hash = sha.new(hash).hexdigest()
-+ hash = hashlib.sha1(hashlib.sha1(self.password).hexdigest()+token).hexdigest()
-+ for foo in xrange(int(seq)): hash = hashlib.sha1(hash).hexdigest()
- query.setTagData('hash',hash)
- method='0k'
- else:
-@@ -81,7 +81,7 @@
- def authComponent(self,owner):
- """ Authenticate component. Send handshake stanza and wait for result. Returns "ok" on success. """
- self.handshake=0
-- owner.send(Node(NS_COMPONENT_ACCEPT+' handshake',payload=[sha.new(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()]))
-+ owner.send(Node(NS_COMPONENT_ACCEPT+' handshake',payload=[hashlib.sha1(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()]))
- owner.RegisterHandler('handshake',self.handshakeHandler,xmlns=NS_COMPONENT_ACCEPT)
- while not self.handshake:
- self.DEBUG("waiting on handshake",'notify')
diff --git a/spade/patches/patch-ae b/spade/patches/patch-ae
deleted file mode 100644
index 15c9008a06..0000000000
--- a/spade/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2010/07/14 15:31:30 jihbed Exp $
-
---- ./xmppd/xmppd.py.orig 2009-06-04 17:49:03.000000000 +0000
-+++ ./xmppd/xmppd.py 2010-07-14 16:22:58.000000000 +0000
-@@ -32,7 +32,7 @@
- from math import *
- import traceback
-
--import socket,select,random,os,sys,thread,errno,time,threading,sha
-+import socket,select,random,os,sys,thread,errno,time,threading,hashlib
- globals()['DEFAULT_LANG'] = 'en'
- #globals()['LANG_LIST'] = []
-
-@@ -887,7 +887,7 @@
- self.SESS_LOCK.release()
-
- class Server:
-- def __init__(self,cfgfile="./xmppd.xml",cmd_options={},under_restart=False):
-+ def __init__(self,cfgfile="/usr/pkg/etc/spade/xmppd.xml",cmd_options={},under_restart=False):
- # threading.Thread.__init__(self)
- self.defaultNamespace = NS_CLIENT
- #Load localizer as _l
-@@ -953,7 +953,7 @@
- if cmd_options.setdefault('socker_info',False): import xmlrpclib
-
- if not cmd_options.setdefault('password',None):
-- globals()['RPC_PASSWORD'] = sha.new(str(time.time())+globals()['SOCKER_TGUID']+sha.new(str(time.time())).hexdigest()).hexdigest()
-+ globals()['RPC_PASSWORD'] = hashlib.sha1(str(time.time())+globals()['SOCKER_TGUID']+hashlib.sha1(str(time.time())).hexdigest()).hexdigest()
- else:
- globals()['RPC_PASSWORD'] = cmd_options['password']
-
Home |
Main Index |
Thread Index |
Old Index