Merge branch '0.15-maintenance' into 0.16-maintenance

Author: Ericson2314

.editorconfig

@@ -0,0 +1,26 @@
+# EditorConfig configuration for PatchELF
+# http://EditorConfig.org
+
+# Top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file, UTF-8 charset
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+# Match Nix files, set indent to spaces with width of two
+[*.nix]
+indent_style = space
+indent_size = 2
+
+# Match C++/C/shell, set indent to spaces with width of four
+[*.{hpp,cc,hh,c,h,sh}]
+indent_style = space
+indent_size = 4
+
+# Match diffs, avoid to trim trailing whitespace
+[*.{diff,patch}]
+trim_trailing_whitespace = false

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Manual nixfmt run
+706478750fc8574ed816ef746d3ad3790b2ea66a

.github/workflows/ci.yml

@@ -1,18 +1,24 @@
 name: "CI"
 on:
   pull_request:
+  merge_group:
   push:
 jobs:
+  shellcheck:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - run: shellcheck tests/*.sh
   nix:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: cachix/install-nix-action@v18
+    - uses: actions/checkout@v4
+    - uses: cachix/install-nix-action@v31
     - run: nix-build -A hydraJobs.release
   ubuntu:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: get toolchain version
       run: |
         c++ --version

.github/workflows/publish.yml

@@ -1,6 +1,7 @@
 name: Publish
 on:
   pull_request:
+  merge_group:
   push:
     branches:
       - '*'
@@ -13,19 +14,54 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v18
+        uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v31
       - name: Build tarballs
         run: |
-          nix-build -A hydraJobs.tarball
+          nix build -L .#hydraJobs.tarball
           install -D ./result/tarballs/*.tar.bz2 ./dist/patchelf-$(cat version).tar.bz2
           install -D ./result/tarballs/*.tar.gz ./dist/patchelf-$(cat version).tar.gz
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: patchelf
+          name: patchelf-tarball
           path: dist/*
 
-  build_binaries:
+  build_windows:
+    name: Build windows executable
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v31
+      - name: Build windows executable
+        run: |
+          nix build -L .#patchelf-win32 .#patchelf-win64
+          install -D ./result/bin/patchelf.exe ./dist/patchelf-win32-$(cat version).exe
+          install -D ./result-1/bin/patchelf.exe ./dist/patchelf-win64-$(cat version).exe
+      - uses: actions/upload-artifact@v4
+        with:
+          name: patchelf-windows
+          path: dist/*
+
+  test_windows:
+    name: Test windows binaries
+    needs: [build_windows]
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v5
+        with:
+          name: patchelf-windows
+          path: dist
+      - name: Show binaries
+        run: dir .\\dist
+      - name: Test windows 64-bit binary
+        run: .\\dist\\patchelf-win32-*.exe --version
+
+      - name: Test windows 32-bit binary
+        run: .\\dist\\patchelf-win64-*.exe --version
+
+  build_musl:
     name: Build static musl binaries
     needs: [build_tarballs]
     runs-on: ubuntu-latest
@@ -36,11 +72,21 @@ jobs:
     steps:
       - name: Set up QEMU
         if: matrix.platform != 'amd64'
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set docker arch
+        run: |
+          platform=${{ matrix.platform }}
+          if [[ $platform == arm64v8 ]]; then
+            platform=arm64
+          elif [[ $platform == arm32v7 ]]; then
+            platform=arm
+          fi
+          echo "DOCKER_PLATFORM=$platform" >> $GITHUB_ENV
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v5
         with:
-          name: patchelf
+          name: patchelf-tarball
           path: dist
       - name: Build binaries
         env:
@@ -54,7 +100,7 @@ jobs:
           rm -f dist/*
           cd patchelf-*
           ./configure --prefix /patchelf
-          make check
+          make check || (cat tests/test-suite.log; exit 1)
           make install-strip
           cd -
           tar -czf ./dist/patchelf-\$(cat patchelf-*/version)-\$(uname -m).tar.gz -C /patchelf .
@@ -65,7 +111,7 @@ jobs:
           else
               ENTRYPOINT=
           fi
-          docker run -e CXXFLAGS -v $(pwd):/gha ${{ matrix.platform }}/alpine:edge ${ENTRYPOINT} sh -ec "cd /gha && sh ./build.sh"
+          docker run --platform "$DOCKER_PLATFORM" -e CXXFLAGS -v $(pwd):/gha ${{ matrix.platform }}/alpine:edge ${ENTRYPOINT} sh -ec "cd /gha && sh ./build.sh"
       - name: Check binaries
         run: |
           cat <<EOF > check.sh
@@ -74,21 +120,22 @@ jobs:
           tar -xf ./dist/patchelf-*-*.tar.gz
           ./bin/patchelf --version
           EOF
-          docker run -v $(pwd):/gha ${{ matrix.platform }}/debian:unstable-slim sh -ec "cd /gha && sh ./check.sh"
-      - uses: actions/upload-artifact@v3
+          docker run --platform "$DOCKER_PLATFORM" -v $(pwd):/gha ${{ matrix.platform }}/debian:unstable-slim sh -ec "cd /gha && sh ./check.sh"
+      - uses: actions/upload-artifact@v4
         with:
-          name: patchelf
+          name: patchelf-${{ matrix.platform }}
           path: dist/*
 
   publish:
     name: Publish tarballs & binaries
-    needs: [build_tarballs, build_binaries]
+    needs: [build_tarballs, build_windows, build_musl]
     if: github.event_name == 'push' && github.repository == 'NixOS/patchelf' && startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v5
         with:
-          name: patchelf
+          pattern: patchelf-*
+          merge-multiple: true
           path: dist
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2

.gitignore

@@ -18,6 +18,8 @@ Makefile
 .deps
 *.o
 
+CMakeLists.txt.user
+
 /tests/*.log
 /tests/*.trs
 /tests/no-rpath
@@ -32,6 +34,7 @@ Makefile
 /tests/libbig-dynstr.debug
 /tests/contiguous-note-sections
 /tests/simple-pie
+/tests/simple-execstack
 
 .direnv/
 .vscode/

.mergify.yml

@@ -0,0 +1,26 @@
+queue_rules:
+  - name: default
+    merge_conditions:
+      - check-success=Build static musl binaries (amd64)
+      - check-success=Build static musl binaries (arm32v7)
+      - check-success=Build static musl binaries (arm64v8)
+      - check-success=Build static musl binaries (i386)
+      - check-success=Build static musl binaries (ppc64le)
+      - check-success=Build static musl binaries (riscv64)
+      - check-success=Build static musl binaries (s390x)
+      - check-success=Build tarballs
+      - check-success=Build windows executable
+      - check-success=Publish tarballs & binaries
+      - check-success=Test windows binaries
+      - check-success=nix
+      - check-success=shellcheck
+      - check-success=ubuntu
+    merge_method: rebase
+    batch_size: 5
+pull_request_rules:
+  - name: merge using the merge queue
+    conditions:
+      - base=master
+      - label~=merge-queue|dependencies
+    actions:
+      queue: {}

CMakeLists.txt

@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(patchelf)
+
+file(READ version VERSION)
+
+include(GNUInstallDirs)
+
+add_subdirectory(src)
+# add_subdirectory(tests) # TODO
+
+install(FILES patchelf.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+
+install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})

COPYING

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.