From 19c168a2662f6367d41552e3458e0eb708761d6c Mon Sep 17 00:00:00 2001 From: Antonio Date: Tue, 8 Oct 2024 11:25:54 +0200 Subject: [PATCH 1/7] vmcloak: fix vm creation issue --- packages/vmcloak/PKGBUILD | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/packages/vmcloak/PKGBUILD b/packages/vmcloak/PKGBUILD index 705bdc38792..f437be7cc13 100644 --- a/packages/vmcloak/PKGBUILD +++ b/packages/vmcloak/PKGBUILD @@ -2,45 +2,52 @@ # See COPYING for license details. pkgname=vmcloak -pkgver=912.13853ff -pkgrel=2 -epoch=2 +pkgver=0.4.8.r29.gdc9e513 +pkgrel=1 +epoch=3 pkgdesc='Automated Virtual Machine Generation and Cloaking for Cuckoo Sandbox.' -groups=('blackarch-malware') +groups=('blackarch' 'blackarch-malware') url='https://github.com/jbremer/vmcloak' arch=('any') license=('GPL3') -depends=('python2' 'python2-sphinx' 'python-setuptools' 'python2-lockfile' - 'python2-requests' 'python2-alembic' 'python2-sqlalchemy' - 'python2-yaml' 'python2-pytest' 'python2-pefile' 'python2-jinja' - 'python2-pyaml' 'python2-click' 'virtualbox' 'lshw' 'dmidecode' - 'cdrtools') -makedepends=('git' 'python2-setuptools') +depends=('python' 'python-sphinx' 'python-lockfile' + 'python-requests' 'python-alembic' 'python-sqlalchemy' + 'python-yaml' 'python-pefile' 'python-jinja' + 'python-pyaml' 'python-click' 'python-psutil' + 'lshw' 'dmidecode' 'cdrtools' 'qemu-full') +makedepends=('git' 'python-setuptools' 'python-pytest') source=("$pkgname::git+https://github.com/jbremer/$pkgname.git" 'setup.py.patch') sha512sums=('SKIP' - 'ac4bf47e6ddf166add9bc55e05328cab32700b7a0c99ffc67986144c13638a13ccb7be9c26912d1a18bd2d3715ab6d52e065372618254c9edc592c47fff8e32f') + '679b6c4a0bd114c7d6eed9a2a9bb67a6d3084e3c42b3de2e2f34751500f8e4317a7c2afdc0003a66fd015a25acbbb5113882a550f2692aae8900a868acbff056') pkgver() { cd $pkgname - echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) + ( set -o pipefail + git describe --long --tags --abbrev=7 2>/dev/null | + sed 's/\([^-]*-g\)/r\1/;s/-/./g' || + printf "%s.%s" "$(git rev-list --count HEAD)" \ + "$(git rev-parse --short=7 HEAD)" + ) } prepare() { - patch -p1 < setup.py.patch + cd $pkgname + + patch -p1 < ../setup.py.patch } build() { cd $pkgname - python2 setup.py build + python setup.py build } package() { cd $pkgname - python2 setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build + python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build install -Dm 644 docs/LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } From d2caf800b9e0d51d1818495335735ee1e0ed6f93 Mon Sep 17 00:00:00 2001 From: Antonio Date: Tue, 8 Oct 2024 11:28:00 +0200 Subject: [PATCH 2/7] Update setup.py.patch --- packages/vmcloak/setup.py.patch | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/vmcloak/setup.py.patch b/packages/vmcloak/setup.py.patch index 3cebad9dc9e..ed63ceb6797 100644 --- a/packages/vmcloak/setup.py.patch +++ b/packages/vmcloak/setup.py.patch @@ -1,21 +1,21 @@ ---- src/vmcloak/setup.py 2019-11-22 23:18:54.099999431 +0100 -+++ setup.py 2019-11-22 23:22:55.303332762 +0100 -@@ -40,12 +40,12 @@ - "vmcloak.data.win7": ["*.*"], - }, +--- a/setup.py 2024-10-08 10:49:28.976279733 +0200 ++++ b/setup.py 2024-10-08 10:50:05.937183133 +0200 +@@ -44,12 +44,12 @@ install_requires=[ -- "click==6.6", -- "jinja2==2.9.6", -- "pefile2==1.2.11", -- "pyyaml==3.12", -- "sqlalchemy==1.3.3", -- "alembic>=1.0.7, <1.1", -+ "click", -+ "jinja2", + "click", + "jinja2", +- "pefile>=2019.4.18, <2019.5.0" +- "pyyaml>=5.1", +- "sqlalchemy>=1.4, <1.5", +- "alembic>=1.7.4, <1.8", +- "requests>=2.22.0, <3", +- "psutil>=5.4.8, <6" + "pefile", + "pyyaml", + "sqlalchemy", + "alembic", ++ "requests", ++ "psutil" ], extras_require={ ":sys_platform == 'win32'": [ From f8a6f848a3096dd05c4b67ac1a36685b66d54e96 Mon Sep 17 00:00:00 2001 From: Antonio Date: Tue, 8 Oct 2024 11:28:17 +0200 Subject: [PATCH 3/7] Update to-release --- lists/to-release | 1 + 1 file changed, 1 insertion(+) diff --git a/lists/to-release b/lists/to-release index e69de29bb2d..414eff489af 100644 --- a/lists/to-release +++ b/lists/to-release @@ -0,0 +1 @@ +vmcloak From 7f959ccac73c1c8f0044558fe23d7567a58ed05e Mon Sep 17 00:00:00 2001 From: Antonio Date: Sun, 27 Oct 2024 23:28:48 +0100 Subject: [PATCH 4/7] Update PKGBUILD --- packages/vmcloak/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/vmcloak/PKGBUILD b/packages/vmcloak/PKGBUILD index f437be7cc13..2b5bda73944 100644 --- a/packages/vmcloak/PKGBUILD +++ b/packages/vmcloak/PKGBUILD @@ -2,24 +2,24 @@ # See COPYING for license details. pkgname=vmcloak -pkgver=0.4.8.r29.gdc9e513 +pkgver=955.fae1f29 pkgrel=1 epoch=3 pkgdesc='Automated Virtual Machine Generation and Cloaking for Cuckoo Sandbox.' groups=('blackarch' 'blackarch-malware') -url='https://github.com/jbremer/vmcloak' +url='https://github.com/Cryss76/vmcloak' arch=('any') license=('GPL3') depends=('python' 'python-sphinx' 'python-lockfile' 'python-requests' 'python-alembic' 'python-sqlalchemy' 'python-yaml' 'python-pefile' 'python-jinja' - 'python-pyaml' 'python-click' 'python-psutil' + 'python-click' 'python-psutil' 'lshw' 'dmidecode' 'cdrtools' 'qemu-full') makedepends=('git' 'python-setuptools' 'python-pytest') -source=("$pkgname::git+https://github.com/jbremer/$pkgname.git" +source=("$pkgname::git+https://github.com/Cryss76/$pkgname.git" 'setup.py.patch') sha512sums=('SKIP' - '679b6c4a0bd114c7d6eed9a2a9bb67a6d3084e3c42b3de2e2f34751500f8e4317a7c2afdc0003a66fd015a25acbbb5113882a550f2692aae8900a868acbff056') + '6510c2bea8d448b537441dcd73398d14bfd0943d9d5b88be97e5ae0dc7a7101f33163ece04cba92a8709d7661618c801c1433963eea6f0425a562c92434276e3') pkgver() { cd $pkgname From 83ad59a21bbc5ec77079a6bca5be059114c7df43 Mon Sep 17 00:00:00 2001 From: Antonio Date: Sun, 27 Oct 2024 23:29:05 +0100 Subject: [PATCH 5/7] Update setup.py.patch --- packages/vmcloak/setup.py.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vmcloak/setup.py.patch b/packages/vmcloak/setup.py.patch index ed63ceb6797..e8f0b90c979 100644 --- a/packages/vmcloak/setup.py.patch +++ b/packages/vmcloak/setup.py.patch @@ -4,7 +4,7 @@ install_requires=[ "click", "jinja2", -- "pefile>=2019.4.18, <2019.5.0" +- "pefile>=2019.4.18, <2019.5.0", - "pyyaml>=5.1", - "sqlalchemy>=1.4, <1.5", - "alembic>=1.7.4, <1.8", From 2117a97163e88e038bb7cc87e63413516c556799 Mon Sep 17 00:00:00 2001 From: Antonio Date: Sun, 27 Oct 2024 23:41:19 +0100 Subject: [PATCH 6/7] Update PKGBUILD --- packages/vmcloak/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vmcloak/PKGBUILD b/packages/vmcloak/PKGBUILD index 2b5bda73944..b9e3104e373 100644 --- a/packages/vmcloak/PKGBUILD +++ b/packages/vmcloak/PKGBUILD @@ -6,9 +6,9 @@ pkgver=955.fae1f29 pkgrel=1 epoch=3 pkgdesc='Automated Virtual Machine Generation and Cloaking for Cuckoo Sandbox.' +arch=('any') groups=('blackarch' 'blackarch-malware') url='https://github.com/Cryss76/vmcloak' -arch=('any') license=('GPL3') depends=('python' 'python-sphinx' 'python-lockfile' 'python-requests' 'python-alembic' 'python-sqlalchemy' From 84da0d468e538daebaff58695726e2ee60dec367 Mon Sep 17 00:00:00 2001 From: Antonio Date: Sat, 2 Nov 2024 15:27:36 +0100 Subject: [PATCH 7/7] Update PKGBUILD --- packages/vmcloak/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vmcloak/PKGBUILD b/packages/vmcloak/PKGBUILD index b9e3104e373..a12c8dcf5bf 100644 --- a/packages/vmcloak/PKGBUILD +++ b/packages/vmcloak/PKGBUILD @@ -4,7 +4,7 @@ pkgname=vmcloak pkgver=955.fae1f29 pkgrel=1 -epoch=3 +epoch=2 pkgdesc='Automated Virtual Machine Generation and Cloaking for Cuckoo Sandbox.' arch=('any') groups=('blackarch' 'blackarch-malware')