diff --git a/0004-add-fstack-protector-strong.patch b/0004-add-fstack-protector-strong.patch new file mode 100644 index 0000000000000000000000000000000000000000..b687a137163f65ff81c3e4497561e29a68a77ca5 --- /dev/null +++ b/0004-add-fstack-protector-strong.patch @@ -0,0 +1,25 @@ +From 77bbe25994a890408ec48969854d9f038a3e25cc Mon Sep 17 00:00:00 2001 +From: liangdong +Date: Wed, 18 Mar 2020 12:11:15 +0800 +Subject: [PATCH] add fstack-protector-strong + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 1316b3c..4b1782a 100755 +--- a/configure ++++ b/configure +@@ -474,7 +474,7 @@ case "$ccfamily" in + -fno-builtin-memcmp"; + internal_cflags="$gcc_warnings";; + gcc-*) +- common_cflags="-O2 -fno-strict-aliasing -fwrapv"; ++ common_cflags="-O2 -fno-strict-aliasing -fwrapv -fstack-protector-strong"; + internal_cflags="$gcc_warnings";; + *) + common_cflags="-O";; +-- +2.19.1 + diff --git a/ocaml.spec b/ocaml.spec index e461591343df8430af8c374002cab466f498e277..3bee6c33ce601844ea2fcc031709ddd471d18323 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -1,6 +1,6 @@ Name: ocaml Version: 4.07.0 -Release: 6 +Release: 7 Summary: OCaml compiler and programming environment License: QPL and (LGPLv2+ with exceptions) URL: http://www.ocaml.org @@ -8,6 +8,7 @@ Source0: http://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-%{version}.tar Patch0002: 0002-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch Patch0003: 0003-configure-Allow-user-defined-C-compiler-flags.patch +Patch0004: 0004-add-fstack-protector-strong.patch BuildRequires: gcc binutils-devel ncurses-devel gdbm-devel emacs gawk perl-interpreter BuildRequires: util-linux libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel @@ -237,6 +238,9 @@ find %{buildroot} \( -name '*.cmt' -o -name '*.cmti' \) -a -delete %{_mandir}/man3/* %changelog +* Wed Mar 18 2020 liangdong - 4.07.0-7 +- add fstack protector strong + * Thu Jan 22 2020 yanzhihua - 4.07.0-6 - modify patching method