bcollet/static-toolbox
1
0
Fork 0
Code Issues Pull requests Releases Packages Activity Actions

Merge pull request #13 from takeshixx/master

Browse source 
Merge changes from Niklaus
This commit is contained in:
sven-ernw 2023-03-09 15:42:37 +01:00 committed by GitHub
commit add382c563
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/build-nmap.yml vendored
View file

@ -145,12 +145,15 @@ jobs:
run: ls -laR /tmp/releases
- name: Tag Release
id: tag_release
run: |
set +e
if git rev-list "nmap-v${{ needs.build-x86.outputs.version }}".. >/dev/null;then
git fetch --quiet --prune --tags
if [[ $(git tag -l | grep nmap-v${{ needs.build-x86.outputs.version }} | wc -l) -gt 0 ]]; then
echo "Tag for nmap-v${{ needs.build-x86.outputs.version }} already exists. Skipping release creation."
echo ::set-output name=NEW_RELEASE::"false"
else
echo "Tag for nmap-v${{ needs.build-x86.outputs.version }} missing. Starting release creation."
git tag "nmap-v${{ needs.build-x86.outputs.version }}"
git push origin "nmap-v${{ needs.build-x86.outputs.version }}"
echo ::set-output name=NEW_RELEASE::"true"

10
README.md
View file

@ -23,9 +23,9 @@ The following table shows the building status for the current toolset. The follo
| Tool | Status |
| ---- | ------ |
|[Nmap](https://github.com/ernw/static-toolbox/actions?query=workflow%3A%22Nmap%22)|![Nmap](https://github.com/ernw/static-toolbox/workflows/Nmap/badge.svg)|
|[OpenSSH](https://github.com/ernw/static-toolbox/actions?query=workflow%3A%22OpenSSH%22)|![OpenSSH](https://github.com/ernw/static-toolbox/workflows/OpenSSH/badge.svg)|
|[socat](https://github.com/ernw/static-toolbox/actions?query=workflow%3A%22socat%22)|![socat](https://github.com/ernw/static-toolbox/workflows/socat/badge.svg)|
|[GDB & gdbserver](https://github.com/ernw/static-toolbox/actions?query=workflow%3AGDB)|![GDB & gdbserver](https://github.com/ernw/static-toolbox/workflows/GDB%20&%20gdbserver/badge.svg)|
|[tcpdump](https://github.com/ernw/static-toolbox/actions?query=workflow%3A%22tcpdump%22)|![tcpdump](https://github.com/ernw/static-toolbox/workflows/tcpdump/badge.svg)|
|[Nmap](https://github.com/takeshixx/static-toolbox/actions?query=workflow%3A%22Nmap%22)|![Nmap](https://github.com/takeshixx/static-toolbox/workflows/Nmap/badge.svg)|
|[OpenSSH](https://github.com/takeshixx/static-toolbox/actions?query=workflow%3A%22OpenSSH%22)|![OpenSSH](https://github.com/takeshixx/static-toolbox/workflows/OpenSSH/badge.svg)|
|[socat](https://github.com/takeshixx/static-toolbox/actions?query=workflow%3A%22socat%22)|![socat](https://github.com/takeshixx/static-toolbox/workflows/socat/badge.svg)|
|[GDB & gdbserver](https://github.com/takeshixx/static-toolbox/actions?query=workflow%3AGDB)|![GDB & gdbserver](https://github.com/takeshixx/static-toolbox/workflows/GDB%20&%20gdbserver/badge.svg)|
|[tcpdump](https://github.com/takeshixx/static-toolbox/actions?query=workflow%3A%22tcpdump%22)|![tcpdump](https://github.com/takeshixx/static-toolbox/workflows/tcpdump/badge.svg)|

15
build/02_install_build_compiler.sh
View file

@ -1,9 +1,15 @@
#!/bin/bash
function die(){
echo "$1"
exit 1
}
if [ $# -ne 1 ];then
echo "Missing arch"
exit 1
fi
ARCH="${1,,}"
ARCH="${1}"
case $ARCH in
x86_64|i686|aarch64)
ARCH="${ARCH}-linux-musl"
@ -20,7 +26,8 @@ case $ARCH in
;;
esac
HOST=http://musl.cc
echo "Fetching ${HOST}/${ARCH}-cross.tgz"
cd /
curl -so ${ARCH}-cross.tgz ${HOST}/${ARCH}-cross.tgz
tar -xf ${ARCH}-cross.tgz
rm ${ARCH}-cross.tgz
curl -so ${ARCH}-cross.tgz ${HOST}/${ARCH}-cross.tgz || die "Failed to download build compiler package"
tar -xf ${ARCH}-cross.tgz || die "Failed to extract build compiler package"
rm ${ARCH}-cross.tgz || die "Failed to remove build compiler package"

3
build/targets/build_gdb.sh
View file

@ -18,8 +18,7 @@ build_gdb() {
fetch "$GIT_BINUTILS_GDB" "${BUILD_DIRECTORY}/binutils-gdb" git
cd "${BUILD_DIRECTORY}/binutils-gdb/" || { echo "Cannot cd to ${BUILD_DIRECTORY}/binutils-gdb/"; exit 1; }
git clean -fdx
git checkout gdb-10.1-release
git checkout gdb-12.1-release
CMD="CFLAGS=\"${GCC_OPTS}\" "
CMD+="CXXFLAGS=\"${GXX_OPTS}\" "
CMD+="LDFLAGS=\"-static\" "

2
build/targets/build_openssh.sh
View file

@ -17,7 +17,7 @@ init_lib $1
build_openssh() {
fetch "https://github.com/openssh/openssh-portable.git" "${BUILD_DIRECTORY}/openssh-portable" git
cd "${BUILD_DIRECTORY}/openssh-portable"
git checkout V_8_6_P1
git checkout V_9_1_P1
git clean -fdx
autoreconf -i
CC="gcc ${GCC_OPTS}" \