From 10210491364c21ba6b37e48dcae826fa052c91a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Po=C5=BAniak?= <marcin.pozniak@intel.com>
Date: Tue, 11 Apr 2023 11:27:13 +0200
Subject: [PATCH 01/16] Update python to 3.11 and rename python build script to
 3.11

---
 pyi.Dockerfile                                     | 6 +++---
 scripts/{python310_build.sh => python311_build.sh} | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename scripts/{python310_build.sh => python311_build.sh} (76%)

diff --git a/pyi.Dockerfile b/pyi.Dockerfile
index 29f5caf1f..8d6509e5b 100644
--- a/pyi.Dockerfile
+++ b/pyi.Dockerfile
@@ -159,8 +159,8 @@ RUN yum install -y \
     yum clean all
 COPY ./scripts/openssl_build.sh .
 RUN ./openssl_build.sh
-COPY ./scripts/python310_build.sh .
-RUN ./python310_build.sh
+COPY ./scripts/python311_build.sh .
+RUN ./python311_build.sh
 
 # bcc part
 # TODO: copied from the main Dockerfile... but modified a lot. we'd want to share it some day.
@@ -232,7 +232,7 @@ RUN set -e; \
 # needed for aarch64, scons & wheel are needed to build staticx
 RUN set -e; \
     if [ "$(uname -m)" = "aarch64" ]; then \
-         ln -s /usr/lib64/python3.10/lib-dynload /usr/lib/python3.10/lib-dynload; \
+         ln -s /usr/lib64/python3.11/lib-dynload /usr/lib/python3.11/lib-dynload; \
     fi
 RUN set -e; \
     if [ "$(uname -m)" = "aarch64" ]; then \
diff --git a/scripts/python310_build.sh b/scripts/python311_build.sh
similarity index 76%
rename from scripts/python310_build.sh
rename to scripts/python311_build.sh
index b37ca7da5..3a2745b78 100755
--- a/scripts/python310_build.sh
+++ b/scripts/python311_build.sh
@@ -5,8 +5,8 @@
 #
 set -euo pipefail
 
-wget https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tgz
-tar -xzf Python-3.10.8.tgz
-cd Python-3.10.8
+wget https://www.python.org/ftp/python/3.11.3/Python-3.11.3.tgz
+tar -xzf Python-3.11.3.tgz
+cd Python-3.11.3
 ./configure --enable-optimizations --enable-shared --prefix=/usr LDFLAGS="-Wl,-rpath /usr/lib" --with-openssl=/usr --with-lto
 make python install -j "$(nproc)"

From dd2429834ab737fa16d8a9e4b429b1cd9ce9c9af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Po=C5=BAniak?= <marcin.pozniak@intel.com>
Date: Wed, 12 Apr 2023 15:51:26 +0200
Subject: [PATCH 02/16] Use make altinstall to install python3

---
 scripts/python311_build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/python311_build.sh b/scripts/python311_build.sh
index 3a2745b78..effb2444f 100755
--- a/scripts/python311_build.sh
+++ b/scripts/python311_build.sh
@@ -8,5 +8,5 @@ set -euo pipefail
 wget https://www.python.org/ftp/python/3.11.3/Python-3.11.3.tgz
 tar -xzf Python-3.11.3.tgz
 cd Python-3.11.3
-./configure --enable-optimizations --enable-shared --prefix=/usr LDFLAGS="-Wl,-rpath /usr/lib" --with-openssl=/usr --with-lto
-make python install -j "$(nproc)"
+./configure --enable-optimizations --enable-shared --prefix=/usr
+make -j "$(nproc)" && make -j "$(nproc)" altinstall

From 90f396fae9b54457a89b6d7a8ca5c1e5a1355225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Po=C5=BAniak?= <marcin.pozniak@intel.com>
Date: Thu, 13 Apr 2023 09:45:46 +0200
Subject: [PATCH 03/16] Use LDFLAGS when building python 3.11

---
 scripts/python311_build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/python311_build.sh b/scripts/python311_build.sh
index effb2444f..01ae3755e 100755
--- a/scripts/python311_build.sh
+++ b/scripts/python311_build.sh
@@ -8,5 +8,6 @@ set -euo pipefail
 wget https://www.python.org/ftp/python/3.11.3/Python-3.11.3.tgz
 tar -xzf Python-3.11.3.tgz
 cd Python-3.11.3
-./configure --enable-optimizations --enable-shared --prefix=/usr
+./configure --enable-optimizations --enable-shared --prefix=/usr LDFLAGS="-Wl,-rpath /usr/lib"
 make -j "$(nproc)" && make -j "$(nproc)" altinstall
+ln -s /usr/bin/python3.11 /usr/bin/python3
\ No newline at end of file

From f5b3061eb17c5f19bceeb0fa72f02a41be113b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Po=C5=BAniak?= <marcin.pozniak@intel.com>
Date: Thu, 13 Apr 2023 15:47:19 +0200
Subject: [PATCH 04/16] Update pyinstaller version, link python3.11 to python3
 in prepare-stage

---
 exe-requirements.txt       | 2 +-
 pyi.Dockerfile             | 3 ++-
 scripts/python311_build.sh | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/exe-requirements.txt b/exe-requirements.txt
index 7dc7c3fee..85376159c 100644
--- a/exe-requirements.txt
+++ b/exe-requirements.txt
@@ -1,5 +1,5 @@
 # requirements for the standalone executable
-pyinstaller==4.6; platform.machine == "x86_64"
+pyinstaller==5.6; platform.machine == "x86_64"
 # aarch64 requires a later version due to the use of a newer centos version.
 # see https://github.com/pyinstaller/pyinstaller/issues/5540
 pyinstaller==4.10; platform.machine == "aarch64" or sys.platform == "win32"
diff --git a/pyi.Dockerfile b/pyi.Dockerfile
index 8d6509e5b..ffd8cdff8 100644
--- a/pyi.Dockerfile
+++ b/pyi.Dockerfile
@@ -145,7 +145,7 @@ RUN if grep -q "CentOS Linux 8" /etc/os-release ; then \
         ./fix_centos8.sh; \
     fi
 
-# python 3.10 installation
+# python 3.11 installation
 WORKDIR /python
 RUN yum install -y \
     bzip2-devel \
@@ -161,6 +161,7 @@ COPY ./scripts/openssl_build.sh .
 RUN ./openssl_build.sh
 COPY ./scripts/python311_build.sh .
 RUN ./python311_build.sh
+RUN ln -s /usr/bin/python3.11 /usr/bin/python3
 
 # bcc part
 # TODO: copied from the main Dockerfile... but modified a lot. we'd want to share it some day.
diff --git a/scripts/python311_build.sh b/scripts/python311_build.sh
index 01ae3755e..a8188826d 100755
--- a/scripts/python311_build.sh
+++ b/scripts/python311_build.sh
@@ -8,6 +8,5 @@ set -euo pipefail
 wget https://www.python.org/ftp/python/3.11.3/Python-3.11.3.tgz
 tar -xzf Python-3.11.3.tgz
 cd Python-3.11.3
-./configure --enable-optimizations --enable-shared --prefix=/usr LDFLAGS="-Wl,-rpath /usr/lib"
+./configure --enable-shared --prefix=/usr LDFLAGS="-Wl,-rpath /usr/lib"
 make -j "$(nproc)" && make -j "$(nproc)" altinstall
-ln -s /usr/bin/python3.11 /usr/bin/python3
\ No newline at end of file

From 96392c8188f3cd8eec1a8ef2ddd752aee3f04d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Po=C5=BAniak?= <marcin.pozniak@intel.com>
Date: Fri, 14 Apr 2023 08:55:04 +0200
Subject: [PATCH 05/16] Use one command RUN

---
 pyi.Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyi.Dockerfile b/pyi.Dockerfile
index ffd8cdff8..a49437e42 100644
--- a/pyi.Dockerfile
+++ b/pyi.Dockerfile
@@ -160,8 +160,8 @@ RUN yum install -y \
 COPY ./scripts/openssl_build.sh .
 RUN ./openssl_build.sh
 COPY ./scripts/python311_build.sh .
-RUN ./python311_build.sh
-RUN ln -s /usr/bin/python3.11 /usr/bin/python3
+RUN ./python311_build.sh && \ 
+    ln -s /usr/bin/python3.11 /usr/bin/python3
 
 # bcc part
 # TODO: copied from the main Dockerfile... but modified a lot. we'd want to share it some day.

From 1a8ef757b444ed2251ead0f9cda2efa2eca3e363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Po=C5=BAniak?= <marcin.pozniak@intel.com>
Date: Fri, 21 Apr 2023 13:57:48 +0200
Subject: [PATCH 06/16] Change reference to granulate-utils

---
 granulate-utils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/granulate-utils b/granulate-utils
index f35752f1c..b5f0b9898 160000
--- a/granulate-utils
+++ b/granulate-utils
@@ -1 +1 @@
-Subproject commit f35752f1c5e59486080ee998ab1f571002b293b5
+Subproject commit b5f0b9898a37c949ae0c2a2dea127590621cc14d

From 4d3b58e435b9761e065ff8ad361ffbdef049e782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Po=C5=BAniak?= <marcin.pozniak@intel.com>
Date: Thu, 27 Apr 2023 12:17:09 +0200
Subject: [PATCH 07/16] Change reference of granulate-utils to commit
 mpozniak95 fork to check pipeline

---
 granulate-utils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/granulate-utils b/granulate-utils
index b5f0b9898..0c127f524 160000
--- a/granulate-utils
+++ b/granulate-utils
@@ -1 +1 @@
-Subproject commit b5f0b9898a37c949ae0c2a2dea127590621cc14d
+Subproject commit 0c127f524c05b3d08c15385fc0e5295c5efa4e23

From 1f19205bbe024067b40d7fa20a27cd8fc9a26baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Po=C5=BAniak?= <marcin.pozniak@intel.com>
Date: Thu, 27 Apr 2023 12:29:04 +0200
Subject: [PATCH 08/16] Change reference to fork

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 9b53eef8f..74a47e6ad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "granulate-utils"]
 	path = granulate-utils
-	url = git@github.com:Granulate/granulate-utils.git
+	url = https://github.com/mpozniak95/granulate-utils.git

From b9c14c81fdfc36cdd930a0c355f6ab6846c1a699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Po=C5=BAniak?= <marcin.pozniak@intel.com>
Date: Thu, 4 May 2023 16:11:52 +0200
Subject: [PATCH 09/16] Use latest commit of branch update_grpcio in
 granulate_utils

---
 granulate-utils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/granulate-utils b/granulate-utils
index 0c127f524..2742cdf0e 160000
--- a/granulate-utils
+++ b/granulate-utils
@@ -1 +1 @@
-Subproject commit 0c127f524c05b3d08c15385fc0e5295c5efa4e23
+Subproject commit 2742cdf0e9bca6a690e1bb7a91ed4993cf25e77a

From 64c36a5847924f163230f71e06f1c93dbc7e4c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Po=C5=BAniak?= <marcin.pozniak@intel.com>
Date: Wed, 7 Jun 2023 09:42:51 +0200
Subject: [PATCH 10/16] Change granulate-utils submodule back to
 granulate/granulate-utils

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 74a47e6ad..9b53eef8f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "granulate-utils"]
 	path = granulate-utils
-	url = https://github.com/mpozniak95/granulate-utils.git
+	url = git@github.com:Granulate/granulate-utils.git

From 22d7508b41953340ef2b4c956ccb8f5642a97881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Po=C5=BAniak?= <marcin.pozniak@intel.com>
Date: Wed, 7 Jun 2023 09:44:48 +0200
Subject: [PATCH 11/16] Checkout upgrade-grpcio branch that upgrades grpcio to
 1.54.2

---
 granulate-utils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/granulate-utils b/granulate-utils
index 2742cdf0e..2898e70e0 160000
--- a/granulate-utils
+++ b/granulate-utils
@@ -1 +1 @@
-Subproject commit 2742cdf0e9bca6a690e1bb7a91ed4993cf25e77a
+Subproject commit 2898e70e0f77dbcc35ffecc90145256d0986d502

From 0bc1f97efb1120c79644ce5f7c40c6f7cfe274c2 Mon Sep 17 00:00:00 2001
From: slicklash <slicklash@gmail.com>
Date: Mon, 8 Jul 2024 13:27:35 +0300
Subject: [PATCH 12/16] up

---
 scripts/python311_build.sh | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100755 scripts/python311_build.sh

diff --git a/scripts/python311_build.sh b/scripts/python311_build.sh
deleted file mode 100755
index a8188826d..000000000
--- a/scripts/python311_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) Granulate. All rights reserved.
-# Licensed under the AGPL3 License. See LICENSE.md in the project root for license information.
-#
-set -euo pipefail
-
-wget https://www.python.org/ftp/python/3.11.3/Python-3.11.3.tgz
-tar -xzf Python-3.11.3.tgz
-cd Python-3.11.3
-./configure --enable-shared --prefix=/usr LDFLAGS="-Wl,-rpath /usr/lib"
-make -j "$(nproc)" && make -j "$(nproc)" altinstall

From 0ab12492424c1bc51c9429b9a12b0e13d2dc9cf8 Mon Sep 17 00:00:00 2001
From: slicklash <slicklash@gmail.com>
Date: Mon, 8 Jul 2024 13:28:05 +0300
Subject: [PATCH 13/16] up

---
 scripts/{python310_build.sh => python311_build.sh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename scripts/{python310_build.sh => python311_build.sh} (100%)

diff --git a/scripts/python310_build.sh b/scripts/python311_build.sh
similarity index 100%
rename from scripts/python310_build.sh
rename to scripts/python311_build.sh

From e47b6e57c2cae1830ce17643e1dd9dea75b78661 Mon Sep 17 00:00:00 2001
From: slicklash <slicklash@gmail.com>
Date: Mon, 8 Jul 2024 13:31:56 +0300
Subject: [PATCH 14/16] up

---
 scripts/python311_build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/python311_build.sh b/scripts/python311_build.sh
index 97d5c841e..0b6be3d9a 100755
--- a/scripts/python311_build.sh
+++ b/scripts/python311_build.sh
@@ -16,10 +16,10 @@
 #
 set -euo pipefail
 
-VERSION=3.10.13
+VERSION=3.11.9
 
 wget "https://www.python.org/ftp/python/$VERSION/Python-$VERSION.tgz"
 tar -xzf "Python-$VERSION.tgz"
 cd "Python-$VERSION"
 ./configure --enable-optimizations --enable-shared --prefix=/usr LDFLAGS="-Wl,-rpath /usr/lib" --with-openssl=/usr --with-lto
-make python install -j "$(nproc)"
+make -j "$(nproc)" && make python install -j "$(nproc)"

From 47b3e2e3db1e181ef533cdf632426804401d6a63 Mon Sep 17 00:00:00 2001
From: slicklash <slicklash@gmail.com>
Date: Tue, 9 Jul 2024 17:00:00 +0300
Subject: [PATCH 15/16] fix segfault when building with staticx 0.14.1

---
 exe-requirements.txt       | 15 +++------------
 executable.Dockerfile      | 20 +++++++-------------
 scripts/python311_build.sh |  2 +-
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/exe-requirements.txt b/exe-requirements.txt
index 85376159c..c5916f7aa 100644
--- a/exe-requirements.txt
+++ b/exe-requirements.txt
@@ -1,13 +1,4 @@
 # requirements for the standalone executable
-pyinstaller==5.6; platform.machine == "x86_64"
-# aarch64 requires a later version due to the use of a newer centos version.
-# see https://github.com/pyinstaller/pyinstaller/issues/5540
-pyinstaller==4.10; platform.machine == "aarch64" or sys.platform == "win32"
-# for aarch64 we build a slightly patched version
-# I tried upgrading to 0.13.6 but it crashes when the botoloader is run as non-root :/
-# I got this error in gdb:
-# (gdb) run
-# Starting program: /path/to/build/x86_64/gprofiler
-# During startup program terminated with signal SIGSEGV, Segmentation fault.
-# staying with 0.12.1 for the mean time...
-staticx==0.12.1; platform.machine == "x86_64"
+pyinstaller==5.13.2
+wheel==0.37.0
+scons==4.2.0
diff --git a/executable.Dockerfile b/executable.Dockerfile
index 2bbabfd3c..d235b1328 100644
--- a/executable.Dockerfile
+++ b/executable.Dockerfile
@@ -169,8 +169,7 @@ RUN yum install -y \
 COPY ./scripts/openssl_build.sh .
 RUN ./openssl_build.sh
 COPY ./scripts/python311_build.sh .
-RUN ./python311_build.sh && \ 
-    ln -s /usr/bin/python3.11 /usr/bin/python3
+RUN ./python311_build.sh
 
 # gProfiler part
 
@@ -179,24 +178,17 @@ WORKDIR /app
 RUN yum --setopt=skip_missing_names_on_install=False install -y \
         gcc \
         curl \
+        glibc-static \
         libicu && \
     yum clean all
 
 # needed for aarch64 (for staticx)
 RUN set -e; \
     if [ "$(uname -m)" = "aarch64" ]; then \
-        yum install -y glibc-static zlib-devel.aarch64 && \
+        ln -s /usr/lib64/python3.11/lib-dynload /usr/lib/python3.11/lib-dynload && \
+        yum install -y zlib-devel.aarch64 && \
         yum clean all; \
     fi
-# needed for aarch64, scons & wheel are needed to build staticx
-RUN set -e; \
-    if [ "$(uname -m)" = "aarch64" ]; then \
-         ln -s /usr/lib64/python3.11/lib-dynload /usr/lib/python3.11/lib-dynload; \
-    fi
-RUN set -e; \
-    if [ "$(uname -m)" = "aarch64" ]; then \
-        python3 -m pip install --no-cache-dir 'wheel==0.37.0' 'scons==4.2.0'; \
-    fi
 
 # we want the latest pip
 # hadolint ignore=DL3013
@@ -228,7 +220,8 @@ COPY granulate-utils/glogger granulate-utils/glogger
 RUN python3 -m pip install --no-cache-dir -r requirements.txt
 
 COPY exe-requirements.txt exe-requirements.txt
-RUN python3 -m pip install --no-cache-dir -r exe-requirements.txt
+RUN python3 -m pip install --no-cache-dir -r exe-requirements.txt && \
+    python3 -m pip install --no-cache-dir --no-binary=:all: staticx==0.14.1 # fixes gprofiler segfault
 
 # copy PyPerf, licenses and notice file.
 RUN mkdir -p gprofiler/resources/ruby && \
@@ -280,6 +273,7 @@ RUN pyinstaller pyinstaller.spec \
 # for aarch64 - build a patched version of staticx 0.13.6. we remove calls to getpwnam and getgrnam, for these end up doing dlopen()s which
 # crash the staticx bootloader. we don't need them anyway (all files in our staticx tar are uid 0 and we don't need the names translation)
 COPY scripts/staticx_patch.diff staticx_patch.diff
+# TODO: fix me
 # hadolint ignore=DL3003
 RUN if [ "$(uname -m)" = "aarch64" ]; then \
         git clone -b v0.13.6 https://github.com/JonathonReinhart/staticx.git && \
diff --git a/scripts/python311_build.sh b/scripts/python311_build.sh
index 0b6be3d9a..6e90c21e4 100755
--- a/scripts/python311_build.sh
+++ b/scripts/python311_build.sh
@@ -21,5 +21,5 @@ VERSION=3.11.9
 wget "https://www.python.org/ftp/python/$VERSION/Python-$VERSION.tgz"
 tar -xzf "Python-$VERSION.tgz"
 cd "Python-$VERSION"
-./configure --enable-optimizations --enable-shared --prefix=/usr LDFLAGS="-Wl,-rpath /usr/lib" --with-openssl=/usr --with-lto
+./configure --enable-optimizations --enable-shared --prefix=/usr LDFLAGS="-Wl,-rpath /usr/lib"
 make -j "$(nproc)" && make python install -j "$(nproc)"

From 2a286573440c2d46d4577593ee89c63fd975c46b Mon Sep 17 00:00:00 2001
From: slicklash <slicklash@gmail.com>
Date: Fri, 12 Jul 2024 17:03:43 +0300
Subject: [PATCH 16/16] update staticx version for aarch64

---
 executable.Dockerfile      | 11 +++--------
 scripts/pyperf_env.sh      |  7 +++----
 scripts/staticx_patch.diff | 28 ----------------------------
 3 files changed, 6 insertions(+), 40 deletions(-)
 delete mode 100644 scripts/staticx_patch.diff

diff --git a/executable.Dockerfile b/executable.Dockerfile
index d235b1328..9457ee18e 100644
--- a/executable.Dockerfile
+++ b/executable.Dockerfile
@@ -121,7 +121,6 @@ COPY --from=perf-builder /bpftool /bpftool
 
 WORKDIR /bcc
 COPY scripts/staticx_for_pyperf_patch.diff .
-COPY scripts/staticx_patch.diff .
 COPY scripts/bcc_helpers_build.sh .
 COPY scripts/pyperf_env.sh .
 RUN ./pyperf_env.sh --with-staticx
@@ -270,16 +269,12 @@ RUN pyinstaller pyinstaller.spec \
     && test -f build/pyinstaller/warn-pyinstaller.txt \
     && ./check_pyinstaller.sh
 
-# for aarch64 - build a patched version of staticx 0.13.6. we remove calls to getpwnam and getgrnam, for these end up doing dlopen()s which
-# crash the staticx bootloader. we don't need them anyway (all files in our staticx tar are uid 0 and we don't need the names translation)
-COPY scripts/staticx_patch.diff staticx_patch.diff
-# TODO: fix me
+# for aarch64 - build a patched version of staticx
 # hadolint ignore=DL3003
 RUN if [ "$(uname -m)" = "aarch64" ]; then \
-        git clone -b v0.13.6 https://github.com/JonathonReinhart/staticx.git && \
+        git clone -b v0.14.1 https://github.com/JonathonReinhart/staticx.git && \
         cd staticx && \
-        git reset --hard 819d8eafecbaab3646f70dfb1e3e19f6bbc017f8 && \
-        git apply ../staticx_patch.diff && \
+        git reset --hard 033d694a6fbf0ab0952cf0ff4a476269828167af && \
         ln -s libnss_files.so.2 /lib64/libnss_files.so && \
         ln -s libnss_dns.so.2 /lib64/libnss_dns.so && \
         python3 -m pip install --no-cache-dir . ; \
diff --git a/scripts/pyperf_env.sh b/scripts/pyperf_env.sh
index 19ec1e7d9..6c36b63fd 100755
--- a/scripts/pyperf_env.sh
+++ b/scripts/pyperf_env.sh
@@ -55,15 +55,14 @@ if [ -n "$with_staticx" ]; then
     if [ "$(uname -m)" = "aarch64" ]; then
         exit 0;
     fi
-    git clone -b v0.13.6 https://github.com/JonathonReinhart/staticx.git
+    git clone -b v0.14.1 https://github.com/JonathonReinhart/staticx.git
     # We're using staticx to build a distribution-independent binary of PyPerf because PyPerf
     # can only build with latest llvm (>10), which cannot be obtained on CentOS.
     cd staticx
-    git reset --hard 819d8eafecbaab3646f70dfb1e3e19f6bbc017f8
+    git reset --hard 033d694a6fbf0ab0952cf0ff4a476269828167af
     # - apply patch to ensure staticx bootloader propagates dump signal to actual PyPerf binary
-    # - apply patch removing calls to getpwnam and getgrnam,
     # to avoid crashing the staticx bootloader on ubuntu:22.04+ and centos:8+
-    git apply ../staticx_for_pyperf_patch.diff ../staticx_patch.diff
+    git apply ../staticx_for_pyperf_patch.diff
     python3 -m pip install --no-cache-dir .
     cd ..
     rm -rf staticx
diff --git a/scripts/staticx_patch.diff b/scripts/staticx_patch.diff
deleted file mode 100644
index 7a57167a6..000000000
--- a/scripts/staticx_patch.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/libtar/decode.c b/libtar/decode.c
-index b34b1d9..d221c3a 100644
---- a/libtar/decode.c
-+++ b/libtar/decode.c
-@@ -44,11 +44,6 @@ uid_t
- th_get_uid(const TAR *t)
- {
- 	int uid;
--	struct passwd *pw;
--
--	pw = getpwnam(t->th_buf.uname);
--	if (pw != NULL)
--		return pw->pw_uid;
- 
- 	/* if the password entry doesn't exist */
- 	sscanf(t->th_buf.uid, "%o", &uid);
-@@ -60,11 +55,6 @@ gid_t
- th_get_gid(const TAR *t)
- {
- 	int gid;
--	struct group *gr;
--
--	gr = getgrnam(t->th_buf.gname);
--	if (gr != NULL)
--		return gr->gr_gid;
- 
- 	/* if the group entry doesn't exist */
- 	sscanf(t->th_buf.gid, "%o", &gid);