Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vmcloak: migration to Python3 and fix issues #4254

Merged
merged 7 commits into from
Nov 9, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lists/to-release
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vmcloak
41 changes: 24 additions & 17 deletions packages/vmcloak/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,52 @@
# See COPYING for license details.

pkgname=vmcloak
pkgver=912.13853ff
pkgrel=2
epoch=2
pkgver=955.fae1f29
pkgrel=1
epoch=3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you increment epoch if pkgver is higher?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind. I was working on different WS for this PKGBUILD. Now fixed.

pkgdesc='Automated Virtual Machine Generation and Cloaking for Cuckoo Sandbox.'
groups=('blackarch-malware')
url='https://github.com/jbremer/vmcloak'
arch=('any')
groups=('blackarch' 'blackarch-malware')
url='https://github.com/Cryss76/vmcloak'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you explain how you chose this fork?

Copy link
Contributor Author

@D3vil0p3r D3vil0p3r Nov 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of:

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')
source=("$pkgname::git+https://github.com/jbremer/$pkgname.git"
depends=('python' 'python-sphinx' 'python-lockfile'
'python-requests' 'python-alembic' 'python-sqlalchemy'
'python-yaml' 'python-pefile' 'python-jinja'
'python-click' 'python-psutil'
'lshw' 'dmidecode' 'cdrtools' 'qemu-full')
makedepends=('git' 'python-setuptools' 'python-pytest')
source=("$pkgname::git+https://github.com/Cryss76/$pkgname.git"
'setup.py.patch')
sha512sums=('SKIP'
'ac4bf47e6ddf166add9bc55e05328cab32700b7a0c99ffc67986144c13638a13ccb7be9c26912d1a18bd2d3715ab6d52e065372618254c9edc592c47fff8e32f')
'6510c2bea8d448b537441dcd73398d14bfd0943d9d5b88be97e5ae0dc7a7101f33163ece04cba92a8709d7661618c801c1433963eea6f0425a562c92434276e3')

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"
}
Expand Down
26 changes: 13 additions & 13 deletions packages/vmcloak/setup.py.patch
Original file line number Diff line number Diff line change
@@ -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'": [
Loading