Removed hachoir for Python 2 deprecation (#531)

log2timeline · Dec 27, 2018 · 6edb0a7 · 6edb0a7
1 parent 9d0c0c3
commit 6edb0a7
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 1,055 deletions.
diff --git a/data/dpkg_templates/python-hachoir-core.install b/data/dpkg_templates/python-hachoir-core.install
diff --git a/data/dpkg_templates/python-hachoir-metadata.install b/data/dpkg_templates/python-hachoir-metadata.install
diff --git a/data/dpkg_templates/python-hachoir-parser.install b/data/dpkg_templates/python-hachoir-parser.install
diff --git a/data/licenses/LICENSE.hachoir-core b/data/licenses/LICENSE.hachoir-core
diff --git a/data/licenses/LICENSE.hachoir-metadata b/data/licenses/LICENSE.hachoir-metadata
diff --git a/data/licenses/LICENSE.hachoir-parser b/data/licenses/LICENSE.hachoir-parser
diff --git a/data/presets.ini b/data/presets.ini
@@ -14,7 +14,7 @@ projects: asn1crypto,certifi,cffi,chardet,cryptography,decorator,grr-response-pr
 projects: libbde,libcaes,libcdata,libcdatetime,libcdirectory,libcerror,libcfile,libclocale,libcnotify,libcpath,libcreg,libcsplit,libcthreads,libesedb,libevt,libevtx,libewf,libexe,libfsntfs,libfvde,libfwnt,libfwsi,liblnk,libluksde,libmsiecf,libolecf,libqcow,libregf,libscca,libsigscan,libsmdev,libsmraw,libvhdi,libvmdk,libvshadow,libvslvm,libwrc
 
 [plaso]
-projects: artifacts,backports.lzma,bencode,biplist,certifi,chardet,dateutil,dfdatetime,dfvfs,dfwinreg,dtfabric,efilter,elasticsearch-py,elasticsearch5-py,guppy,funcsigs,future,hachoir-core,hachoir-metadata,hachoir-parser,idna,libbde,libesedb,libevt,libevtx,libewf,libexe,libfsapfs,libfsntfs,libfvde,libfwnt,libfwsi,liblnk,libmsiecf,libolecf,libqcow,libregf,libscca,libsigscan,libsmdev,libsmraw,libvhdi,libvmdk,libvshadow,libvslvm,libwrc,mock,requests,pbr,pefile,plaso,psutil,pycrypto,pyparsing,pysqlite,python-lz4,pytsk3,pytz,PyYAML,pyzmq,six,urllib3,XlsxWriter,yara-python
+projects: artifacts,backports.lzma,bencode,biplist,certifi,chardet,dateutil,dfdatetime,dfvfs,dfwinreg,dtfabric,efilter,elasticsearch-py,elasticsearch5-py,guppy,funcsigs,future,idna,libbde,libesedb,libevt,libevtx,libewf,libexe,libfsapfs,libfsntfs,libfvde,libfwnt,libfwsi,liblnk,libmsiecf,libolecf,libqcow,libregf,libscca,libsigscan,libsmdev,libsmraw,libvhdi,libvmdk,libvshadow,libvslvm,libwrc,mock,requests,pbr,pefile,plaso,psutil,pycrypto,pyparsing,pysqlite,python-lz4,pytsk3,pytz,PyYAML,pyzmq,six,urllib3,XlsxWriter,yara-python
 
 [pylint]
 projects: astroid,backports.functools_lru_cache,configparser,enum34,isort,lazy-object-proxy,logilab-common,mccabe,pylint,pytest-runner,setuptools_scm,singledispatch,six,typing,wrapt

diff --git a/data/projects.ini b/data/projects.ini
@@ -635,36 +635,6 @@ description_long: Guppy-PE is a library and programming environment for
     Language (GSL), which can be used to formally specify aspects of Python
     programs and generate tests and documentation from a common source.
 
-[hachoir-core]
-build_options: python2_only
-build_system: setup_py
-dpkg_template_install_python2: python-hachoir-core.install
-maintainer: Victor Stinner <victor.stinner@haypocalc.com>
-homepage_url: https://bitbucket.org/haypo/hachoir
-download_url: https://pypi.org/project/hachoir-core
-description_short: Core of Hachoir framework: parse and edit binary files
-description_long: Core of Hachoir framework: parse and edit binary files
-
-[hachoir-metadata]
-build_options: python2_only
-build_system: setup_py
-dpkg_template_install_python2: python-hachoir-metadata.install
-maintainer: Victor Stinner <victor.stinner@haypocalc.com>
-homepage_url: https://bitbucket.org/haypo/hachoir
-download_url: https://pypi.org/project/hachoir-metadata
-description_short: Program to extract metadata using Hachoir library
-description_long: Program to extract metadata using Hachoir library
-
-[hachoir-parser]
-build_options: python2_only
-build_system: setup_py
-dpkg_template_install_python2: python-hachoir-parser.install
-maintainer: Victor Stinner <victor.stinner@haypocalc.com>
-homepage_url: https://bitbucket.org/haypo/hachoir
-download_url: https://pypi.org/project/hachoir-parser
-description_short: Package of Hachoir parsers used to open binary files
-description_long: Package of Hachoir parsers used to open binary files
-
 [idna]
 build_system: setup_py
 version: >=2.5

diff --git a/data/rpm_templates/plaso.spec b/data/rpm_templates/plaso.spec
@@ -24,7 +24,7 @@ Plaso (log2timeline) is a framework to create super timelines. Its purpose is to
 
 %package -n python-%{{name}}
 Summary: Python 2 module of plaso (log2timeline)
-Requires: PyYAML >= 3.10, libbde-python >= 20140531, libesedb-python >= 20150409, libevt-python >= 20120410, libevtx-python >= 20141112, libewf-python >= 20131210, libfsntfs-python >= 20151130, libfvde-python >= 20160719, libfwnt-python >= 20180117, libfwsi-python >= 20150606, liblnk-python >= 20150830, libmsiecf-python >= 20150314, libolecf-python >= 20151223, libqcow-python >= 20131204, libregf-python >= 20150315, libscca-python >= 20161031, libsigscan-python >= 20150627, libsmdev-python >= 20140529, libsmraw-python >= 20140612, libvhdi-python >= 20131210, libvmdk-python >= 20140421, libvshadow-python >= 20160109, libvslvm-python >= 20160109, python-XlsxWriter >= 0.9.3, python-artifacts >= 20170818, python2-backports-lzma, python-bencode, python-biplist >= 1.0.3, python-chardet >= 2.0.1, python-construct >= 2.5.2, python-crypto >= 2.6, python2-dateutil >= 1.5, python-dfdatetime >= 20180606, python-dfvfs >= 20180326, python-dfwinreg >= 20170521, python-dpkt >= 1.8, python-dtfabric >= 20180604, python-efilter >= 1.5, python-elasticsearch >= 6.0, python-elasticsearch5 >= 5.4.0, python-hachoir-core >= 1.3.3, python-hachoir-metadata >= 1.3.3, python-hachoir-parser >= 1.3.4, python2-lz4, python2-pefile >= 2018.8.8, python-psutil >= 5.4.3, python-pytsk3 >= 20160721, python-requests >= 2.2.1, python-six >= 1.1.0, python2-certifi >= 2016.9.26, python2-future >= 0.16.0, python2-idna >= 2.5, python2-pyparsing >= 2.0.3, python-pysqlite, python2-pytz, python2-urllib3 >= 1.7.1, python2-yara >= 3.4.0, python2-zmq >= 2.1.11, plaso-data
+Requires: PyYAML >= 3.10, libbde-python >= 20140531, libesedb-python >= 20150409, libevt-python >= 20120410, libevtx-python >= 20141112, libewf-python >= 20131210, libfsntfs-python >= 20151130, libfvde-python >= 20160719, libfwnt-python >= 20180117, libfwsi-python >= 20150606, liblnk-python >= 20150830, libmsiecf-python >= 20150314, libolecf-python >= 20151223, libqcow-python >= 20131204, libregf-python >= 20150315, libscca-python >= 20161031, libsigscan-python >= 20150627, libsmdev-python >= 20140529, libsmraw-python >= 20140612, libvhdi-python >= 20131210, libvmdk-python >= 20140421, libvshadow-python >= 20160109, libvslvm-python >= 20160109, python-XlsxWriter >= 0.9.3, python-artifacts >= 20170818, python2-backports-lzma, python-bencode, python-biplist >= 1.0.3, python-chardet >= 2.0.1, python-construct >= 2.5.2, python-crypto >= 2.6, python2-dateutil >= 1.5, python-dfdatetime >= 20180606, python-dfvfs >= 20180326, python-dfwinreg >= 20170521, python-dpkt >= 1.8, python-dtfabric >= 20180604, python-efilter >= 1.5, python-elasticsearch >= 6.0, python-elasticsearch5 >= 5.4.0, python2-lz4, python2-pefile >= 2018.8.8, python-psutil >= 5.4.3, python-pytsk3 >= 20160721, python-requests >= 2.2.1, python-six >= 1.1.0, python2-certifi >= 2016.9.26, python2-future >= 0.16.0, python2-idna >= 2.5, python2-pyparsing >= 2.0.3, python-pysqlite, python2-pytz, python2-urllib3 >= 1.7.1, python2-yara >= 3.4.0, python2-zmq >= 2.1.11, plaso-data
 
 %description -n python-%{{name}}
 Plaso (log2timeline) is a framework to create super timelines. Its purpose is to extract timestamps from various files found on typical computer systems and aggregate them.