diff --git a/.github/workflows/build-gdb.yml b/.github/workflows/build-gdb.yml index 710af0d..8c808a6 100644 --- a/.github/workflows/build-gdb.yml +++ b/.github/workflows/build-gdb.yml @@ -29,7 +29,7 @@ jobs: $GITHUB_WORKSPACE/build/targets/build_gdb.sh x86 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_gdb.outputs.PACKAGED_NAME }} path: ${{ steps.build_gdb.outputs.PACKAGED_NAME_PATH }} @@ -54,7 +54,7 @@ jobs: $GITHUB_WORKSPACE/build/targets/build_gdb.sh x86_64 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_gdb.outputs.PACKAGED_NAME }} path: ${{ steps.build_gdb.outputs.PACKAGED_NAME_PATH }} @@ -84,7 +84,7 @@ jobs: $GITHUB_WORKSPACE/build/targets/build_gdb.sh armhf - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_gdb.outputs.PACKAGED_NAME }} path: ${{ steps.build_gdb.outputs.PACKAGED_NAME_PATH }} @@ -118,7 +118,7 @@ jobs: $GITHUB_WORKSPACE/build/targets/build_gdb.sh aarch64 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_gdb.outputs.PACKAGED_NAME }} path: ${{ steps.build_gdb.outputs.PACKAGED_NAME_PATH }} @@ -127,6 +127,8 @@ jobs: name: Create GDB & gdbserver Release runs-on: ubuntu-latest needs: [build-x86, build-x86_64, build-armhf, build-aarch64] + permissions: + contents: write steps: - name: Checkout uses: actions/checkout@v2 @@ -135,18 +137,21 @@ jobs: run: mkdir /tmp/releases - name: Download Artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: path: /tmp/releases - name: List Artifacts run: ls -laR /tmp/releases + - name: Fetch tags + run: git fetch --tags --prune --quiet + - name: Tag Release id: tag_release run: | set +e - if git rev-list "gdb-v${{ needs.build-x86.outputs.version }}".. >/dev/null;then + if git rev-list "gdb-v${{ needs.build-x86.outputs.version }}" >/dev/null;then echo "Tag for gdb-v${{ needs.build-x86.outputs.version }} already exists. Skipping release creation." echo ::set-output name=NEW_RELEASE::"false" else @@ -162,4 +167,4 @@ jobs: name: gdb-v${{ needs.build-x86.outputs.version }} tag: gdb-v${{ needs.build-x86.outputs.version }} artifacts: "/tmp/releases/*/*" - token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/build-nmap.yml b/.github/workflows/build-nmap.yml index 33f0d3d..5d491e3 100644 --- a/.github/workflows/build-nmap.yml +++ b/.github/workflows/build-nmap.yml @@ -24,13 +24,13 @@ jobs: run: $GITHUB_WORKSPACE/package/targets/nmap/package.sh /output x86 - name: Upload tarball - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.package_nmap.outputs.PACKAGED_TARBALL }} path: ${{ steps.package_nmap.outputs.PACKAGED_TARBALL_PATH }} - name: Upload zip - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.package_nmap.outputs.PACKAGED_ZIP }} path: ${{ steps.package_nmap.outputs.PACKAGED_ZIP_PATH }} @@ -54,13 +54,13 @@ jobs: run: $GITHUB_WORKSPACE/package/targets/nmap/package.sh /output x86_64 - name: Upload tarball - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.package_nmap.outputs.PACKAGED_TARBALL }} path: ${{ steps.package_nmap.outputs.PACKAGED_TARBALL_PATH }} - name: Upload zip - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.package_nmap.outputs.PACKAGED_ZIP }} path: ${{ steps.package_nmap.outputs.PACKAGED_ZIP_PATH }} @@ -84,13 +84,13 @@ jobs: run: $GITHUB_WORKSPACE/package/targets/nmap/package.sh /output armhf - name: Upload tarball - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.package_nmap.outputs.PACKAGED_TARBALL }} path: ${{ steps.package_nmap.outputs.PACKAGED_TARBALL_PATH }} - name: Upload zip - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.package_nmap.outputs.PACKAGED_ZIP }} path: ${{ steps.package_nmap.outputs.PACKAGED_ZIP_PATH }} @@ -114,13 +114,13 @@ jobs: run: $GITHUB_WORKSPACE/package/targets/nmap/package.sh /output aarch64 - name: Upload tarball - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.package_nmap.outputs.PACKAGED_TARBALL }} path: ${{ steps.package_nmap.outputs.PACKAGED_TARBALL_PATH }} - name: Upload zip - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.package_nmap.outputs.PACKAGED_ZIP }} path: ${{ steps.package_nmap.outputs.PACKAGED_ZIP_PATH }} @@ -129,6 +129,8 @@ jobs: name: Create Nmap Release runs-on: ubuntu-latest needs: [build-x86, build-x86_64, build-armhf, build-aarch64] + permissions: + contents: write steps: - name: Checkout uses: actions/checkout@v2 @@ -137,19 +139,21 @@ jobs: run: mkdir /tmp/releases - name: Download Artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: path: /tmp/releases - name: List Artifacts run: ls -laR /tmp/releases + - name: Fetch tags + run: git fetch --tags --prune --quiet + - name: Tag Release id: tag_release run: | set +e - git fetch --quiet --prune --tags - if [[ $(git tag -l | grep nmap-v${{ needs.build-x86.outputs.version }} | wc -l) -gt 0 ]]; then + if git rev-list "nmap-v${{ needs.build-x86.outputs.version }}" >/dev/null;then echo "Tag for nmap-v${{ needs.build-x86.outputs.version }} already exists. Skipping release creation." echo "NEW_RELEASE=false" >> $GITHUB_OUTPUT else diff --git a/.github/workflows/build-openssh.yml b/.github/workflows/build-openssh.yml index de32095..18d638d 100644 --- a/.github/workflows/build-openssh.yml +++ b/.github/workflows/build-openssh.yml @@ -20,7 +20,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_openssh.sh x86 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_openssh.outputs.PACKAGED_NAME }} path: ${{ steps.build_openssh.outputs.PACKAGED_NAME_PATH }} @@ -41,7 +41,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_openssh.sh x86_64 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_openssh.outputs.PACKAGED_NAME }} path: ${{ steps.build_openssh.outputs.PACKAGED_NAME_PATH }} @@ -62,7 +62,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_openssh.sh armhf - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_openssh.outputs.PACKAGED_NAME }} path: ${{ steps.build_openssh.outputs.PACKAGED_NAME_PATH }} @@ -83,7 +83,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_openssh.sh aarch64 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_openssh.outputs.PACKAGED_NAME }} path: ${{ steps.build_openssh.outputs.PACKAGED_NAME_PATH }} @@ -92,6 +92,8 @@ jobs: name: Create OpenSSH Release runs-on: ubuntu-latest needs: [build-x86, build-x86_64, build-armhf, build-aarch64] + permissions: + contents: write steps: - name: Checkout uses: actions/checkout@v2 @@ -100,18 +102,21 @@ jobs: run: mkdir /tmp/releases - name: Download Artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: path: /tmp/releases - name: List Artifacts run: ls -laR /tmp/releases + - name: Fetch tags + run: git fetch --tags --prune --quiet + - name: Tag Release id: tag_release run: | set +e - if git rev-list "openssh-v${{ needs.build-x86.outputs.version }}".. >/dev/null;then + if git rev-list "openssh-v${{ needs.build-x86.outputs.version }}" >/dev/null;then echo "Tag for openssh-v${{ needs.build-x86.outputs.version }} already exists. Skipping release creation." echo "NEW_RELEASE=false" >> $GITHUB_OUTPUT else @@ -127,4 +132,4 @@ jobs: name: openssh-v${{ needs.build-x86.outputs.version }} tag: openssh-v${{ needs.build-x86.outputs.version }} artifacts: "/tmp/releases/*/*" - token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/build-socat.yml b/.github/workflows/build-socat.yml index bee15b4..ef9acfa 100644 --- a/.github/workflows/build-socat.yml +++ b/.github/workflows/build-socat.yml @@ -23,7 +23,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_socat.sh x86 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_socat.outputs.PACKAGED_NAME }} path: ${{ steps.build_socat.outputs.PACKAGED_NAME_PATH }} @@ -47,7 +47,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_socat.sh x86_64 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_socat.outputs.PACKAGED_NAME }} path: ${{ steps.build_socat.outputs.PACKAGED_NAME_PATH }} @@ -79,7 +79,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_socat.sh armhf - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_socat.outputs.PACKAGED_NAME }} path: ${{ steps.build_socat.outputs.PACKAGED_NAME_PATH }} @@ -111,7 +111,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_socat.sh aarch64 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_socat.outputs.PACKAGED_NAME }} path: ${{ steps.build_socat.outputs.PACKAGED_NAME_PATH }} @@ -143,7 +143,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_socat.sh ppc32 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_socat.outputs.PACKAGED_NAME }} path: ${{ steps.build_socat.outputs.PACKAGED_NAME_PATH }} @@ -175,7 +175,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_socat.sh ppc64 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_socat.outputs.PACKAGED_NAME }} path: ${{ steps.build_socat.outputs.PACKAGED_NAME_PATH }} @@ -184,6 +184,8 @@ jobs: name: Create socat Release runs-on: ubuntu-latest needs: [build-x86, build-x86_64, build-armhf, build-aarch64, build-ppc32, build-ppc64] + permissions: + contents: write steps: - name: Checkout uses: actions/checkout@v2 @@ -192,18 +194,21 @@ jobs: run: mkdir /tmp/releases - name: Download Artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: path: /tmp/releases - name: List Artifacts run: ls -laR /tmp/releases + - name: Fetch tags + run: git fetch --tags --prune --quiet + - name: Tag Release id: tag_release run: | set +e - if git rev-list "socat-v${{ needs.build-x86.outputs.version }}".. >/dev/null;then + if git rev-list "socat-v${{ needs.build-x86.outputs.version }}" >/dev/null;then echo "Tag for socat-v${{ needs.build-x86.outputs.version }} already exists. Skipping release creation." echo "NEW_RELEASE=false" >> $GITHUB_OUTPUT else @@ -219,4 +224,4 @@ jobs: name: socat-v${{ needs.build-x86.outputs.version }} tag: socat-v${{ needs.build-x86.outputs.version }} artifacts: "/tmp/releases/*/*" - token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/build-strace.yml b/.github/workflows/build-strace.yml index c5a426a..eacb0f3 100644 --- a/.github/workflows/build-strace.yml +++ b/.github/workflows/build-strace.yml @@ -31,7 +31,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_strace.sh x86 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_strace.outputs.PACKAGED_NAME }} path: ${{ steps.build_strace.outputs.PACKAGED_NAME_PATH }} @@ -55,7 +55,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_strace.sh x86_64 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_strace.outputs.PACKAGED_NAME }} path: ${{ steps.build_strace.outputs.PACKAGED_NAME_PATH }} @@ -87,7 +87,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_strace.sh armhf - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_strace.outputs.PACKAGED_NAME }} path: ${{ steps.build_strace.outputs.PACKAGED_NAME_PATH }} @@ -119,7 +119,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_strace.sh aarch64 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_strace.outputs.PACKAGED_NAME }} path: ${{ steps.build_strace.outputs.PACKAGED_NAME_PATH }} @@ -128,6 +128,8 @@ jobs: name: Create strace Release runs-on: ubuntu-latest needs: [build-x86, build-x86_64, build-armhf, build-aarch64] + permissions: + contents: write steps: - name: Checkout uses: actions/checkout@v2 @@ -136,18 +138,21 @@ jobs: run: mkdir /tmp/releases - name: Download Artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: path: /tmp/releases - name: List Artifacts run: ls -laR /tmp/releases + - name: Fetch tags + run: git fetch --tags --prune --quiet + - name: Tag Release id: tag_release run: | set +e - if git rev-list "strace-v${{ needs.build-x86.outputs.version }}".. >/dev/null;then + if git rev-list "strace-v${{ needs.build-x86.outputs.version }}" >/dev/null;then echo "Tag for strace-v${{ needs.build-x86.outputs.version }} already exists. Skipping release creation." echo "NEW_RELEASE=false" >> $GITHUB_OUTPUT else @@ -163,4 +168,4 @@ jobs: name: strace-v${{ needs.build-x86.outputs.version }} tag: strace-v${{ needs.build-x86.outputs.version }} artifacts: "/tmp/releases/*/*" - token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/build-tcpdump.yml b/.github/workflows/build-tcpdump.yml index 080857c..8c3d391 100644 --- a/.github/workflows/build-tcpdump.yml +++ b/.github/workflows/build-tcpdump.yml @@ -20,7 +20,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_tcpdump.sh x86 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_tcpdump.outputs.PACKAGED_NAME }} path: ${{ steps.build_tcpdump.outputs.PACKAGED_NAME_PATH }} @@ -41,7 +41,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_tcpdump.sh x86_64 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_tcpdump.outputs.PACKAGED_NAME }} path: ${{ steps.build_tcpdump.outputs.PACKAGED_NAME_PATH }} @@ -62,7 +62,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_tcpdump.sh armhf - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_tcpdump.outputs.PACKAGED_NAME }} path: ${{ steps.build_tcpdump.outputs.PACKAGED_NAME_PATH }} @@ -83,7 +83,7 @@ jobs: run: $GITHUB_WORKSPACE/build/targets/build_tcpdump.sh aarch64 - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.build_tcpdump.outputs.PACKAGED_NAME }} path: ${{ steps.build_tcpdump.outputs.PACKAGED_NAME_PATH }} @@ -92,6 +92,8 @@ jobs: name: Create tcpdump Release runs-on: ubuntu-latest needs: [build-x86, build-x86_64, build-armhf, build-aarch64] + permissions: + contents: write steps: - name: Checkout uses: actions/checkout@v2 @@ -100,17 +102,21 @@ jobs: run: mkdir /tmp/releases - name: Download Artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: path: /tmp/releases - name: List Artifacts run: ls -laR /tmp/releases + - name: Fetch tags + run: git fetch --tags --prune --quiet + - name: Tag Release + id: tag_release run: | set +e - if git rev-list "tcpdump-v${{ needs.build-x86.outputs.version }}".. >/dev/null;then + if git rev-list "tcpdump-v${{ needs.build-x86.outputs.version }}" >/dev/null;then echo "Tag for tcpdump-v${{ needs.build-x86.outputs.version }} already exists. Skipping release creation." echo "NEW_RELEASE=false" >> $GITHUB_OUTPUT else diff --git a/build/targets/build_socat.sh b/build/targets/build_socat.sh index 5550a88..be15e6f 100755 --- a/build/targets/build_socat.sh +++ b/build/targets/build_socat.sh @@ -24,7 +24,8 @@ build_socat() { CPPFLAGS="-I${BUILD_DIRECTORY} -I${BUILD_DIRECTORY}/openssl/include -DNETDB_INTERNAL=-1" \ LDFLAGS="-L${BUILD_DIRECTORY}/readline -L${BUILD_DIRECTORY}/ncurses/lib -L${BUILD_DIRECTORY}/openssl" \ ./configure \ - --host="$(get_host_triple)" + --host="$(get_host_triple)" \ + --enable-openssl-method make -j4 strip socat }