From 2449049ef7c3b2f06ed8dfab9862b8d168ce36db Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Sun, 3 Mar 2024 10:18:11 +0100 Subject: [PATCH] Changes for dpkg files (#616) --- .github/workflows/test_docker.yml | 2 +- artifacts/__init__.py | 2 +- config/dpkg/artifacts-data.install | 2 +- config/dpkg/changelog | 4 ++-- config/dpkg/control | 9 ++++++++- config/dpkg/rules | 8 ++++++++ docs/sources/background/Stats.md | 12 ++++++------ setup.cfg | 4 ++-- tox.ini | 2 +- 9 files changed, 30 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml index a2031f3e..83715b9e 100644 --- a/.github/workflows/test_docker.yml +++ b/.github/workflows/test_docker.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ['38'] + version: ['39'] container: image: registry.fedoraproject.org/fedora:${{ matrix.version }} steps: diff --git a/artifacts/__init__.py b/artifacts/__init__.py index fd598aa9..af05ad00 100644 --- a/artifacts/__init__.py +++ b/artifacts/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- """ForensicArtifacts.com Artifact Repository.""" -__version__ = '20240210' +__version__ = '20240303' diff --git a/config/dpkg/artifacts-data.install b/config/dpkg/artifacts-data.install index 269d63ea..2638553e 100644 --- a/config/dpkg/artifacts-data.install +++ b/config/dpkg/artifacts-data.install @@ -1 +1 @@ -data/* usr/share/artifacts +usr/share/artifacts diff --git a/config/dpkg/changelog b/config/dpkg/changelog index 0f593c3f..c2ec7749 100644 --- a/config/dpkg/changelog +++ b/config/dpkg/changelog @@ -1,5 +1,5 @@ -artifacts (20240210-1) unstable; urgency=low +artifacts (20240303-1) unstable; urgency=low * Auto-generated - -- Forensic artifacts Sat, 10 Feb 2024 08:20:40 +0100 + -- Forensic artifacts Sun, 03 Mar 2024 10:03:58 +0100 diff --git a/config/dpkg/control b/config/dpkg/control index 6e18efc8..e2ee0dab 100644 --- a/config/dpkg/control +++ b/config/dpkg/control @@ -7,9 +7,16 @@ Standards-Version: 4.1.4 X-Python3-Version: >= 3.6 Homepage: https://github.com/ForensicArtifacts/artifacts +Package: artifacts-data +Architecture: all +Depends: ${misc:Depends} +Description: Data files for Digital Forensics Artifacts Repository + A free, community-sourced, machine-readable knowledge base of forensic + artifacts that the world can use both as an information source and within other tools. + Package: python3-artifacts Architecture: all -Depends: python3-yaml (>= 3.10), ${misc:Depends} +Depends: artifacts-data (>= ${binary:Version}), python3-yaml (>= 3.10), ${misc:Depends} Description: Python 3 module of Digital Forensics Artifacts Repository A free, community-sourced, machine-readable knowledge base of forensic artifacts that the world can use both as an information source and within other tools. diff --git a/config/dpkg/rules b/config/dpkg/rules index ff3b79ef..538fcb26 100755 --- a/config/dpkg/rules +++ b/config/dpkg/rules @@ -6,3 +6,11 @@ .PHONY: override_dh_auto_test override_dh_auto_test: +.PHONY: override_dh_auto_install +override_dh_auto_install: + dh_auto_install + mkdir -p ${PWD}/debian/tmp/usr/share/artifacts/ + mv ${PWD}/debian/tmp/usr/lib/python*/dist-packages/artifacts/data/* ${PWD}/debian/tmp/usr/share/artifacts/ + rmdir ${PWD}/debian/tmp/usr/lib/python*/dist-packages/artifacts/data + find ${PWD}/debian/tmp/usr/bin/ -type f -exec {} {}.py \; + diff --git a/docs/sources/background/Stats.md b/docs/sources/background/Stats.md index 463ff6c9..fec36162 100644 --- a/docs/sources/background/Stats.md +++ b/docs/sources/background/Stats.md @@ -4,12 +4,12 @@ The artifact definitions can be found in the [artifacts/data directory](https://github.com/ForensicArtifacts/artifacts/tree/main/artifacts/data) and the format is described in detail in the [Style Guide](https://artifacts.readthedocs.io/en/latest/sources/Format-specification.html). -Status of the repository as of 2024-01-28 +Status of the repository as of 2024-03-03 Description | Number --- | --- -Number of artifact definitions: | 822 -Number of file paths: | 2178 +Number of artifact definitions: | 831 +Number of file paths: | 2280 Number of Windows Registry key paths: | 677 ### Artifact definition source types @@ -18,7 +18,7 @@ Identifier | Number --- | --- ARTIFACT_GROUP | 47 COMMAND | 10 -FILE | 537 +FILE | 546 PATH | 28 REGISTRY_KEY | 57 REGISTRY_VALUE | 116 @@ -28,8 +28,8 @@ WMI | 27 Identifier | Number --- | --- -Darwin | 204 +Darwin | 213 ESXi | 16 Linux | 248 -Windows | 378 +Windows | 379 diff --git a/setup.cfg b/setup.cfg index 257b834f..a0f836f0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = artifacts -version = 20240210 +version = 20240303 description = ForensicArtifacts.com Artifact Repository. long_description = A free, community-sourced, machine-readable knowledge base of forensic artifacts that the world can use both as an information source and within other tools. long_description_content_type = text/plain @@ -22,7 +22,7 @@ install_requires = file:requirements.txt package_dir = artifacts = artifacts packages = find: -python_requires = >=3.7 +python_requires = >=3.8 [options.package_data] artifacts = diff --git a/tox.ini b/tox.ini index 08fa12c9..cbf0d235 100644 --- a/tox.ini +++ b/tox.ini @@ -62,4 +62,4 @@ commands = yamllint -v docformatter --check --diff --recursive artifacts setup.py tests pylint --rcfile=.pylintrc artifacts setup.py tests - yamllint -c .yamllint.yaml artifacts/data test_data + yamllint -c .yamllint.yaml artifacts test_data