diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2016-03-25 15:33:36 +0100 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2016-03-25 15:36:29 +0100 |
| commit | 4e44d1bcfa9acbdab1d9c8e86a363a3db6491928 (patch) | |
| tree | f18a914feb6271191a01d27e557d74dea3664112 /testing/zfs-grsec/0003-Use-the-correct-macro-to-include-backtrace.patch | |
| parent | f7c486c359a63f5fadab9aace1fbbd9e969e318d (diff) | |
| download | aports-4e44d1bcfa9acbdab1d9c8e86a363a3db6491928.tar.bz2 aports-4e44d1bcfa9acbdab1d9c8e86a363a3db6491928.tar.xz | |
testing/zfs-grsec: upgrade to 0.6.5.6 and rebase patches
musl patches have been split and send upstream.
Diffstat (limited to 'testing/zfs-grsec/0003-Use-the-correct-macro-to-include-backtrace.patch')
| -rw-r--r-- | testing/zfs-grsec/0003-Use-the-correct-macro-to-include-backtrace.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/testing/zfs-grsec/0003-Use-the-correct-macro-to-include-backtrace.patch b/testing/zfs-grsec/0003-Use-the-correct-macro-to-include-backtrace.patch new file mode 100644 index 0000000000..9be8757535 --- /dev/null +++ b/testing/zfs-grsec/0003-Use-the-correct-macro-to-include-backtrace.patch @@ -0,0 +1,34 @@ +From d8eadaf30347d1d67e8125ae7c299239d3b730dc Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter <clandmeter@gmail.com> +Date: Tue, 1 Mar 2016 15:23:09 +0100 +Subject: [PATCH 3/8] Use the correct macro to include backtrace + +--- + cmd/ztest/ztest.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c +index 42643ef..a824da9 100644 +--- a/cmd/ztest/ztest.c ++++ b/cmd/ztest/ztest.c +@@ -123,7 +123,7 @@ + #include <math.h> + #include <sys/fs/zfs.h> + #include <libnvpair.h> +-#ifdef __GNUC__ ++#ifdef __GLIBC__ + #include <execinfo.h> /* for backtrace() */ + #endif + +@@ -490,7 +490,7 @@ _umem_logging_init(void) + static void sig_handler(int signo) + { + struct sigaction action; +-#ifdef __GNUC__ /* backtrace() is a GNU extension */ ++#ifdef __GLIBC__ /* backtrace() is a GNU extension */ + int nptrs; + void *buffer[BACKTRACE_SZ]; + +-- +2.7.2 + |