summaryrefslogtreecommitdiff
path: root/security/py-cybox
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2017-10-10 07:30:58 +0000
committeradam <adam@pkgsrc.org>2017-10-10 07:30:58 +0000
commitedf06c4978b982db00e4e9a0b52534a7cc789ea1 (patch)
tree92f61f53971064c599259994b2bdf466385dafb2 /security/py-cybox
parent865ca09def70adfac9624f5cd2979bc9ee82ebd4 (diff)
downloadpkgsrc-edf06c4978b982db00e4e9a0b52534a7cc789ea1.tar.gz
py-cybox: update to 2.1.0.14
Version 2.1.0.14: - Add support for Python 3.6. - Update to latest version of mixbox. - Add __hash__ to classes.
Diffstat (limited to 'security/py-cybox')
-rw-r--r--security/py-cybox/Makefile22
-rw-r--r--security/py-cybox/PLIST236
-rw-r--r--security/py-cybox/distinfo10
3 files changed, 247 insertions, 21 deletions
diff --git a/security/py-cybox/Makefile b/security/py-cybox/Makefile
index 704ccb691d5..cc1600def84 100644
--- a/security/py-cybox/Makefile
+++ b/security/py-cybox/Makefile
@@ -1,20 +1,24 @@
-# $NetBSD: Makefile,v 1.5 2017/01/01 14:43:55 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2017/10/10 07:30:58 adam Exp $
-CYBOX_VERSION= 2.1.0.4
-DISTNAME= python-cybox-${CYBOX_VERSION}
-PKGNAME= ${PYPKGPREFIX}-cybox-${CYBOX_VERSION}
-CATEGORIES= security
-DISTFILES= v${CYBOX_VERSION}${EXTRACT_SUFX}
-MASTER_SITES= https://github.com/CybOXProject/python-cybox/archive/
+DISTNAME= python-cybox-2.1.0.14
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^python-//}
+CATEGORIES= security python
+MASTER_SITES= ${MASTER_SITE_GITHUB:=CybOXProject/}
MAINTAINER= khorben@defora.org
HOMEPAGE= https://github.com/CybOXProject/python-cybox
COMMENT= Python library for manipulating CybOX content
LICENSE= modified-bsd
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36
+GITHUB_PROJECT= python-cybox
+GITHUB_TAG= v${PKGVERSION_NOREV}
-EGG_NAME= cybox-${CYBOX_VERSION}
+DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
+DEPENDS+= ${PYPKGPREFIX}-lxml>=2.2.3:../../textproc/py-lxml
+DEPENDS+= ${PYPKGPREFIX}-mixbox>=1.0.2:../../devel/py-mixbox
+
+USE_LANGUAGES= # none
+EGG_NAME= ${DISTNAME:S/^python-//}
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/py-cybox/PLIST b/security/py-cybox/PLIST
index d474db9cac0..0a5568e2b1d 100644
--- a/security/py-cybox/PLIST
+++ b/security/py-cybox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/17 15:59:10 khorben Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/10/10 07:30:58 adam Exp $
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -349,6 +349,9 @@ ${PYSITELIB}/cybox/common/tools.pyo
${PYSITELIB}/cybox/common/vocabs.py
${PYSITELIB}/cybox/common/vocabs.pyc
${PYSITELIB}/cybox/common/vocabs.pyo
+${PYSITELIB}/cybox/compat.py
+${PYSITELIB}/cybox/compat.pyc
+${PYSITELIB}/cybox/compat.pyo
${PYSITELIB}/cybox/core/__init__.py
${PYSITELIB}/cybox/core/__init__.pyc
${PYSITELIB}/cybox/core/__init__.pyo
@@ -373,6 +376,9 @@ ${PYSITELIB}/cybox/core/object.pyo
${PYSITELIB}/cybox/core/observable.py
${PYSITELIB}/cybox/core/observable.pyc
${PYSITELIB}/cybox/core/observable.pyo
+${PYSITELIB}/cybox/core/pattern_fidelity.py
+${PYSITELIB}/cybox/core/pattern_fidelity.pyc
+${PYSITELIB}/cybox/core/pattern_fidelity.pyo
${PYSITELIB}/cybox/helper.py
${PYSITELIB}/cybox/helper.pyc
${PYSITELIB}/cybox/helper.pyo
@@ -388,15 +394,36 @@ ${PYSITELIB}/cybox/objects/address_object.pyo
${PYSITELIB}/cybox/objects/api_object.py
${PYSITELIB}/cybox/objects/api_object.pyc
${PYSITELIB}/cybox/objects/api_object.pyo
+${PYSITELIB}/cybox/objects/archive_file_object.py
+${PYSITELIB}/cybox/objects/archive_file_object.pyc
+${PYSITELIB}/cybox/objects/archive_file_object.pyo
+${PYSITELIB}/cybox/objects/arp_cache_object.py
+${PYSITELIB}/cybox/objects/arp_cache_object.pyc
+${PYSITELIB}/cybox/objects/arp_cache_object.pyo
${PYSITELIB}/cybox/objects/artifact_object.py
${PYSITELIB}/cybox/objects/artifact_object.pyc
${PYSITELIB}/cybox/objects/artifact_object.pyo
+${PYSITELIB}/cybox/objects/as_object.py
+${PYSITELIB}/cybox/objects/as_object.pyc
+${PYSITELIB}/cybox/objects/as_object.pyo
+${PYSITELIB}/cybox/objects/code_object.py
+${PYSITELIB}/cybox/objects/code_object.pyc
+${PYSITELIB}/cybox/objects/code_object.pyo
+${PYSITELIB}/cybox/objects/custom_object.py
+${PYSITELIB}/cybox/objects/custom_object.pyc
+${PYSITELIB}/cybox/objects/custom_object.pyo
+${PYSITELIB}/cybox/objects/device_object.py
+${PYSITELIB}/cybox/objects/device_object.pyc
+${PYSITELIB}/cybox/objects/device_object.pyo
${PYSITELIB}/cybox/objects/disk_object.py
${PYSITELIB}/cybox/objects/disk_object.pyc
${PYSITELIB}/cybox/objects/disk_object.pyo
${PYSITELIB}/cybox/objects/disk_partition_object.py
${PYSITELIB}/cybox/objects/disk_partition_object.pyc
${PYSITELIB}/cybox/objects/disk_partition_object.pyo
+${PYSITELIB}/cybox/objects/dns_cache_object.py
+${PYSITELIB}/cybox/objects/dns_cache_object.pyc
+${PYSITELIB}/cybox/objects/dns_cache_object.pyo
${PYSITELIB}/cybox/objects/dns_query_object.py
${PYSITELIB}/cybox/objects/dns_query_object.pyc
${PYSITELIB}/cybox/objects/dns_query_object.pyo
@@ -427,12 +454,18 @@ ${PYSITELIB}/cybox/objects/hostname_object.pyo
${PYSITELIB}/cybox/objects/http_session_object.py
${PYSITELIB}/cybox/objects/http_session_object.pyc
${PYSITELIB}/cybox/objects/http_session_object.pyo
+${PYSITELIB}/cybox/objects/image_file_object.py
+${PYSITELIB}/cybox/objects/image_file_object.pyc
+${PYSITELIB}/cybox/objects/image_file_object.pyo
${PYSITELIB}/cybox/objects/library_object.py
${PYSITELIB}/cybox/objects/library_object.pyc
${PYSITELIB}/cybox/objects/library_object.pyo
${PYSITELIB}/cybox/objects/link_object.py
${PYSITELIB}/cybox/objects/link_object.pyc
${PYSITELIB}/cybox/objects/link_object.pyo
+${PYSITELIB}/cybox/objects/linux_package_object.py
+${PYSITELIB}/cybox/objects/linux_package_object.pyc
+${PYSITELIB}/cybox/objects/linux_package_object.pyo
${PYSITELIB}/cybox/objects/memory_object.py
${PYSITELIB}/cybox/objects/memory_object.pyc
${PYSITELIB}/cybox/objects/memory_object.pyo
@@ -445,9 +478,18 @@ ${PYSITELIB}/cybox/objects/network_connection_object.pyo
${PYSITELIB}/cybox/objects/network_packet_object.py
${PYSITELIB}/cybox/objects/network_packet_object.pyc
${PYSITELIB}/cybox/objects/network_packet_object.pyo
+${PYSITELIB}/cybox/objects/network_route_entry_object.py
+${PYSITELIB}/cybox/objects/network_route_entry_object.pyc
+${PYSITELIB}/cybox/objects/network_route_entry_object.pyo
+${PYSITELIB}/cybox/objects/network_route_object.py
+${PYSITELIB}/cybox/objects/network_route_object.pyc
+${PYSITELIB}/cybox/objects/network_route_object.pyo
${PYSITELIB}/cybox/objects/network_socket_object.py
${PYSITELIB}/cybox/objects/network_socket_object.pyc
${PYSITELIB}/cybox/objects/network_socket_object.pyo
+${PYSITELIB}/cybox/objects/network_subnet_object.py
+${PYSITELIB}/cybox/objects/network_subnet_object.pyc
+${PYSITELIB}/cybox/objects/network_subnet_object.pyo
${PYSITELIB}/cybox/objects/pdf_file_object.py
${PYSITELIB}/cybox/objects/pdf_file_object.pyc
${PYSITELIB}/cybox/objects/pdf_file_object.pyo
@@ -460,6 +502,15 @@ ${PYSITELIB}/cybox/objects/port_object.pyo
${PYSITELIB}/cybox/objects/process_object.py
${PYSITELIB}/cybox/objects/process_object.pyc
${PYSITELIB}/cybox/objects/process_object.pyo
+${PYSITELIB}/cybox/objects/product_object.py
+${PYSITELIB}/cybox/objects/product_object.pyc
+${PYSITELIB}/cybox/objects/product_object.pyo
+${PYSITELIB}/cybox/objects/semaphore_object.py
+${PYSITELIB}/cybox/objects/semaphore_object.pyc
+${PYSITELIB}/cybox/objects/semaphore_object.pyo
+${PYSITELIB}/cybox/objects/sms_message_object.py
+${PYSITELIB}/cybox/objects/sms_message_object.pyc
+${PYSITELIB}/cybox/objects/sms_message_object.pyo
${PYSITELIB}/cybox/objects/socket_address_object.py
${PYSITELIB}/cybox/objects/socket_address_object.pyc
${PYSITELIB}/cybox/objects/socket_address_object.pyo
@@ -478,6 +529,12 @@ ${PYSITELIB}/cybox/objects/volume_object.pyo
${PYSITELIB}/cybox/objects/whois_object.py
${PYSITELIB}/cybox/objects/whois_object.pyc
${PYSITELIB}/cybox/objects/whois_object.pyo
+${PYSITELIB}/cybox/objects/win_computer_account_object.py
+${PYSITELIB}/cybox/objects/win_computer_account_object.pyc
+${PYSITELIB}/cybox/objects/win_computer_account_object.pyo
+${PYSITELIB}/cybox/objects/win_critical_section_object.py
+${PYSITELIB}/cybox/objects/win_critical_section_object.pyc
+${PYSITELIB}/cybox/objects/win_critical_section_object.pyo
${PYSITELIB}/cybox/objects/win_driver_object.py
${PYSITELIB}/cybox/objects/win_driver_object.pyc
${PYSITELIB}/cybox/objects/win_driver_object.pyo
@@ -493,36 +550,60 @@ ${PYSITELIB}/cybox/objects/win_executable_file_object.pyo
${PYSITELIB}/cybox/objects/win_file_object.py
${PYSITELIB}/cybox/objects/win_file_object.pyc
${PYSITELIB}/cybox/objects/win_file_object.pyo
+${PYSITELIB}/cybox/objects/win_filemapping_object.py
+${PYSITELIB}/cybox/objects/win_filemapping_object.pyc
+${PYSITELIB}/cybox/objects/win_filemapping_object.pyo
${PYSITELIB}/cybox/objects/win_handle_object.py
${PYSITELIB}/cybox/objects/win_handle_object.pyc
${PYSITELIB}/cybox/objects/win_handle_object.pyo
+${PYSITELIB}/cybox/objects/win_hook_object.py
+${PYSITELIB}/cybox/objects/win_hook_object.pyc
+${PYSITELIB}/cybox/objects/win_hook_object.pyo
${PYSITELIB}/cybox/objects/win_kernel_hook_object.py
${PYSITELIB}/cybox/objects/win_kernel_hook_object.pyc
${PYSITELIB}/cybox/objects/win_kernel_hook_object.pyo
+${PYSITELIB}/cybox/objects/win_kernel_object.py
+${PYSITELIB}/cybox/objects/win_kernel_object.pyc
+${PYSITELIB}/cybox/objects/win_kernel_object.pyo
${PYSITELIB}/cybox/objects/win_mailslot_object.py
${PYSITELIB}/cybox/objects/win_mailslot_object.pyc
${PYSITELIB}/cybox/objects/win_mailslot_object.pyo
+${PYSITELIB}/cybox/objects/win_memory_page_region_object.py
+${PYSITELIB}/cybox/objects/win_memory_page_region_object.pyc
+${PYSITELIB}/cybox/objects/win_memory_page_region_object.pyo
${PYSITELIB}/cybox/objects/win_mutex_object.py
${PYSITELIB}/cybox/objects/win_mutex_object.pyc
${PYSITELIB}/cybox/objects/win_mutex_object.pyo
+${PYSITELIB}/cybox/objects/win_network_route_entry_object.py
+${PYSITELIB}/cybox/objects/win_network_route_entry_object.pyc
+${PYSITELIB}/cybox/objects/win_network_route_entry_object.pyo
${PYSITELIB}/cybox/objects/win_network_share_object.py
${PYSITELIB}/cybox/objects/win_network_share_object.pyc
${PYSITELIB}/cybox/objects/win_network_share_object.pyo
${PYSITELIB}/cybox/objects/win_pipe_object.py
${PYSITELIB}/cybox/objects/win_pipe_object.pyc
${PYSITELIB}/cybox/objects/win_pipe_object.pyo
+${PYSITELIB}/cybox/objects/win_prefetch_object.py
+${PYSITELIB}/cybox/objects/win_prefetch_object.pyc
+${PYSITELIB}/cybox/objects/win_prefetch_object.pyo
${PYSITELIB}/cybox/objects/win_process_object.py
${PYSITELIB}/cybox/objects/win_process_object.pyc
${PYSITELIB}/cybox/objects/win_process_object.pyo
${PYSITELIB}/cybox/objects/win_registry_key_object.py
${PYSITELIB}/cybox/objects/win_registry_key_object.pyc
${PYSITELIB}/cybox/objects/win_registry_key_object.pyo
+${PYSITELIB}/cybox/objects/win_semaphore_object.py
+${PYSITELIB}/cybox/objects/win_semaphore_object.pyc
+${PYSITELIB}/cybox/objects/win_semaphore_object.pyo
${PYSITELIB}/cybox/objects/win_service_object.py
${PYSITELIB}/cybox/objects/win_service_object.pyc
${PYSITELIB}/cybox/objects/win_service_object.pyo
${PYSITELIB}/cybox/objects/win_system_object.py
${PYSITELIB}/cybox/objects/win_system_object.pyc
${PYSITELIB}/cybox/objects/win_system_object.pyo
+${PYSITELIB}/cybox/objects/win_system_restore_object.py
+${PYSITELIB}/cybox/objects/win_system_restore_object.pyc
+${PYSITELIB}/cybox/objects/win_system_restore_object.pyo
${PYSITELIB}/cybox/objects/win_task_object.py
${PYSITELIB}/cybox/objects/win_task_object.pyc
${PYSITELIB}/cybox/objects/win_task_object.pyo
@@ -535,6 +616,9 @@ ${PYSITELIB}/cybox/objects/win_user_object.pyo
${PYSITELIB}/cybox/objects/win_volume_object.py
${PYSITELIB}/cybox/objects/win_volume_object.pyc
${PYSITELIB}/cybox/objects/win_volume_object.pyo
+${PYSITELIB}/cybox/objects/win_waitable_timer_object.py
+${PYSITELIB}/cybox/objects/win_waitable_timer_object.pyc
+${PYSITELIB}/cybox/objects/win_waitable_timer_object.pyo
${PYSITELIB}/cybox/objects/x509_certificate_object.py
${PYSITELIB}/cybox/objects/x509_certificate_object.pyc
${PYSITELIB}/cybox/objects/x509_certificate_object.pyo
@@ -577,9 +661,9 @@ ${PYSITELIB}/cybox/test/common/object_properties_test.pyo
${PYSITELIB}/cybox/test/common/properties_test.py
${PYSITELIB}/cybox/test/common/properties_test.pyc
${PYSITELIB}/cybox/test/common/properties_test.pyo
-${PYSITELIB}/cybox/test/common/structured_test_text.py
-${PYSITELIB}/cybox/test/common/structured_test_text.pyc
-${PYSITELIB}/cybox/test/common/structured_test_text.pyo
+${PYSITELIB}/cybox/test/common/structured_text_test.py
+${PYSITELIB}/cybox/test/common/structured_text_test.pyc
+${PYSITELIB}/cybox/test/common/structured_text_test.pyo
${PYSITELIB}/cybox/test/common/tools_test.py
${PYSITELIB}/cybox/test/common/tools_test.pyc
${PYSITELIB}/cybox/test/common/tools_test.pyo
@@ -592,6 +676,9 @@ ${PYSITELIB}/cybox/test/comparator_test.pyo
${PYSITELIB}/cybox/test/core/__init__.py
${PYSITELIB}/cybox/test/core/__init__.pyc
${PYSITELIB}/cybox/test/core/__init__.pyo
+${PYSITELIB}/cybox/test/core/action_reference_test.py
+${PYSITELIB}/cybox/test/core/action_reference_test.pyc
+${PYSITELIB}/cybox/test/core/action_reference_test.pyo
${PYSITELIB}/cybox/test/core/action_test.py
${PYSITELIB}/cybox/test/core/action_test.pyc
${PYSITELIB}/cybox/test/core/action_test.pyo
@@ -610,6 +697,18 @@ ${PYSITELIB}/cybox/test/core/observable_test.pyo
${PYSITELIB}/cybox/test/dev.py
${PYSITELIB}/cybox/test/dev.pyc
${PYSITELIB}/cybox/test/dev.pyo
+${PYSITELIB}/cybox/test/encoding_test.py
+${PYSITELIB}/cybox/test/encoding_test.pyc
+${PYSITELIB}/cybox/test/encoding_test.pyo
+${PYSITELIB}/cybox/test/extensions/__init__.py
+${PYSITELIB}/cybox/test/extensions/__init__.pyc
+${PYSITELIB}/cybox/test/extensions/__init__.pyo
+${PYSITELIB}/cybox/test/extensions/location/__init__.py
+${PYSITELIB}/cybox/test/extensions/location/__init__.pyc
+${PYSITELIB}/cybox/test/extensions/location/__init__.pyo
+${PYSITELIB}/cybox/test/extensions/location/ciq_test.py
+${PYSITELIB}/cybox/test/extensions/location/ciq_test.pyc
+${PYSITELIB}/cybox/test/extensions/location/ciq_test.pyo
${PYSITELIB}/cybox/test/objects/__init__.py
${PYSITELIB}/cybox/test/objects/__init__.pyc
${PYSITELIB}/cybox/test/objects/__init__.pyo
@@ -619,9 +718,39 @@ ${PYSITELIB}/cybox/test/objects/account_test.pyo
${PYSITELIB}/cybox/test/objects/address_test.py
${PYSITELIB}/cybox/test/objects/address_test.pyc
${PYSITELIB}/cybox/test/objects/address_test.pyo
+${PYSITELIB}/cybox/test/objects/api_test.py
+${PYSITELIB}/cybox/test/objects/api_test.pyc
+${PYSITELIB}/cybox/test/objects/api_test.pyo
+${PYSITELIB}/cybox/test/objects/archive_file_test.py
+${PYSITELIB}/cybox/test/objects/archive_file_test.pyc
+${PYSITELIB}/cybox/test/objects/archive_file_test.pyo
+${PYSITELIB}/cybox/test/objects/arp_cache_test.py
+${PYSITELIB}/cybox/test/objects/arp_cache_test.pyc
+${PYSITELIB}/cybox/test/objects/arp_cache_test.pyo
${PYSITELIB}/cybox/test/objects/artifact_test.py
${PYSITELIB}/cybox/test/objects/artifact_test.pyc
${PYSITELIB}/cybox/test/objects/artifact_test.pyo
+${PYSITELIB}/cybox/test/objects/as_test.py
+${PYSITELIB}/cybox/test/objects/as_test.pyc
+${PYSITELIB}/cybox/test/objects/as_test.pyo
+${PYSITELIB}/cybox/test/objects/code_test.py
+${PYSITELIB}/cybox/test/objects/code_test.pyc
+${PYSITELIB}/cybox/test/objects/code_test.pyo
+${PYSITELIB}/cybox/test/objects/custom_test.py
+${PYSITELIB}/cybox/test/objects/custom_test.pyc
+${PYSITELIB}/cybox/test/objects/custom_test.pyo
+${PYSITELIB}/cybox/test/objects/device_test.py
+${PYSITELIB}/cybox/test/objects/device_test.pyc
+${PYSITELIB}/cybox/test/objects/device_test.pyo
+${PYSITELIB}/cybox/test/objects/disk_partition_test.py
+${PYSITELIB}/cybox/test/objects/disk_partition_test.pyc
+${PYSITELIB}/cybox/test/objects/disk_partition_test.pyo
+${PYSITELIB}/cybox/test/objects/disk_test.py
+${PYSITELIB}/cybox/test/objects/disk_test.pyc
+${PYSITELIB}/cybox/test/objects/disk_test.pyo
+${PYSITELIB}/cybox/test/objects/dns_cache_test.py
+${PYSITELIB}/cybox/test/objects/dns_cache_test.pyc
+${PYSITELIB}/cybox/test/objects/dns_cache_test.pyo
${PYSITELIB}/cybox/test/objects/dns_query_test.py
${PYSITELIB}/cybox/test/objects/dns_query_test.pyc
${PYSITELIB}/cybox/test/objects/dns_query_test.pyo
@@ -640,6 +769,18 @@ ${PYSITELIB}/cybox/test/objects/hostname_test.pyo
${PYSITELIB}/cybox/test/objects/http_session_test.py
${PYSITELIB}/cybox/test/objects/http_session_test.pyc
${PYSITELIB}/cybox/test/objects/http_session_test.pyo
+${PYSITELIB}/cybox/test/objects/image_file_test.py
+${PYSITELIB}/cybox/test/objects/image_file_test.pyc
+${PYSITELIB}/cybox/test/objects/image_file_test.pyo
+${PYSITELIB}/cybox/test/objects/link_test.py
+${PYSITELIB}/cybox/test/objects/link_test.pyc
+${PYSITELIB}/cybox/test/objects/link_test.pyo
+${PYSITELIB}/cybox/test/objects/linux_package_test.py
+${PYSITELIB}/cybox/test/objects/linux_package_test.pyc
+${PYSITELIB}/cybox/test/objects/linux_package_test.pyo
+${PYSITELIB}/cybox/test/objects/memory_test.py
+${PYSITELIB}/cybox/test/objects/memory_test.pyc
+${PYSITELIB}/cybox/test/objects/memory_test.pyo
${PYSITELIB}/cybox/test/objects/mutex_test.py
${PYSITELIB}/cybox/test/objects/mutex_test.pyc
${PYSITELIB}/cybox/test/objects/mutex_test.pyo
@@ -649,12 +790,36 @@ ${PYSITELIB}/cybox/test/objects/network_connection_test.pyo
${PYSITELIB}/cybox/test/objects/network_packet_test.py
${PYSITELIB}/cybox/test/objects/network_packet_test.pyc
${PYSITELIB}/cybox/test/objects/network_packet_test.pyo
+${PYSITELIB}/cybox/test/objects/network_route_entry_test.py
+${PYSITELIB}/cybox/test/objects/network_route_entry_test.pyc
+${PYSITELIB}/cybox/test/objects/network_route_entry_test.pyo
+${PYSITELIB}/cybox/test/objects/network_route_test.py
+${PYSITELIB}/cybox/test/objects/network_route_test.pyc
+${PYSITELIB}/cybox/test/objects/network_route_test.pyo
${PYSITELIB}/cybox/test/objects/network_socket_test.py
${PYSITELIB}/cybox/test/objects/network_socket_test.pyc
${PYSITELIB}/cybox/test/objects/network_socket_test.pyo
+${PYSITELIB}/cybox/test/objects/network_subnet_test.py
+${PYSITELIB}/cybox/test/objects/network_subnet_test.pyc
+${PYSITELIB}/cybox/test/objects/network_subnet_test.pyo
+${PYSITELIB}/cybox/test/objects/obj_metadata_test.py
+${PYSITELIB}/cybox/test/objects/obj_metadata_test.pyc
+${PYSITELIB}/cybox/test/objects/obj_metadata_test.pyo
+${PYSITELIB}/cybox/test/objects/pipe_test.py
+${PYSITELIB}/cybox/test/objects/pipe_test.pyc
+${PYSITELIB}/cybox/test/objects/pipe_test.pyo
${PYSITELIB}/cybox/test/objects/port_test.py
${PYSITELIB}/cybox/test/objects/port_test.pyc
${PYSITELIB}/cybox/test/objects/port_test.pyo
+${PYSITELIB}/cybox/test/objects/product_test.py
+${PYSITELIB}/cybox/test/objects/product_test.pyc
+${PYSITELIB}/cybox/test/objects/product_test.pyo
+${PYSITELIB}/cybox/test/objects/semaphore_test.py
+${PYSITELIB}/cybox/test/objects/semaphore_test.pyc
+${PYSITELIB}/cybox/test/objects/semaphore_test.pyo
+${PYSITELIB}/cybox/test/objects/sms_message_test.py
+${PYSITELIB}/cybox/test/objects/sms_message_test.pyc
+${PYSITELIB}/cybox/test/objects/sms_message_test.pyo
${PYSITELIB}/cybox/test/objects/socket_address_test.py
${PYSITELIB}/cybox/test/objects/socket_address_test.pyc
${PYSITELIB}/cybox/test/objects/socket_address_test.pyo
@@ -667,21 +832,66 @@ ${PYSITELIB}/cybox/test/objects/user_account_test.pyo
${PYSITELIB}/cybox/test/objects/whois_test.py
${PYSITELIB}/cybox/test/objects/whois_test.pyc
${PYSITELIB}/cybox/test/objects/whois_test.pyo
+${PYSITELIB}/cybox/test/objects/win_computer_account_test.py
+${PYSITELIB}/cybox/test/objects/win_computer_account_test.pyc
+${PYSITELIB}/cybox/test/objects/win_computer_account_test.pyo
+${PYSITELIB}/cybox/test/objects/win_critical_section_test.py
+${PYSITELIB}/cybox/test/objects/win_critical_section_test.pyc
+${PYSITELIB}/cybox/test/objects/win_critical_section_test.pyo
+${PYSITELIB}/cybox/test/objects/win_driver_test.py
+${PYSITELIB}/cybox/test/objects/win_driver_test.pyc
+${PYSITELIB}/cybox/test/objects/win_driver_test.pyo
+${PYSITELIB}/cybox/test/objects/win_event_log_test.py
+${PYSITELIB}/cybox/test/objects/win_event_log_test.pyc
+${PYSITELIB}/cybox/test/objects/win_event_log_test.pyo
+${PYSITELIB}/cybox/test/objects/win_event_test.py
+${PYSITELIB}/cybox/test/objects/win_event_test.pyc
+${PYSITELIB}/cybox/test/objects/win_event_test.pyo
${PYSITELIB}/cybox/test/objects/win_file_test.py
${PYSITELIB}/cybox/test/objects/win_file_test.pyc
${PYSITELIB}/cybox/test/objects/win_file_test.pyo
+${PYSITELIB}/cybox/test/objects/win_filemapping_test.py
+${PYSITELIB}/cybox/test/objects/win_filemapping_test.pyc
+${PYSITELIB}/cybox/test/objects/win_filemapping_test.pyo
${PYSITELIB}/cybox/test/objects/win_handle_test.py
${PYSITELIB}/cybox/test/objects/win_handle_test.pyc
${PYSITELIB}/cybox/test/objects/win_handle_test.pyo
+${PYSITELIB}/cybox/test/objects/win_hook_test.py
+${PYSITELIB}/cybox/test/objects/win_hook_test.pyc
+${PYSITELIB}/cybox/test/objects/win_hook_test.pyo
${PYSITELIB}/cybox/test/objects/win_kernel_hook_test.py
${PYSITELIB}/cybox/test/objects/win_kernel_hook_test.pyc
${PYSITELIB}/cybox/test/objects/win_kernel_hook_test.pyo
+${PYSITELIB}/cybox/test/objects/win_kernel_test.py
+${PYSITELIB}/cybox/test/objects/win_kernel_test.pyc
+${PYSITELIB}/cybox/test/objects/win_kernel_test.pyo
${PYSITELIB}/cybox/test/objects/win_mailslot_test.py
${PYSITELIB}/cybox/test/objects/win_mailslot_test.pyc
${PYSITELIB}/cybox/test/objects/win_mailslot_test.pyo
+${PYSITELIB}/cybox/test/objects/win_memory_page_region_test.py
+${PYSITELIB}/cybox/test/objects/win_memory_page_region_test.pyc
+${PYSITELIB}/cybox/test/objects/win_memory_page_region_test.pyo
+${PYSITELIB}/cybox/test/objects/win_network_route_entry_test.py
+${PYSITELIB}/cybox/test/objects/win_network_route_entry_test.pyc
+${PYSITELIB}/cybox/test/objects/win_network_route_entry_test.pyo
+${PYSITELIB}/cybox/test/objects/win_network_share_test.py
+${PYSITELIB}/cybox/test/objects/win_network_share_test.pyc
+${PYSITELIB}/cybox/test/objects/win_network_share_test.pyo
+${PYSITELIB}/cybox/test/objects/win_pipe_test.py
+${PYSITELIB}/cybox/test/objects/win_pipe_test.pyc
+${PYSITELIB}/cybox/test/objects/win_pipe_test.pyo
+${PYSITELIB}/cybox/test/objects/win_prefetch_test.py
+${PYSITELIB}/cybox/test/objects/win_prefetch_test.pyc
+${PYSITELIB}/cybox/test/objects/win_prefetch_test.pyo
${PYSITELIB}/cybox/test/objects/win_registry_key_test.py
${PYSITELIB}/cybox/test/objects/win_registry_key_test.pyc
${PYSITELIB}/cybox/test/objects/win_registry_key_test.pyo
+${PYSITELIB}/cybox/test/objects/win_semaphore_test.py
+${PYSITELIB}/cybox/test/objects/win_semaphore_test.pyc
+${PYSITELIB}/cybox/test/objects/win_semaphore_test.pyo
+${PYSITELIB}/cybox/test/objects/win_system_restore_test.py
+${PYSITELIB}/cybox/test/objects/win_system_restore_test.pyc
+${PYSITELIB}/cybox/test/objects/win_system_restore_test.pyo
${PYSITELIB}/cybox/test/objects/win_task_test.py
${PYSITELIB}/cybox/test/objects/win_task_test.pyc
${PYSITELIB}/cybox/test/objects/win_task_test.pyo
@@ -691,6 +901,15 @@ ${PYSITELIB}/cybox/test/objects/win_thread_test.pyo
${PYSITELIB}/cybox/test/objects/win_user_test.py
${PYSITELIB}/cybox/test/objects/win_user_test.pyc
${PYSITELIB}/cybox/test/objects/win_user_test.pyo
+${PYSITELIB}/cybox/test/objects/win_waitable_timer_test.py
+${PYSITELIB}/cybox/test/objects/win_waitable_timer_test.pyc
+${PYSITELIB}/cybox/test/objects/win_waitable_timer_test.pyo
+${PYSITELIB}/cybox/test/utils/__init__.py
+${PYSITELIB}/cybox/test/utils/__init__.pyc
+${PYSITELIB}/cybox/test/utils/__init__.pyo
+${PYSITELIB}/cybox/test/utils/normalize_test.py
+${PYSITELIB}/cybox/test/utils/normalize_test.pyc
+${PYSITELIB}/cybox/test/utils/normalize_test.pyo
${PYSITELIB}/cybox/test/utils_test.py
${PYSITELIB}/cybox/test/utils_test.pyc
${PYSITELIB}/cybox/test/utils_test.pyo
@@ -703,9 +922,12 @@ ${PYSITELIB}/cybox/utils/autoentity.pyo
${PYSITELIB}/cybox/utils/caches.py
${PYSITELIB}/cybox/utils/caches.pyc
${PYSITELIB}/cybox/utils/caches.pyo
-${PYSITELIB}/cybox/utils/idgen.py
-${PYSITELIB}/cybox/utils/idgen.pyc
-${PYSITELIB}/cybox/utils/idgen.pyo
+${PYSITELIB}/cybox/utils/normalize.py
+${PYSITELIB}/cybox/utils/normalize.pyc
+${PYSITELIB}/cybox/utils/normalize.pyo
${PYSITELIB}/cybox/utils/nsparser.py
${PYSITELIB}/cybox/utils/nsparser.pyc
${PYSITELIB}/cybox/utils/nsparser.pyo
+${PYSITELIB}/cybox/version.py
+${PYSITELIB}/cybox/version.pyc
+${PYSITELIB}/cybox/version.pyo
diff --git a/security/py-cybox/distinfo b/security/py-cybox/distinfo
index 8abae9c066d..8209a6412c1 100644
--- a/security/py-cybox/distinfo
+++ b/security/py-cybox/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:18:03 agc Exp $
+$NetBSD: distinfo,v 1.3 2017/10/10 07:30:58 adam Exp $
-SHA1 (v2.1.0.4.tar.gz) = 1412bf5415588ebdfadc92518bb44d770431c587
-RMD160 (v2.1.0.4.tar.gz) = 8e933124093013658da9b93a47050f8f189a2a0a
-SHA512 (v2.1.0.4.tar.gz) = 8f1678710c5187e93287245312fa05ad4d51c7d5852b6aa4894c21aaa74dac8d4a2e49e4b3af10bc3c633af983a6f40cb29e11502978bd69af635913b432aebe
-Size (v2.1.0.4.tar.gz) = 894216 bytes
+SHA1 (python-cybox-2.1.0.14.tar.gz) = 984a714e6dc764692b9a1adf9ffd26ec488f56f2
+RMD160 (python-cybox-2.1.0.14.tar.gz) = 9f782eaba4233f938c805f5d29ff1bf4f8048ed6
+SHA512 (python-cybox-2.1.0.14.tar.gz) = 80bdbf1db78f62017708aac8b0df7ca2833a167991cff8c73117533f3fd1519b60d122c93730abc3e80386bbd72e52aa469335759dc928d922313b6bb69fe40a
+Size (python-cybox-2.1.0.14.tar.gz) = 476808 bytes