From fce1d7eb3efa5d246745794a946448f79ae5ae29 Mon Sep 17 00:00:00 2001
From: DCCooper <1866858@gmail.com>
Date: Fri, 27 Nov 2020 17:31:40 +0800
Subject: [PATCH] Hack: add compile flag ftrapv and enable debuginfo

Signed-off-by: DCCooper <1866858@gmail.com>
---
 VERSION-openeuler                             |  2 +-
 git-commit                                    |  2 +-
 isula-build.spec                              | 10 ++++++-
 patch/0070-hack-add-compile-flag-ftrapv.patch | 26 +++++++++++++++++++
 series.conf                                   |  1 +
 5 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 patch/0070-hack-add-compile-flag-ftrapv.patch

diff --git a/VERSION-openeuler b/VERSION-openeuler
index 76c83e5..9e72237 100644
--- a/VERSION-openeuler
+++ b/VERSION-openeuler
@@ -1 +1 @@
-0.9.4-7
+0.9.4-8
diff --git a/git-commit b/git-commit
index 267a459..6859fe0 100644
--- a/git-commit
+++ b/git-commit
@@ -1 +1 @@
-b10f08c8ff5fc0d43ca42ad73de3538f24212a3f
+3a1cd37f4440574b44b5c1c85f7e4172209237e8
diff --git a/isula-build.spec b/isula-build.spec
index d947d72..6dad85d 100644
--- a/isula-build.spec
+++ b/isula-build.spec
@@ -2,7 +2,7 @@
 
 Name: isula-build
 Version: 0.9.4
-Release: 7
+Release: 8
 Summary: A tool to build container images
 License: Mulan PSL V2
 URL: https://gitee.com/openeuler/isula-build
@@ -24,6 +24,8 @@ Requires: systemd-units
 %description
 isula-build is a tool used for container images building.
 
+%debug_package
+
 %prep
 cp %{SOURCE0} .
 cp %{SOURCE1} .
@@ -83,6 +85,12 @@ fi
 /usr/share/bash-completion/completions/isula-build
 
 %changelog
+* Fir Nov 27 2020 lixiang <lixiang172@huawei.com> - 0.9.4-8
+- Add compile flag ftrapv and enable debuginfo
+
+* Thu Nov 20 2020 xiadanni <xiadanni1@huawei.com> - 0.9.4-7
+- Mask /proc/pin_memory
+
 * Thu Nov 19 2020 lixiang <lixiang172@huawei.com> - 0.9.4-6
 - Support build Dockerfile only have FROM command
 
diff --git a/patch/0070-hack-add-compile-flag-ftrapv.patch b/patch/0070-hack-add-compile-flag-ftrapv.patch
new file mode 100644
index 0000000..131104e
--- /dev/null
+++ b/patch/0070-hack-add-compile-flag-ftrapv.patch
@@ -0,0 +1,26 @@
+From 9a212f5488b2e626eac23b2d0ab2dc6e288df5e7 Mon Sep 17 00:00:00 2001
+From: lixiang <lixiang172@huawei.com>
+Date: Fri, 27 Nov 2020 17:12:53 +0800
+Subject: [PATCH] hack:add compile flag ftrapv
+
+Signed-off-by: lixiang <lixiang172@huawei.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 7e268678..f40941b4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,7 +22,7 @@ BUILDTAGS := seccomp
+ BUILDFLAGS := -tags "$(BUILDTAGS)"
+ TMPDIR := /tmp/isula_build_tmpdir
+ BEFLAG := -tmpdir=${TMPDIR}
+-SAFEBUILDFLAGS := -buildid=IdByIsula -buildmode=pie -extldflags=-static -extldflags=-zrelro -extldflags=-znow $(LDFLAGS) $(BEFLAG)
++SAFEBUILDFLAGS := -buildid=IdByIsula -buildmode=pie -extldflags=-ftrapv -extldflags=-static -extldflags=-zrelro -extldflags=-znow $(LDFLAGS) $(BEFLAG)
+ 
+ IMAGE_BUILDARGS := $(if $(http_proxy), --build-arg http_proxy=$(http_proxy))
+ IMAGE_BUILDARGS += $(if $(https_proxy), --build-arg https_proxy=$(https_proxy))
+-- 
+2.27.0
+
diff --git a/series.conf b/series.conf
index 10e51a0..ee2a148 100644
--- a/series.conf
+++ b/series.conf
@@ -7,3 +7,4 @@ patch/0066-bugfix-chown-config-root-path-before-daemon-started.patch
 patch/0067-bugfix-fix-unsuitable-filemode-for-isula-build-er.patch
 patch/0068-isula-build-support-build-Dockerfile-only-have-FROM-.patch
 patch/0069-isula-build-mask-proc-pin_memory.patch
+patch/0070-hack-add-compile-flag-ftrapv.patch