mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-01-08 23:00:10 +01:00
Merge pull request #96 from zabbix/master
PIE (ASLR) mitigation + Full RELRO mitigation
This commit is contained in:
commit
2da6081c7a
@ -43,6 +43,7 @@ RUN apk update && \
|
|||||||
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
./bootstrap.sh 1>/dev/null && \
|
./bootstrap.sh 1>/dev/null && \
|
||||||
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--silent \
|
--silent \
|
||||||
|
@ -50,6 +50,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
./bootstrap.sh 1>/dev/null && \
|
./bootstrap.sh 1>/dev/null && \
|
||||||
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--silent \
|
--silent \
|
||||||
|
@ -70,6 +70,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
./bootstrap.sh 1>/dev/null && \
|
./bootstrap.sh 1>/dev/null && \
|
||||||
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--silent \
|
--silent \
|
||||||
|
@ -78,6 +78,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
./bootstrap.sh 1>/dev/null && \
|
./bootstrap.sh 1>/dev/null && \
|
||||||
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--silent \
|
--silent \
|
||||||
|
@ -66,6 +66,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
./bootstrap.sh 1>/dev/null && \
|
./bootstrap.sh 1>/dev/null && \
|
||||||
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--silent \
|
--silent \
|
||||||
|
@ -76,6 +76,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
./bootstrap.sh 1>/dev/null && \
|
./bootstrap.sh 1>/dev/null && \
|
||||||
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--silent \
|
--silent \
|
||||||
|
@ -71,6 +71,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
./bootstrap.sh 1>/dev/null && \
|
./bootstrap.sh 1>/dev/null && \
|
||||||
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--silent \
|
--silent \
|
||||||
|
@ -79,6 +79,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
./bootstrap.sh 1>/dev/null && \
|
./bootstrap.sh 1>/dev/null && \
|
||||||
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--silent \
|
--silent \
|
||||||
|
@ -71,6 +71,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
./bootstrap.sh 1>/dev/null && \
|
./bootstrap.sh 1>/dev/null && \
|
||||||
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--silent \
|
--silent \
|
||||||
|
@ -79,6 +79,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
./bootstrap.sh 1>/dev/null && \
|
./bootstrap.sh 1>/dev/null && \
|
||||||
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--silent \
|
--silent \
|
||||||
|
Loading…
Reference in New Issue
Block a user