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

Adding bloodhound #463

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conversation

Torxed
Copy link

@Torxed Torxed commented Feb 13, 2020

No tests have been made, not sure what the normal test procedure is.
I currently have no machine to test this on since they're all running bloodhound instances currently.

Will update the PR once I get around to testing.

@Torxed
Copy link
Author

Torxed commented Feb 13, 2020

This should cover #305 :)

Copy link
Member

@xorond xorond left a comment

Choose a reason for hiding this comment

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

some inline comments for your next PR, but i have to say that i'm pretty disappointed that you basically took the pkgbuild from blackarch.

@@ -0,0 +1,75 @@
# This file is part of BlackArch Linux ( https://www.blackarch.org/ ).
Copy link
Member

Choose a reason for hiding this comment

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

... really?

this pkgbuild is basically copied with minor changes


_npmname=BloodHound
pkgname=bloodhound
pkgver=705.124ecee
Copy link
Member

Choose a reason for hiding this comment

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

doesn't fit out packaging guideline. if you're going to get $pkgver from git, please rename the pkg accordingly to bloodhound-git

cp -a *.js *.json *.sh *.html *.yml src $_bin_path *.graphdb dist "$pkgdir/usr/share/$pkgname"

cat > "$pkgdir/usr/bin/$pkgname" << EOF
#!/bin/sh
Copy link
Member

Choose a reason for hiding this comment

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

#!/usr/bin/env bash

EOF

chmod +x "$pkgdir/usr/bin/$pkgname"
chmod +x "$pkgdir/usr/share/$pkgname/$_bin_path/BloodHound"
Copy link
Member

Choose a reason for hiding this comment

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

chmod 755 instead of chmod +x

pkgrel=1
pkgdesc='Six Degrees of Domain Admin'
groups=('archstrike')
arch=('any')
Copy link
Member

Choose a reason for hiding this comment

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

'any' arch doesn't work here since it needs to be built differently for different arches. you need to explicitly write them

@Cthulu201
Copy link
Member

Cthulu201 commented Feb 18, 2020

Hi torxed, thanks for submitting. There are a few things that need changing. One of the big ones changing the maintainer and contributor lines:

# Maintainer: ArchStrike <team@archstrike.org>
# Contributor: ${your_name} <${email_address}>

We have no issues with contributions between various repos, we prefer to keep it repo focused. Also, our packaging infrastructures are different. Have you tried testing that PKGBUILD in a clean chroot?

makechrootpkg -c -r ${CHROOT}

Do you have any ARM devices that can also be used for testing? Thanks.

@Torxed
Copy link
Author

Torxed commented Feb 18, 2020

Hi torxed, thanks for submitting. There are a few things that need changing. One of the big ones changing the maintainer and contributor lines:

# Maintainer: ArchStrike <team@archstrike.org>
# Contributor: ${your_name} <${email_address}>

We have no issues with contributions between various repos, we prefer to keep it repo focused. Also, our packaging infrastructures are different. Have you tried testing that PKGBUILD in a clean chroot?

makechrootpkg -c -r ${CHROOT}

Do you have any ARM devices that can also be used for testing? Thanks.

I see. Let me get back to you on those things.
Not sure what or why the different packaging infrastructure is for, i tend to like makepkg and have yet to see a reason for going from it. Perhaps there's some night time reading some where that you can point me to why this decision was made? or can I perhaps keep it as vanilla as possible or is it completely forbidden? :)

I'll test the stuff, been a busy week and will probably be a bit busy hence forth, but I'll do my best :)

@Cthulu201
Copy link
Member

makepkg is good. However, if you already have a pkg installed locally it won't tell you that you need to add it to your PKGBUILD. Building in a clean chroot, with makechrootpkg, should. Our builders build in clean chroots to Arch standards. Some repos also have pkgs we don't to get their packages built.

@Torxed
Copy link
Author

Torxed commented Feb 18, 2020

to your PK

Ah, you mean it does dependency-lookups? Not something you necessarily need for the PKGBUILD to pass? I thought you removed makepkg and strictly use your own.

@Cthulu201
Copy link
Member

makepkg -s checks what you have locally and installs deps as needed. We use mkarchroot to create the clean chroot and use makechrootpkg to build - it checks database in chroot and not locally. If a dep is missing then we either add it to the PKGBUILD as needed, or we create a pkg for a supporting dep - main pkg won't build until all deps are available.

@xorond
Copy link
Member

xorond commented Feb 18, 2020

more info 0 1

@Cthulu201
Copy link
Member

I apologize for dropping the ball and not following up. Where are we with this? I took a peek and don't see a change to the Maintainer and contributor lines - want to give proper credit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants