Update httpd

[tianon]

Changes:

• docker-library/httpd@242f3c6: Merge pull request Move to Debian 12 (bookworm) httpd#235 from bilhackmac/master
• docker-library/httpd@c75f0f7: Move to Debian 12 (bookworm)
• docker-library/httpd@84fab6b: Merge pull request Update to Debian bookworm httpd#236 from infosiftr/bookworm
• docker-library/httpd@c87146e: Update to Debian bookworm

[github-actions]

Diff for 3e6e4da:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index b7a0a95..d247f81 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,12 +1,12 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/httpd.git
 
-Tags: 2.4.57, 2.4, 2, latest, 2.4.57-bullseye, 2.4-bullseye, 2-bullseye, bullseye
+Tags: 2.4.57, 2.4, 2, latest, 2.4.57-bookworm, 2.4-bookworm, 2-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ef41771bcc6367657fdbf1cdae028f2e1e32d222
+GitCommit: 242f3c62ba1ceee0a3633045fc4fd9277cb86cd3
 Directory: 2.4
 
 Tags: 2.4.57-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.57-alpine3.18, 2.4-alpine3.18, 2-alpine3.18, alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d401fd69b9ecb158fcd921f22d54bd2890cedc84
+GitCommit: c87146e71508462f0ebd5de9890a0f8bb3b98c8f
 Directory: 2.4/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 970df7a..5f93ac5 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,16 +1,16 @@
 httpd:2
 httpd:2-alpine
 httpd:2-alpine3.18
-httpd:2-bullseye
+httpd:2-bookworm
 httpd:2.4
 httpd:2.4-alpine
 httpd:2.4-alpine3.18
-httpd:2.4-bullseye
+httpd:2.4-bookworm
 httpd:2.4.57
 httpd:2.4.57-alpine
 httpd:2.4.57-alpine3.18
-httpd:2.4.57-bullseye
+httpd:2.4.57-bookworm
 httpd:alpine
 httpd:alpine3.18
-httpd:bullseye
+httpd:bookworm
 httpd:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index ab173de..7b4847f 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,2 +1,2 @@
-httpd:bullseye
+httpd:bookworm
 httpd:alpine3.18
diff --git a/httpd_alpine3.18/Dockerfile b/httpd_alpine3.18/Dockerfile
index 949a741..5694d7d 100644
--- a/httpd_alpine3.18/Dockerfile
+++ b/httpd_alpine3.18/Dockerfile
@@ -93,7 +93,7 @@ RUN set -eux; \
 # see https://httpd.apache.org/download.cgi#verify
 	ddist 'httpd.tar.bz2.asc' "httpd/httpd-$HTTPD_VERSION.tar.bz2.asc"; \
 	export GNUPGHOME="$(mktemp -d)"; \
-# $ docker run --rm buildpack-deps:bullseye-curl bash -c 'wget -qO- https://downloads.apache.org/httpd/KEYS | gpg --batch --import &> /dev/null && gpg --batch --list-keys --with-fingerprint --with-colons' | awk -F: '$1 == "pub" && $2 == "-" { pub = 1 } pub && $1 == "fpr" { fpr = $10 } $1 == "sub" { pub = 0 } pub && fpr && $1 == "uid" && $2 == "-" { print "#", $10; print "\t\t" fpr " \\"; pub = 0 }'
+# $ docker run --rm buildpack-deps:bookworm-curl bash -c 'wget -qO- https://downloads.apache.org/httpd/KEYS | gpg --batch --import &> /dev/null && gpg --batch --list-keys --with-fingerprint --with-colons' | awk -F: '$1 == "pub" && $2 == "-" { pub = 1 } pub && $1 == "fpr" { fpr = $10 } $1 == "sub" { pub = 0 } pub && fpr && $1 == "uid" && $2 == "-" { print "#", $10; print "\t\t" fpr " \\"; pub = 0 }'
 	for key in \
 # Rodent of Unusual Size (DSA) <coar@ACM.Org>
 		DE29FB3971E71543FD2DC049508EAEC5302DA568 \
diff --git a/httpd_bullseye/Dockerfile b/httpd_bookworm/Dockerfile
similarity index 97%
rename from httpd_bullseye/Dockerfile
rename to httpd_bookworm/Dockerfile
index 6bd14bd..ec80dec 100644
--- a/httpd_bullseye/Dockerfile
+++ b/httpd_bookworm/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 #RUN groupadd -r www-data && useradd -r --create-home -g www-data www-data
@@ -85,7 +85,7 @@ RUN set -eux; \
 # see https://httpd.apache.org/download.cgi#verify
 	ddist 'httpd.tar.bz2.asc' "httpd/httpd-$HTTPD_VERSION.tar.bz2.asc"; \
 	export GNUPGHOME="$(mktemp -d)"; \
-# $ docker run --rm buildpack-deps:bullseye-curl bash -c 'wget -qO- https://downloads.apache.org/httpd/KEYS | gpg --batch --import &> /dev/null && gpg --batch --list-keys --with-fingerprint --with-colons' | awk -F: '$1 == "pub" && $2 == "-" { pub = 1 } pub && $1 == "fpr" { fpr = $10 } $1 == "sub" { pub = 0 } pub && fpr && $1 == "uid" && $2 == "-" { print "#", $10; print "\t\t" fpr " \\"; pub = 0 }'
+# $ docker run --rm buildpack-deps:bookworm-curl bash -c 'wget -qO- https://downloads.apache.org/httpd/KEYS | gpg --batch --import &> /dev/null && gpg --batch --list-keys --with-fingerprint --with-colons' | awk -F: '$1 == "pub" && $2 == "-" { pub = 1 } pub && $1 == "fpr" { fpr = $10 } $1 == "sub" { pub = 0 } pub && fpr && $1 == "uid" && $2 == "-" { print "#", $10; print "\t\t" fpr " \\"; pub = 0 }'
 	for key in \
 # Rodent of Unusual Size (DSA) <coar@ACM.Org>
 		DE29FB3971E71543FD2DC049508EAEC5302DA568 \
@@ -218,7 +218,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { print $(NF-1) }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query --search \
 		| cut -d: -f1 \
diff --git a/httpd_bullseye/httpd-foreground b/httpd_bookworm/httpd-foreground
similarity index 100%
rename from httpd_bullseye/httpd-foreground
rename to httpd_bookworm/httpd-foreground

Relevant Maintainers:

• httpd: @tianon @yosifkit