fix: remove redundant patch2

close: I5HXXW

Signed-off-by: laokz <laokz@foxmail.com>
This commit is contained in:
laokz 2022-07-26 14:18:45 +08:00
parent d42297fdf3
commit 804a080455
2 changed files with 5 additions and 10 deletions

View File

@ -1,7 +0,0 @@
diff -Naru podman-3.4.4/openEuler-hardened-ld podman-3.4.4-new/openEuler-hardened-ld
--- podman-3.4.4/openEuler-hardened-ld 1970-01-01 08:00:00.000000000 +0800
+++ podman-3.4.4-new/openEuler-hardened-ld 2022-07-01 16:50:11.640052823 +0800
@@ -0,0 +1,3 @@
+*self_spec:
++ %{!static:%{!shared:%{!r:-pie}}}
+

View File

@ -1,8 +1,8 @@
%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=openEuler-hardened-ld '" -a -v -x %{?**};
%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/generic-hardened-ld '" -a -v -x %{?**};
Name: podman
Version: 3.4.4
Release: 1
Release: 2
Summary: A daemonless container engine for managing Containers
Epoch: 1
License: ASL 2.0
@ -64,7 +64,6 @@ Provides: bundled(golang(k8s.io/api)) = v0.18.8
Provides: bundled(golang(k8s.io/apimachinery)) = v0.19.0
Patch1: 0001-Fix-the-invalid-memory-address-reference.patch
Patch2: 0002-add-openEuler-hardened-ld.patch
%description
Podman manages the entire container ecosystem which includes pods,
@ -319,6 +318,9 @@ done
%{_libexecdir}/%{name}/gvproxy
%changelog
* Tue Jul 26 2022 laokz <laokz@foxmail.com> - 1:3.4.4-2
- remove redundant patch2
* Tue Jul 05 2022 fushanqing <fushanqing@kylinos.cn> - 1:3.4.4-1
- update to 3.4.4