From b1bde6cf0c66303dd1fdaf5a556fae0581184191 Mon Sep 17 00:00:00 2001 From: zhanchengbin Date: Mon, 13 Sep 2021 19:48:42 +0800 Subject: [PATCH] Makefile add fstack-protector-strong flag patch (cherry picked from commit a2218b6084cb9d18e93ea600dd98873ebf0c7a28) --- ...ile-add-fstack-protector-strong-flag.patch | 26 +++++++++++++++++++ blktrace.spec | 6 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0017-blktrace-Makefile-add-fstack-protector-strong-flag.patch diff --git a/0017-blktrace-Makefile-add-fstack-protector-strong-flag.patch b/0017-blktrace-Makefile-add-fstack-protector-strong-flag.patch new file mode 100644 index 0000000..db476be --- /dev/null +++ b/0017-blktrace-Makefile-add-fstack-protector-strong-flag.patch @@ -0,0 +1,26 @@ +From 1e60db1dfd320d8b22dcb3e7d4636fcda12ec6dd Mon Sep 17 00:00:00 2001 +From: zhanchengbin +Date: Mon, 13 Sep 2021 19:42:31 +0800 +Subject: [PATCH] blktrace: Makefile add fstack-protector-strong flag + +Makefile add fstack-protector-strong flag + +Signed-off-by: zhanchengbin +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index fdbded0..dbdbb37 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + CC = gcc +-CFLAGS = -Wall -O2 -g -W ++CFLAGS = -Wall -O2 -g -W -fstack-protector-strong + ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 + PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon + LIBS = -lpthread +-- +1.8.3.1 + diff --git a/blktrace.spec b/blktrace.spec index 754c5fa..be32da5 100644 --- a/blktrace.spec +++ b/blktrace.spec @@ -1,6 +1,6 @@ Name: blktrace Version: 1.2.0 -Release: 20 +Release: 21 Summary: Block IO tracer in the Linux kernel License: GPLv2+ Source: http://brick.kernel.dk/snaps/blktrace-%{version}.tar.bz2 @@ -25,6 +25,7 @@ Patch13: 0013-blkparse-Fix-device-in-event-tracking-error-messages.patch Patch14: 0014-blkparse-Allow-request-tracking-on-non-md-dm-devices.patch Patch15: 0015-blkparse-Initialize-and-test-for-undefined-request-t.patch Patch16: 0016-blktrace-fix-exit-directly-when-nthreads-running.patch +Patch17: 0017-blktrace-Makefile-add-fstack-protector-strong-flag.patch %description blktrace is a block layer IO tracing mechanism which provides detailed @@ -89,6 +90,9 @@ comparing the differences between different benchmark runs. %{_mandir}/man1/iowatcher.* %changelog +* Mon Sep 13 2021 zhanchengbin - 1.2.0-21 +- DESC: Makefile add fstack-protector-srtong flag patch + * Fri Jul 30 2021 chenyanpanHW - 1.2.0-20 - DESC: delete -Sgit from %autosetup, and delete BuildRequires git -- Gitee