From 804a08045580b0657abd843839228b633468a8f6 Mon Sep 17 00:00:00 2001 From: laokz Date: Tue, 26 Jul 2022 14:18:45 +0800 Subject: [PATCH] fix: remove redundant patch2 close: I5HXXW Signed-off-by: laokz --- 0002-add-openEuler-hardened-ld.patch | 7 ------- podman.spec | 8 +++++--- 2 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 0002-add-openEuler-hardened-ld.patch diff --git a/0002-add-openEuler-hardened-ld.patch b/0002-add-openEuler-hardened-ld.patch deleted file mode 100644 index a076657..0000000 --- a/0002-add-openEuler-hardened-ld.patch +++ /dev/null @@ -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}}} -+ diff --git a/podman.spec b/podman.spec index db13531..17a2770 100644 --- a/podman.spec +++ b/podman.spec @@ -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 - 1:3.4.4-2 +- remove redundant patch2 + * Tue Jul 05 2022 fushanqing - 1:3.4.4-1 - update to 3.4.4 -- Gitee