From f58eeaae2ea634ac387432d4df3035bc953d63c8 Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
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/libmd/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib/libmd/Makefile')

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
-- 
cgit v1.1