diff --git a/fix-go-build-ref-cldflags.patch b/fix-go-build-ref-cldflags.patch new file mode 100644 index 0000000000000000000000000000000000000000..4e0038ae294aa53b9c144a57e54261ca1437a1ca --- /dev/null +++ b/fix-go-build-ref-cldflags.patch @@ -0,0 +1,25 @@ +From a52f67f2dbdf1b20b17061c695049e9ffec795c9 Mon Sep 17 00:00:00 2001 +From: luofeng +Date: Tue, 2 Apr 2024 20:00:04 +0800 +Subject: [PATCH] fix go build ref cldflags + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 405bcc3..8a29fb1 100644 +--- a/Makefile ++++ b/Makefile +@@ -23,7 +23,7 @@ SYSTEMD_DIR = $(DESTDIR)/usr/lib/systemd/system + LOG_DIR := $(DESTDIR)/var/log/secpaver + + BUILDFLAGS := -trimpath +-LDFLAGS := -w -s -buildid=IdBySecPaver -linkmode=external -extldflags=-static -extldflags=-zrelro -extldflags=-Wl,-z,now $(LDFLAGS) ++LDFLAGS := -w -s -buildid=IdBySecPaver -linkmode=external -extldflags=-static -extldflags=-zrelro -extldflags=-Wl,-z,now + + ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true) + export GO111MODULE=on +-- +2.19.1 + diff --git a/secpaver.spec b/secpaver.spec index a4105e0a1e942224d5bb650828b9ed8b9ec0e9ef..bf312a7929d68c6bcd3d3f5b5da5050f4d647b43 100755 --- a/secpaver.spec +++ b/secpaver.spec @@ -2,7 +2,7 @@ Name: secpaver Summary: Security policy development tool Version: 1.0.2 -Release: 7 +Release: 8 License: MulanPSL-2.0 URL: https://gitee.com/openeuler/secpaver Source: https://gitee.com/openeuler/secpaver/repository/archive/%{name}-%{version}.tar.gz @@ -12,6 +12,7 @@ Source1: sys.tar.gz Patch0001: dont-do-daemon-reload-in-make-install.patch Patch0002: set-default-log-path.patch Patch0003: support-clang-build.patch +Patch0004: fix-go-build-ref-cldflags.patch %ifarch riscv64 Patch1000: 1000-fix-build-on-riscv64.patch @@ -84,6 +85,9 @@ tar -xf %{SOURCE1} -C vendor/golang.org/x/ %systemd_postun_with_restart pavd.service %changelog +* Mon Apr 1 2024 luofeng - 1.0.2-8 +- fix go build ref C LDFLAGS + * Fri Mar 1 2024 luofeng - 1.0.2-7 - support clang build