Upgrade to apache 2.4.58

alpine/Dockerfile

@@ -27,11 +27,10 @@ RUN set -eux; \
 		perl \
 	;
 
-ENV HTTPD_VERSION 2.4.57
-ENV HTTPD_SHA256 dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a
+ENV HTTPD_VERSION 2.4.58
+ENV HTTPD_SHA256 fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5
 
-# https://httpd.apache.org/security/vulnerabilities_24.html
-ENV HTTPD_PATCHES="rewrite-windows-testchar-h.patch 1d5620574fa03b483262dc5b9a66a6906553389952ab5d3070a02f887cc20193"
+ENV HTTPD_PATCHES=""
 
 # see https://httpd.apache.org/docs/2.4/install.html#requirements
 RUN set -eux; \

debian/Dockerfile

@@ -23,11 +23,10 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*
 
-ENV HTTPD_VERSION 2.4.57
-ENV HTTPD_SHA256 dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a
+ENV HTTPD_VERSION 2.4.58
+ENV HTTPD_SHA256 fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5
 
-# https://httpd.apache.org/security/vulnerabilities_24.html
-ENV HTTPD_PATCHES="rewrite-windows-testchar-h.patch 1d5620574fa03b483262dc5b9a66a6906553389952ab5d3070a02f887cc20193"
+ENV HTTPD_PATCHES=""
 
 # see https://httpd.apache.org/docs/2.4/install.html#requirements
 RUN set -eux; \

debian/Readme.md

@@ -5,19 +5,19 @@ your non-related EEA projects.
 
  - Debian: **Buster**
  - Alpine: **3.13**
- - Apache: **2.4.57**
+ - Apache: **2.4.58**
  - Expose: **80**
 
 > **_NOTE:_** Debian Bullseye needs docker >= 18 in order to work. File permissions are not functional with older versions of docker. Use alpine version on hosts with older versions of docker.
 
 ### Supported tags and respective Dockerfile links
 
-  - `:latest` [*Dockerfile*](https://github.com/eea/eea.docker.apache/blob/master/debian/Dockerfile) - Debian: **Buster**, Apache: **2.4.57**
-  - `:alpine` [*Dockerfile*](https://github.com/eea/eea.docker.apache/blob/master/alpine/Dockerfile) - Alpine: **3.13**, Apache: **2.4.57**
+  - `:latest` [*Dockerfile*](https://github.com/eea/eea.docker.apache/blob/master/debian/Dockerfile) - Debian: **Buster**, Apache: **2.4.58**
+  - `:alpine` [*Dockerfile*](https://github.com/eea/eea.docker.apache/blob/master/alpine/Dockerfile) - Alpine: **3.13**, Apache: **2.4.58**
 
 ### Stable and immutable tags
-  - `:2.4-3.0` [*Dockerfile*](https://github.com/eea/eea.docker.apache/tree/2.4-3.0/debian/Dockerfile) -  Debian: **Buster** Apache: **2.4.57** Release: **3.0**
-  - `:2.4-3.0-alpine` [*Dockerfile*](https://github.com/eea/eea.docker.apache/tree/2.4-3.0-alpine/alpine/Dockerfile) - Alpine: **3.13** Apache: **2.4.57** Release: **3.0**
+  - `:2.4-3.1` [*Dockerfile*](https://github.com/eea/eea.docker.apache/tree/2.4-3.1/debian/Dockerfile) -  Debian: **Buster** Apache: **2.4.58** Release: **3.1**
+  - `:2.4-3.1-alpine` [*Dockerfile*](https://github.com/eea/eea.docker.apache/tree/2.4-3.1-alpine/alpine/Dockerfile) - Alpine: **3.13** Apache: **2.4.58** Release: **3.1**
 
 See [older versions](https://github.com/eea/eea.docker.apache/releases)