Update httpd

[yosifkit]

Changes:

• docker-library/httpd@d401fd6: Merge pull request Alpine 3.18 httpd#233 from J0WI/alpine-3.18
• docker-library/httpd@b84fbb5: Merge pull request Update list of patches to apply (and add "patch" for applying them) httpd#232 from infosiftr/patch
• docker-library/httpd@7b96615: Alpine 3.18
• docker-library/httpd@ef41771: Update list of patches to apply (and add "patch" for applying them)
• docker-library/httpd@eee9da7: Merge pull request Remove explicit dirmngr reference httpd#231 from infosiftr/dirmngr
• docker-library/httpd@d443497: Remove explicit dirmngr reference

[github-actions]

Diff for 86e5d60:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index ab16ac6..b7a0a95 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,10 +3,10 @@ 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
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 7d6139b45f2e9a3146c2062894aca949cba91bba
+GitCommit: ef41771bcc6367657fdbf1cdae028f2e1e32d222
 Directory: 2.4
 
-Tags: 2.4.57-alpine, 2.4-alpine, 2-alpine, alpine, 2.4.57-alpine3.17, 2.4-alpine3.17, 2-alpine3.17, alpine3.17
+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: 7d6139b45f2e9a3146c2062894aca949cba91bba
+GitCommit: d401fd69b9ecb158fcd921f22d54bd2890cedc84
 Directory: 2.4/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 6ae08e0..970df7a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,16 +1,16 @@
 httpd:2
 httpd:2-alpine
-httpd:2-alpine3.17
+httpd:2-alpine3.18
 httpd:2-bullseye
 httpd:2.4
 httpd:2.4-alpine
-httpd:2.4-alpine3.17
+httpd:2.4-alpine3.18
 httpd:2.4-bullseye
 httpd:2.4.57
 httpd:2.4.57-alpine
-httpd:2.4.57-alpine3.17
+httpd:2.4.57-alpine3.18
 httpd:2.4.57-bullseye
 httpd:alpine
-httpd:alpine3.17
+httpd:alpine3.18
 httpd:bullseye
 httpd:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 305fbb6..ab173de 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,2 +1,2 @@
 httpd:bullseye
-httpd:alpine3.17
+httpd:alpine3.18
diff --git a/httpd_alpine3.17/Dockerfile b/httpd_alpine3.18/Dockerfile
similarity index 98%
rename from httpd_alpine3.17/Dockerfile
rename to httpd_alpine3.18/Dockerfile
index bd16346..949a741 100644
--- a/httpd_alpine3.17/Dockerfile
+++ b/httpd_alpine3.18/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18
 
 # ensure www-data user exists
 RUN set -x \
@@ -30,7 +30,7 @@ ENV HTTPD_VERSION 2.4.57
 ENV HTTPD_SHA256 dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a
 
 # https://httpd.apache.org/security/vulnerabilities_24.html
-ENV HTTPD_PATCHES=""
+ENV HTTPD_PATCHES="rewrite-windows-testchar-h.patch 1d5620574fa03b483262dc5b9a66a6906553389952ab5d3070a02f887cc20193"
 
 # see https://httpd.apache.org/docs/2.4/install.html#requirements
 RUN set -eux; \
@@ -43,6 +43,7 @@ RUN set -eux; \
 		gcc \
 		gnupg \
 		libc-dev \
+		patch \
 		# mod_md
 		curl-dev \
 		jansson-dev \
diff --git a/httpd_alpine3.17/httpd-foreground b/httpd_alpine3.18/httpd-foreground
similarity index 100%
rename from httpd_alpine3.17/httpd-foreground
rename to httpd_alpine3.18/httpd-foreground
diff --git a/httpd_bullseye/Dockerfile b/httpd_bullseye/Dockerfile
index 8989631..6bd14bd 100644
--- a/httpd_bullseye/Dockerfile
+++ b/httpd_bullseye/Dockerfile
@@ -26,7 +26,7 @@ ENV HTTPD_VERSION 2.4.57
 ENV HTTPD_SHA256 dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a
 
 # https://httpd.apache.org/security/vulnerabilities_24.html
-ENV HTTPD_PATCHES=""
+ENV HTTPD_PATCHES="rewrite-windows-testchar-h.patch 1d5620574fa03b483262dc5b9a66a6906553389952ab5d3070a02f887cc20193"
 
 # see https://httpd.apache.org/docs/2.4/install.html#requirements
 RUN set -eux; \
@@ -37,7 +37,6 @@ RUN set -eux; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		bzip2 \
-		dirmngr \
 		dpkg-dev \
 		gcc \
 		gnupg \
@@ -52,6 +51,7 @@ RUN set -eux; \
 		libssl-dev \
 		libxml2-dev \
 		make \
+		patch \
 		wget \
 		zlib1g-dev \
 	; \
@@ -159,7 +159,7 @@ RUN set -eux; \
 		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
 	gpg --batch --verify httpd.tar.bz2.asc httpd.tar.bz2; \
-	command -v gpgconf && gpgconf --kill all || :; \
+	gpgconf --kill all; \
 	rm -rf "$GNUPGHOME" httpd.tar.bz2.asc; \
 	\
 	mkdir -p src; \

Relevant Maintainers:

• httpd: @tianon @yosifkit