From a9d2ca79824bdf5ce817b85b44e3d670b1ab130ef7d265bcfd3eff63499e5829 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 4 Oct 2017 16:58:18 +0000 Subject: [PATCH] - update to version 2.4.80.1 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pymisp?expand=0&rev=7 --- fix-tests-pr-111.patch | 74 ------------------------------------------ pymisp-2.4.80.1.tar.gz | 3 ++ pymisp-2.4.80.tar.gz | 3 -- python-pymisp.changes | 37 +++++++++++++++++++++ python-pymisp.spec | 5 +-- 5 files changed, 41 insertions(+), 81 deletions(-) delete mode 100644 fix-tests-pr-111.patch create mode 100644 pymisp-2.4.80.1.tar.gz delete mode 100644 pymisp-2.4.80.tar.gz diff --git a/fix-tests-pr-111.patch b/fix-tests-pr-111.patch deleted file mode 100644 index d065e31..0000000 --- a/fix-tests-pr-111.patch +++ /dev/null @@ -1,74 +0,0 @@ -From d59e70ce8425b610d1e5a9cde77cfb26af9ba184 Mon Sep 17 00:00:00 2001 -From: Sebastian Wagner -Date: Wed, 20 Sep 2017 11:15:13 +0200 -Subject: [PATCH 1/2] TST: update test requirements - ---- - .travis.yml | 2 +- - setup.py | 9 ++++++++- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/.travis.yml b/.travis.yml -index 5f93e2fc..391d973e 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -20,7 +20,7 @@ install: - - pip install -U nose - - pip install coveralls - - pip install codecov -- - pip install requests-mock pytest -+ - pip install requests-mock - - pip install https://github.com/lief-project/packages/raw/lief-master-latest/pylief-0.7.0.dev.zip - - pip install git+https://github.com/kbandla/pydeep.git - - pip install python-magic -diff --git a/setup.py b/setup.py -index 553666f1..5b5d2737 100644 ---- a/setup.py -+++ b/setup.py -@@ -26,8 +26,15 @@ - 'Topic :: Security', - 'Topic :: Internet', - ], -- test_suite="tests", -+ test_suite="tests.test_offline", - install_requires=['six', 'requests', 'python-dateutil', 'jsonschema'], -+ tests_require=[ -+ 'jsonschema', -+ 'python-dateutil', -+ 'python-magic', -+ 'requests-mock', -+ 'six' -+ ], - include_package_data=True, - package_data={'pymisp': ['data/*.json', 'data/misp-objects/schema_objects.json', - 'data/misp-objects/schema_relationships.json', - -From 0790e571a1819f6aaff82005a47132c2b6cd8494 Mon Sep 17 00:00:00 2001 -From: Sebastian Wagner -Date: Wed, 20 Sep 2017 11:15:33 +0200 -Subject: [PATCH 2/2] TST: skip test with optional files if not existing - ---- - tests/test_offline.py | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/tests/test_offline.py b/tests/test_offline.py -index 25229c02..47e43a50 100644 ---- a/tests/test_offline.py -+++ b/tests/test_offline.py -@@ -233,9 +233,12 @@ def make_objects(self, path): - - def test_objects(self, m): - paths = ['cmd.exe', 'tmux', 'MachO-OSX-x64-ls'] -- for path in paths: -- json_blob = self.make_objects(os.path.join('tests', -- 'viper-test-files', 'test_files', path)) -+ try: -+ for path in paths: -+ json_blob = self.make_objects(os.path.join('tests', -+ 'viper-test-files', 'test_files', path)) -+ except IOError: # Can be replaced with FileNotFoundError when support for python 2 is dropped -+ return unittest.SkipTest() - print(json_blob) - - if __name__ == '__main__': diff --git a/pymisp-2.4.80.1.tar.gz b/pymisp-2.4.80.1.tar.gz new file mode 100644 index 0000000..fc59e44 --- /dev/null +++ b/pymisp-2.4.80.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aafb0dcdff4f552841f895a092dc0ed3e2a598e3c15b12dd2ee1f99aaa6022c4 +size 76208 diff --git a/pymisp-2.4.80.tar.gz b/pymisp-2.4.80.tar.gz deleted file mode 100644 index f70b5f5..0000000 --- a/pymisp-2.4.80.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7480acada8cba9472a85070c57baad89ae9deed826a7515a4c149ac48920c273 -size 75528 diff --git a/python-pymisp.changes b/python-pymisp.changes index ab0946a..866ca74 100644 --- a/python-pymisp.changes +++ b/python-pymisp.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Wed Oct 4 16:16:57 UTC 2017 - sebix+novell.com@sebix.at + +- update to version 2.4.80.1 + - Changes + - Update changelog. [Raphaël Vinot] + - Fix + - Change readme. [Raphaël Vinot] + - Create file object. [Raphaël Vinot] + Was broken in case the file was neither PE/ELF/Mach-O + - Allow again to tag/delete unsaved attributes. [Raphaël Vinot] + - Live tests. [Raphaël Vinot] + - Import the openioc converter from tool again. [Raphaël Vinot] + - Other + - Up: Version bump. [Raphaël Vinot] + - Up: Bump misp-objects & describeTypes. [Raphaël Vinot] + - Update readme. [Raphaël Vinot] + - Merge pull request #116 from cgi1/patch-2. [Raphaël Vinot] + - Similar to #114 on attribute level. [cgi1] + `add_attribute_tag(tag,attribute_identifier)` fails if attribute does not have any tag in before. + - Merge pull request #115 from cgi1/patch-1. [Raphaël Vinot] + Fixing #114 (MISPEvent.add_tag(tag) fails if inital event does not contain tag ) + - Fixing #114. [cgi1] + - Merge pull request #112 from CenturyLinkCIRT/unknown-object-name- + patch. [Raphaël Vinot] + - Formatted "Unknown MISP object" error message. [infosec-intern] + When a user tries to add an object with a name that doesn't exist, the error thrown was missing its format string + This ended up looking like + pymisp.exceptions.UnknownMISPObjectTemplate: {} is unknown in the MISP object directory. + Here's a patch that adds self.name to the format string + - Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot] + - Merge pull request #111 from wagner-certat/skip-tests. [Raphaël Vinot] + - TST: skip test with optional files if not existing. [Sebastian Wagner] + - TST: update test requirements. [Sebastian Wagner] + - Update: make make_binary_objects more flexible. [Raphaël Vinot] + - fix: use proper exception handlers + ------------------------------------------------------------------- Wed Sep 20 09:37:12 UTC 2017 - sebix+novell.com@sebix.at diff --git a/python-pymisp.spec b/python-pymisp.spec index 427e85d..6c99240 100644 --- a/python-pymisp.spec +++ b/python-pymisp.spec @@ -20,15 +20,13 @@ %{!?license: %global license %doc} %bcond_without test Name: python-pymisp -Version: 2.4.80 +Version: 2.4.80.1 Release: 0 Summary: Python API for MISP License: BSD-2-Clause Group: Development/Languages/Python Url: https://github.com/MISP/PyMISP Source: https://files.pythonhosted.org/packages/source/p/pymisp/pymisp-%{version}.tar.gz -# PATCH-FIX-UPSTREAM fix-tests-pr-111.patch -- skip an optional test depending on third party data -Patch0: https://github.com/MISP/PyMISP/pull/111.patch#/fix-tests-pr-111.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -69,7 +67,6 @@ Examples and HTML documentation for %{name}. %prep %setup -q -n pymisp-%{version} -%patch0 -p1 find pymisp examples -name "*.py" -type f -exec sed -i '1s/^#!.*//' '{}' \+ %build