Update wordpress

[tianon]

Changes:

• docker-library/wordpress@78a4952: Merge pull request Fix ldd logic for bookworm/usrmerge wordpress#834 from infosiftr/fix-ldd
• docker-library/wordpress@7c79eeb: Fix ldd logic for bookworm/usrmerge

[github-actions]

Diff for 05981cf:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3eef2a5..a161e4b 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,12 +3,12 @@ GitRepo: https://github.com/docker-library/wordpress.git
 
 Tags: 6.2.2-apache, 6.2-apache, 6-apache, apache, 6.2.2, 6.2, 6, latest, 6.2.2-php8.0-apache, 6.2-php8.0-apache, 6-php8.0-apache, php8.0-apache, 6.2.2-php8.0, 6.2-php8.0, 6-php8.0, php8.0
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a0aacf3dbe87fde423bde4ef292dc1a929025d36
+GitCommit: 7c79eeb7a24484fa9a5aca3161947c821b6b1e0e
 Directory: latest/php8.0/apache
 
 Tags: 6.2.2-fpm, 6.2-fpm, 6-fpm, fpm, 6.2.2-php8.0-fpm, 6.2-php8.0-fpm, 6-php8.0-fpm, php8.0-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6fa05d9ba94e7cb48a53ff90878cc6fc777f7986
+GitCommit: 7c79eeb7a24484fa9a5aca3161947c821b6b1e0e
 Directory: latest/php8.0/fpm
 
 Tags: 6.2.2-fpm-alpine, 6.2-fpm-alpine, 6-fpm-alpine, fpm-alpine, 6.2.2-php8.0-fpm-alpine, 6.2-php8.0-fpm-alpine, 6-php8.0-fpm-alpine, php8.0-fpm-alpine
@@ -18,12 +18,12 @@ Directory: latest/php8.0/fpm-alpine
 
 Tags: 6.2.2-php8.1-apache, 6.2-php8.1-apache, 6-php8.1-apache, php8.1-apache, 6.2.2-php8.1, 6.2-php8.1, 6-php8.1, php8.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a0aacf3dbe87fde423bde4ef292dc1a929025d36
+GitCommit: 7c79eeb7a24484fa9a5aca3161947c821b6b1e0e
 Directory: latest/php8.1/apache
 
 Tags: 6.2.2-php8.1-fpm, 6.2-php8.1-fpm, 6-php8.1-fpm, php8.1-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6fa05d9ba94e7cb48a53ff90878cc6fc777f7986
+GitCommit: 7c79eeb7a24484fa9a5aca3161947c821b6b1e0e
 Directory: latest/php8.1/fpm
 
 Tags: 6.2.2-php8.1-fpm-alpine, 6.2-php8.1-fpm-alpine, 6-php8.1-fpm-alpine, php8.1-fpm-alpine
@@ -33,12 +33,12 @@ Directory: latest/php8.1/fpm-alpine
 
 Tags: 6.2.2-php8.2-apache, 6.2-php8.2-apache, 6-php8.2-apache, php8.2-apache, 6.2.2-php8.2, 6.2-php8.2, 6-php8.2, php8.2
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a0aacf3dbe87fde423bde4ef292dc1a929025d36
+GitCommit: 7c79eeb7a24484fa9a5aca3161947c821b6b1e0e
 Directory: latest/php8.2/apache
 
 Tags: 6.2.2-php8.2-fpm, 6.2-php8.2-fpm, 6-php8.2-fpm, php8.2-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6fa05d9ba94e7cb48a53ff90878cc6fc777f7986
+GitCommit: 7c79eeb7a24484fa9a5aca3161947c821b6b1e0e
 Directory: latest/php8.2/fpm
 
 Tags: 6.2.2-php8.2-fpm-alpine, 6.2-php8.2-fpm-alpine, 6-php8.2-fpm-alpine, php8.2-fpm-alpine
diff --git a/wordpress_php8.0-fpm/Dockerfile b/wordpress_php8.0-fpm/Dockerfile
index 893ae5e..1c48650 100644
--- a/wordpress_php8.0-fpm/Dockerfile
+++ b/wordpress_php8.0-fpm/Dockerfile
@@ -61,9 +61,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/wordpress_php8.0/Dockerfile b/wordpress_php8.0/Dockerfile
index f4ed393..7530524 100644
--- a/wordpress_php8.0/Dockerfile
+++ b/wordpress_php8.0/Dockerfile
@@ -61,9 +61,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/wordpress_php8.1-fpm/Dockerfile b/wordpress_php8.1-fpm/Dockerfile
index 57b2304..02234fc 100644
--- a/wordpress_php8.1-fpm/Dockerfile
+++ b/wordpress_php8.1-fpm/Dockerfile
@@ -61,9 +61,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/wordpress_php8.1/Dockerfile b/wordpress_php8.1/Dockerfile
index cab48d9..e2bc6f5 100644
--- a/wordpress_php8.1/Dockerfile
+++ b/wordpress_php8.1/Dockerfile
@@ -61,9 +61,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/wordpress_php8.2-fpm/Dockerfile b/wordpress_php8.2-fpm/Dockerfile
index 132740c..120cc16 100644
--- a/wordpress_php8.2-fpm/Dockerfile
+++ b/wordpress_php8.2-fpm/Dockerfile
@@ -61,9 +61,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/wordpress_php8.2/Dockerfile b/wordpress_php8.2/Dockerfile
index 9545535..5967d31 100644
--- a/wordpress_php8.2/Dockerfile
+++ b/wordpress_php8.2/Dockerfile
@@ -61,9 +61,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; \

Relevant Maintainers:

• wordpress: @tianon @yosifkit