Merge remote-tracking branch 'upstream/master'

dmsck · dmsck · commit a37476da0396 · 2022-09-17T15:06:13.000+03:00
Signed-off-by: Dmitry Moskalchuk &lt;dm@crystax.net&gt;
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,13 +6,13 @@ jobs:
   nix:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v13
+    - uses: actions/checkout@v3
+    - uses: cachix/install-nix-action@v17
     - run: nix-build -A hydraJobs.release
   ubuntu:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: get toolchain version
       run: |
         c++ --version
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - uses: cachix/install-nix-action@v13
+        uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v17
       - name: Build tarballs
         run: |
           nix-build -A 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@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: patchelf
           path: dist/*
@@ -36,9 +36,9 @@ jobs:
     steps:
       - name: Set up QEMU
         if: matrix.platform != 'amd64'
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: patchelf
           path: dist
@@ -65,7 +65,7 @@ jobs:
           else
               ENTRYPOINT=
           fi
-          docker run -e CXXFLAGS -v $(pwd):/gha ${{ matrix.platform }}/alpine:3.15 ${ENTRYPOINT} sh -ec "cd /gha && sh ./build.sh"
+          docker run -e CXXFLAGS -v $(pwd):/gha ${{ matrix.platform }}/alpine:3.16 ${ENTRYPOINT} sh -ec "cd /gha && sh ./build.sh"
       - name: Check binaries
         run: |
           cat <<EOF > check.sh
@@ -75,7 +75,7 @@ jobs:
           ./bin/patchelf --version
           EOF
           docker run -v $(pwd):/gha ${{ matrix.platform }}/debian:stable-slim sh -ec "cd /gha && sh ./check.sh"
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: patchelf
           path: dist/*
@@ -86,7 +86,7 @@ jobs:
     if: github.event_name == 'push' && github.repository == 'NixOS/patchelf' && startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: patchelf
           path: dist
diff --git a/README.md b/README.md
@@ -104,163 +104,3 @@ 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/>.
-
-## Release History
-
-0.14.5 (February 21, 2022):
-
-* fix faulty version in 0.14.4
-
-0.14.4 (February 21, 2022):
-
-* Several test fixes to fix patchelf test suite on openbsd by @klemensn
-* Allow multiple modifications in same call by @fzakaria in https://github.com/NixOS/patchelf/pull/361
-* Add support to build with musl by @fzakaria in https://github.com/NixOS/patchelf/pull/362
-* Fix typo: s/folllow/follow/ by @bjornfor in https://github.com/NixOS/patchelf/pull/366
-* mips: fix incorrect polarity on dyn_offset; closes #364 by @a-m-joseph in https://github.com/NixOS/patchelf/pull/365
-
-0.14.3 (December 05, 2021):
-
-* this release adds support for static, pre-compiled patchelf binaries
-
-0.14.2 (November 29, 2021):
-
-* make version number in tarball easier to use for packagers
-
-0.14.1 (November 28, 2021):
-
-* build fix: add missing include
-
-0.14 (November 27, 2021):
-
-Changes compared to 0.13:
-
-* Bug fixes:
-  - Fix corrupted library names when using --replace-needed multiple times
-  - Fix setting an empty rpath
-  - Don't try to parse .dynamic section of type NOBITS
-  - Fix use-after-free in normalizeNoteSegments
-  - Correct EINTR handling in writeFile
-  - MIPS: Adjust PT_MIPS_ABIFLAGS segment and DT_MIPS_RLD_MAP_REL dynamic section if present
-  - Fix binaries without .gnu.hash section
-* Support loongarch architecture
-* Remove limits on output file size for elf files
-* Allow reading rpath from file
-* Requires now C++17 for building
-
-0.13.1 (November 27, 2021):
-
-* Bug fixes:
-  - fix setting empty rpath
-  - use memcpy instead of strcpy to set rpath
-  - Don't try to parse .dynamic section of type NOBITS
-  - fix use-after-free in normalizeNoteSegments
-  - correct EINTR handling in writeFile
-  - Adjust PT_MIPS_ABIFLAGS segment if present
-  - Adjust DT_MIPS_RLD_MAP_REL dynamic section entry if present
-  - fix binaries without .gnu.hash section
-
-0.13 (August 5, 2021):
-
-* New `--add-rpath` flag.
-
-* Bug fixes.
-
-0.12 (August 27, 2020):
-
-* New `--clear-symbol-version` flag.
-
-* Better support for relocating NOTE sections/segments.
-
-* Improved the default section alignment choice.
-
-* Bug fixes.
-
-0.11 (June 9, 2020):
-
-* New `--output` flag.
-
-* Some bug fixes.
-
-0.10 (March 28, 2019):
-
-* Many bug fixes. Please refer to the Git commit log:
-
-    https://github.com/NixOS/patchelf/commits/master
-
-  This release has contributions from Adam Trhoň, Benjamin Hipple,
-  Bernardo Ramos, Bjørn Forsman, Domen Kožar, Eelco Dolstra, Ezra
-  Cooper, Felipe Sateler, Jakub Wilk, James Le Cuirot, Karl Millar,
-  Linus Heckemann, Nathaniel J. Smith, Richard Purdie, Stanislav
-  Markevich and Tuomas Tynkkynen.
-
-0.9 (February 29, 2016):
-
-* Lots of new features. Please refer to the Git commit log:
-
-    https://github.com/NixOS/patchelf/commits/master
-
-  This release has contributions from Aaron D. Marasco, Adrien
-  Devresse, Alexandre Pretyman, Changli Gao, Chingis Dugarzhapov,
-  darealshinji, David Sveningsson, Eelco Dolstra, Felipe Sateler,
-  Jeremy Sanders, Jonas Kuemmerlin, Thomas Tuegel, Tuomas Tynkkynen,
-  Vincent Danjean and Vladimír Čunát.
-
-0.8 (January 15, 2014):
-
-* Fix a segfault caused by certain illegal entries in symbol tables.
-
-0.7 (January 7, 2014):
-
-* Rewrite section indices in symbol tables. This for instance allows
-  gdb to show proper backtraces.
-
-* Added `--remove-needed' option.
-
-0.6 (November 7, 2011):
-
-* Hacky support for executables created by the Gold linker.
-
-* Support segments with an alignment of 0 (contributed by Zack
-  Weinberg).
-
-* Added a manual page (contributed by Jeremy Sanders
-  <jeremy@jeremysanders.net>).
-
-0.5 (November 4, 2009):
-
-* Various bugfixes.
-
-* `--force-rpath' now deletes the DT_RUNPATH if it is present.
-
-0.4 (June 4, 2008):
-
-* Support for growing the RPATH on dynamic libraries.
-
-* IA-64 support (not tested) and related 64-bit fixes.
-
-* FreeBSD support.
-
-* `--set-rpath', `--shrink-rpath' and `--print-rpath' now prefer
-  DT_RUNPATH over DT_RPATH, which is obsolete.  When updating, if both
-  are present, both are updated.  If only DT_RPATH is present, it is
-  converted to DT_RUNPATH unless `--force-rpath' is specified.  If
-  neither is present, a DT_RUNPATH is added unless `--force-rpath' is
-  specified, in which case a DT_RPATH is added.
-
-0.3 (May 24, 2007):
-
-* Support for 64-bit ELF binaries (such as on x86_64-linux).
-
-* Support for big-endian ELF binaries (such as on powerpc-linux).
-
-* Various bugfixes.
-
-0.2 (January 15, 2007):
-
-* Provides a hack to get certain programs (such as the
-  Belastingaangifte 2005) to work.
-
-0.1 (October 11, 2005):
-
-* Initial release.
diff --git a/configure.ac b/configure.ac
@@ -3,11 +3,13 @@ AC_INIT([patchelf], m4_esyscmd([printf $(cat ./version)]))
 AC_CONFIG_SRCDIR([src/patchelf.cc])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([1.11.1 -Wall -Werror dist-bzip2 foreign color-tests parallel-tests])
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_CHECK_TOOL([STRIP], [strip])
 
 AM_PROG_CC_C_O
 AC_PROG_CXX
+AC_LANG([C++])
 AM_PROG_AS
 
 DEFAULT_PAGESIZE=auto
@@ -31,5 +33,12 @@ AC_ARG_WITH([ubsan],
 )
 AM_CONDITIONAL([WITH_UBSAN], [test x"$with_ubsan" = xyes])
 
+CPLUSPLUS=
+AX_CHECK_COMPILE_FLAG([-std=c++17], [CPLUSPLUS=17], [], [$WERROR])
+
+if test -z "$CPLUSPLUS"; then
+  AC_MSG_ERROR([Your compiler does not have the necessary C++17 support! Cannot proceed.])
+fi
+
 AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile patchelf.spec])
 AC_OUTPUT
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
@@ -0,0 +1,53 @@
+# ===========================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the current language's compiler
+#   or gives an error.  (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 6
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_VAR_IF(CACHEVAR,yes,
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/patchelf.1 b/patchelf.1
@@ -1,7 +1,7 @@
 .\" Process this file with
-.\" groff -man -Tascii foo.1
+.\" groff -man -Tascii patchelf.1
 .\"
-.TH PATCHELF 1 "JUNE 2010" PATCHELF "User Manuals"
+.TH PATCHELF 1 "JULY 2022" PATCHELF "User Manuals"
 .SH NAME
 patchelf - Modify ELF files
 
diff --git a/version b/version
@@ -1 +1 @@
-0.14.5
+0.15.0
