Merge branch 'jb50399' into 'master'

[upgrade] Upgrade patchelf to 0.11. JB#50399

See merge request mer-core/patchelf!1

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "upstream"]
+	path = upstream
+	url = https://git.sailfishos.org/mirror/patchelf.git

rpm/0001-Disable-failing-test.patch

@@ -0,0 +1,17 @@
+From 8b8b9314def61a71b8859cade17f13bcb83171ce Wed, 22 Jul 2020 13:17:20 +0200
+From: Andrew Branson <andrew.branson@jolla.com>
+Date: Wed, 22 Jul 2020 13:16:34 +0200
+Subject: [PATCH] Disable failing test
+
+diff --git a/tests/set-interpreter-long.sh b/tests/set-interpreter-long.sh
+index 058ccd2..438c375 100755
+--- a/tests/set-interpreter-long.sh
++++ b/tests/set-interpreter-long.sh
+@@ -28,7 +28,3 @@
+ ln -s "$oldInterpreter" "$newInterpreter"
+ ${SCRATCH}/simple
+
+-if test "$(uname)" = Linux; then
+-    echo "running with explicit interpreter..."
+-    "$oldInterpreter" ${SCRATCH}/simple
+-fi

patchelf.spec → rpm/patchelf.spec

@@ -1,64 +1,39 @@
-# 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.24.1
-# 
-
 Name:       patchelf
-
-# >> macros
-# << macros
-
 Summary:    A utility for patching ELF binaries
-Version:    0.6
+Version:    0.11
 Release:    1
-Group:      Development/Tools
-License:    GPLv3
+License:    GPLv3+
 URL:        http://nixos.org/patchelf.html
-Source0:    http://hydra.nixos.org/build/1524660/download/2/patchelf-0.6.tar.bz2
-Source100:  patchelf.yaml
+Source0:    %{name}-%{version}.tar.bz2
+Patch0:     0001-Disable-failing-test.patch
 
 %description
 PatchELF is a simple utility for modifing existing ELF executables and
 libraries.  It can change the dynamic loader ("ELF interpreter") of
 executables and change the RPATH of executables and libraries.
 
-
-
 %prep
-%setup -q -n %{name}-%{version}
-
-# >> setup
-# << setup
+%autosetup -p1 -n %{name}-%{version}/upstream
 
 %build
-# >> build pre
 autoreconf -v -f -i
-# << build pre
 
 %configure --disable-static
 make %{?jobs:-j%jobs}
 
-# >> build post
 %if ! 0%{?qemu_user_space_build}
 make check
 %endif
-# << build post
 
 %install
 rm -rf %{buildroot}
-# >> install pre
-# << install pre
 %make_install
 
-# >> install post
 strip $RPM_BUILD_ROOT/%{_prefix}/bin/* || true
-# << install post
-
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/man
 
 %files
 %defattr(-,root,root,-)
+%license COPYING
 %{_bindir}/patchelf
-%{_datadir}/doc/patchelf/README
-%{_datadir}/man/man1/patchelf.1.gz
-# >> files
-# << files
+%{_datadir}/doc/patchelf/README.md