Skip to content

Commit 8da3138

Browse files
committed
Query hardening flags directly from Debian
Also, add links to Debian's apache2 configure bits to make it clear why we add extra flags on top of this.
1 parent f9239e6 commit 8da3138

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

2.4/Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,21 @@ RUN set -eux; \
111111
patches $HTTPD_PATCHES; \
112112
\
113113
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
114+
CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
115+
CPPFLAGS="$(dpkg-buildflags --get CPPFLAGS)"; \
116+
LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
114117
./configure \
115118
--build="$gnuArch" \
116119
--prefix="$HTTPD_PREFIX" \
117120
--enable-mods-shared=reallyall \
118121
--enable-mpms-shared=all \
122+
# enable the same hardening flags as Debian
123+
# - https://salsa.debian.org/apache-team/apache2/blob/87db7de4e59683fb03e97900f078d06ef2292748/debian/rules#L19-21
124+
# - https://salsa.debian.org/apache-team/apache2/blob/87db7de4e59683fb03e97900f078d06ef2292748/debian/rules#L115
119125
--enable-pie \
120-
CFLAGS="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security" \
121-
CPPFLAGS="-D_FORTIFY_SOURCE=2" \
122-
LDFLAGS="-Wl,--as-needed -Wl,-z,relro -Wl,-z,now" \
126+
CFLAGS="-pipe $CFLAGS" \
127+
CPPFLAGS="$CPPFLAGS" \
128+
LDFLAGS="-Wl,--as-needed $LDFLAGS" \
123129
; \
124130
make -j "$(nproc)"; \
125131
make install; \

0 commit comments

Comments
 (0)