From f58eeaae2ea634ac387432d4df3035bc953d63c8 Mon Sep 17 00:00:00 2001 From: dim Date: Tue, 15 Feb 2011 22:03:09 +0000 Subject: Fix some leftover binaries and shared libraries in the system that still have an executable stack, due to linking in hand-assembled .S or .s files, that have no .GNU-stack sections: RWX --- --- /lib/libcrypto.so.6 RWX --- --- /lib/libmd.so.5 RWX --- --- /lib/libz.so.6 RWX --- --- /lib/libzpool.so.2 RWX --- --- /usr/lib/liblzma.so.5 These were found using scanelf, from the sysutils/pax-utils port. Reviewed by: kib --- lib/liblzma/Makefile | 1 + lib/libmd/Makefile | 7 +++++-- lib/libz/Makefile | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile index 927fe8c..8d614cf 100644 --- a/lib/liblzma/Makefile +++ b/lib/liblzma/Makefile @@ -78,6 +78,7 @@ SRCS+= check.c \ .if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386" SRCS+= crc32_x86.S \ crc64_x86.S +ACFLAGS+= -Wa,--noexecstack .else SRCS+= crc32_fast.c \ crc64_fast.c diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index ba1ebc0..ff35105 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -43,11 +43,14 @@ CFLAGS+= -I${.CURDIR} .if exists(${MACHINE_ARCH}/sha.S) SRCS+= sha.S -CFLAGS+= -DSHA1_ASM -DELF +CFLAGS+= -DSHA1_ASM .endif .if exists(${MACHINE_ARCH}/rmd160.S) SRCS+= rmd160.S -CFLAGS+= -DRMD160_ASM -DELF +CFLAGS+= -DRMD160_ASM +.endif +.if exists(${MACHINE_ARCH}/sha.S) || exists(${MACHINE_ARCH}/rmd160.S) +ACFLAGS+= -DELF -Wa,--noexecstack .endif md2hl.c: mdXhl.c diff --git a/lib/libz/Makefile b/lib/libz/Makefile index 8835e0d..1343c6f 100644 --- a/lib/libz/Makefile +++ b/lib/libz/Makefile @@ -39,12 +39,14 @@ SRCS+= zutil.c .PATH: ${.CURDIR}/contrib/asm686 SRCS+= match.S CFLAGS+= -DASMV -DNO_UNDERLINE +ACFLAGS+= -Wa,--noexecstack .endif .if ${MACHINE_ARCH} == "amd64" .PATH: ${.CURDIR}/contrib/gcc_gvmat64 SRCS+= gvmat64.S CFLAGS+= -DASMV -DNO_UNDERLINE +ACFLAGS+= -Wa,--noexecstack .endif VERSION_DEF= ${.CURDIR}/Versions.def -- cgit v1.1