From c9cc3661ef0064e4b2242360ecce780ffc825daa Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 26 Jan 2024 14:06:52 +0200 Subject: [PATCH] Fix ldd logic for bookworm/usrmerge. --- 4.3/php8.1/apache/Dockerfile | 4 ++-- 4.3/php8.1/fpm/Dockerfile | 4 ++-- 4.3/php8.2/apache/Dockerfile | 4 ++-- 4.3/php8.2/fpm/Dockerfile | 4 ++-- 4.4/php8.1/apache/Dockerfile | 4 ++-- 4.4/php8.1/fpm/Dockerfile | 4 ++-- 4.4/php8.2/apache/Dockerfile | 4 ++-- 4.4/php8.2/fpm/Dockerfile | 4 ++-- 5.0/php8.1/apache/Dockerfile | 4 ++-- 5.0/php8.1/fpm/Dockerfile | 4 ++-- 5.0/php8.2/apache/Dockerfile | 4 ++-- 5.0/php8.2/fpm/Dockerfile | 4 ++-- Dockerfile.template | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/4.3/php8.1/apache/Dockerfile b/4.3/php8.1/apache/Dockerfile index 023cf6c..5331d23 100644 --- a/4.3/php8.1/apache/Dockerfile +++ b/4.3/php8.1/apache/Dockerfile @@ -89,9 +89,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \ diff --git a/4.3/php8.1/fpm/Dockerfile b/4.3/php8.1/fpm/Dockerfile index df93712..44664ad 100644 --- a/4.3/php8.1/fpm/Dockerfile +++ b/4.3/php8.1/fpm/Dockerfile @@ -89,9 +89,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \ diff --git a/4.3/php8.2/apache/Dockerfile b/4.3/php8.2/apache/Dockerfile index be9e930..d7ae162 100644 --- a/4.3/php8.2/apache/Dockerfile +++ b/4.3/php8.2/apache/Dockerfile @@ -89,9 +89,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \ diff --git a/4.3/php8.2/fpm/Dockerfile b/4.3/php8.2/fpm/Dockerfile index 65bd58c..4556cca 100644 --- a/4.3/php8.2/fpm/Dockerfile +++ b/4.3/php8.2/fpm/Dockerfile @@ -89,9 +89,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \ diff --git a/4.4/php8.1/apache/Dockerfile b/4.4/php8.1/apache/Dockerfile index 4bc19bd..291f440 100644 --- a/4.4/php8.1/apache/Dockerfile +++ b/4.4/php8.1/apache/Dockerfile @@ -89,9 +89,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \ diff --git a/4.4/php8.1/fpm/Dockerfile b/4.4/php8.1/fpm/Dockerfile index 1431127..bd89733 100644 --- a/4.4/php8.1/fpm/Dockerfile +++ b/4.4/php8.1/fpm/Dockerfile @@ -89,9 +89,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \ diff --git a/4.4/php8.2/apache/Dockerfile b/4.4/php8.2/apache/Dockerfile index 229ec34..aa44fb9 100644 --- a/4.4/php8.2/apache/Dockerfile +++ b/4.4/php8.2/apache/Dockerfile @@ -89,9 +89,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \ diff --git a/4.4/php8.2/fpm/Dockerfile b/4.4/php8.2/fpm/Dockerfile index 2251004..a2cb835 100644 --- a/4.4/php8.2/fpm/Dockerfile +++ b/4.4/php8.2/fpm/Dockerfile @@ -89,9 +89,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \ diff --git a/5.0/php8.1/apache/Dockerfile b/5.0/php8.1/apache/Dockerfile index 5d55b1c..9703261 100644 --- a/5.0/php8.1/apache/Dockerfile +++ b/5.0/php8.1/apache/Dockerfile @@ -91,9 +91,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \ diff --git a/5.0/php8.1/fpm/Dockerfile b/5.0/php8.1/fpm/Dockerfile index 4c7b1b3..a5e154c 100644 --- a/5.0/php8.1/fpm/Dockerfile +++ b/5.0/php8.1/fpm/Dockerfile @@ -91,9 +91,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \ diff --git a/5.0/php8.2/apache/Dockerfile b/5.0/php8.2/apache/Dockerfile index 4d9fbc2..f5dd441 100644 --- a/5.0/php8.2/apache/Dockerfile +++ b/5.0/php8.2/apache/Dockerfile @@ -91,9 +91,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \ diff --git a/5.0/php8.2/fpm/Dockerfile b/5.0/php8.2/fpm/Dockerfile index e7b5b82..106747a 100644 --- a/5.0/php8.2/fpm/Dockerfile +++ b/5.0/php8.2/fpm/Dockerfile @@ -91,9 +91,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \ diff --git a/Dockerfile.template b/Dockerfile.template index 40cc00d..6b36537 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -157,9 +157,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \