diff options
author | William Pitcock <nenolod@dereferenced.org> | 2018-02-16 17:12:23 +0000 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2018-02-16 17:12:23 +0000 |
commit | 0d72273a6ae5e5770064854cd761b895fd318abd (patch) | |
tree | 93cf817ec8c1e8b21b6dbdfc1238c27c0c80c729 /main/zip/20-zip-3.0-exec-stack.patch | |
parent | 4c04396cfb5122619d0fa40a8f455e9542b02181 (diff) |
main/zip: fix patches to work with default_prepare
Diffstat (limited to 'main/zip/20-zip-3.0-exec-stack.patch')
-rw-r--r-- | main/zip/20-zip-3.0-exec-stack.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/zip/20-zip-3.0-exec-stack.patch b/main/zip/20-zip-3.0-exec-stack.patch index d85fb117b08..5bf78d7da96 100644 --- a/main/zip/20-zip-3.0-exec-stack.patch +++ b/main/zip/20-zip-3.0-exec-stack.patch @@ -1,7 +1,7 @@ add proper GNU stack markings so we dont get the default: executable ---- crc_i386.S Wed Jan 28 22:22:13 2009 -+++ crc_i386.S Wed Jan 28 22:27:04 2009 +--- a/crc_i386.S Wed Jan 28 22:22:13 2009 ++++ b/crc_i386.S Wed Jan 28 22:27:04 2009 @@ -302,3 +302,7 @@ #endif /* i386 || _i386 || _I386 || __i386 */ @@ -10,8 +10,8 @@ add proper GNU stack markings so we dont get the default: executable +#if defined __ELF__ && defined __linux__ +.section .note.GNU-stack,"",@progbits +#endif ---- match.S Wed Jan 28 22:22:13 2009 -+++ match.S Wed Jan 28 22:27:04 2009 +--- a/match.S Wed Jan 28 22:22:13 2009 ++++ b/match.S Wed Jan 28 22:27:04 2009 @@ -405,3 +405,7 @@ #endif /* i386 || _I386 || _i386 || __i386 */ |