From d2bb9a1d9a317f5cb8bb2cea583b7e476f82e6b5 Mon Sep 17 00:00:00 2001
From: Tao Liu <ltao@redhat.com>
Date: Dec 08 2021 01:01:11 +0000
Subject: Update eppic to latest upstream snapshot


upstream: fedora
related:  bz2003832
conflict: yes, non-functional modifications made.

commit 91f1d5989b741eea0ec58525e2d784430282ab7a
Author: Kairui Song <kasong@redhat.com>
Date:   Thu Apr 1 16:53:35 2021 +0800

    Update eppic to latest upstream snapshot

    Also fixes a package build failure:
    ar ccurl libeppic.a eppic_util.o eppic_node.o eppic_var.o eppic_func.o eppic_str.o eppic_op.o eppic_num.o eppic_stat.o eppic_builtin.o eppic_type.o eppic_case.o eppic_api.o eppic_member.o eppic_alloc.o eppic_define.o eppic_input.o eppic_print.o eppicpp.tab.o eppic.tab.o lex.eppic.o lex.eppicpp.o baseops.o
    ar: eppic_util.o: file format not recognized

    See eppic commit 0037321e64952b4feb3bd37761fb1067266e9e72 for more
    details.

    Signed-off-by: Kairui Song <kasong@redhat.com>

Signed-off-by: Tao Liu <ltao@redhat.com>

---

diff --git a/kexec-tools-2.0.20-eppic-Remove-duplicated-variable-declaration.patch b/kexec-tools-2.0.20-eppic-Remove-duplicated-variable-declaration.patch
deleted file mode 100644
index 8d77b9b..0000000
--- a/kexec-tools-2.0.20-eppic-Remove-duplicated-variable-declaration.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2837fb1f5f8362976c188b30ebe50dc8b0377f64 Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Wed, 29 Jan 2020 11:33:18 +0800
-Subject: [PATCH] Remove duplicated variable declaration
-
-When building on Fedora 32, following error is observed:
-
-...
-/usr/bin/ld: ../eppic/libeppic/libeppic.a(eppic_stat.o):/builddir/build/BUILD/kexec-tools-2.0.20/eppic/libeppic/eppic.h:474: multiple definition of `lastv';
-../eppic/libeppic/libeppic.a(eppic_func.o):/builddir/build/BUILD/kexec-tools-2.0.20/eppic/libeppic/eppic.h:474: first defined here
-...
-
-And apparently, the variable is wrongly declared multiple times. So
-remove duplicated declaration.
-
-Signed-off-by: Kairui Song <kasong@redhat.com>
----
- libeppic/eppic.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libeppic/eppic.h b/libeppic/eppic.h
-index 5664583..836b475 100644
---- a/eppic-d84c3541035d95077aa8571f5d5c3e07c6ef510b/libeppic/eppic.h
-+++ b/eppic-d84c3541035d95077aa8571f5d5c3e07c6ef510b/libeppic/eppic.h
-@@ -471,7 +471,7 @@ type_t  *eppic_addstorage(type_t *t1, type_t *t2);
- type_t  *eppic_getvoidstruct(int ctype);
- 
- extern int lineno, needvar, instruct, nomacs, eppic_legacy;
--node_t *lastv;
-+extern node_t *lastv;
- 
- #define NULLNODE ((node_t*)0)
- 
--- 
-2.24.1
-
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 180a94c..9499a6f 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,4 +1,4 @@
-%global eppic_ver d84c3541035d95077aa8571f5d5c3e07c6ef510b
+%global eppic_ver e8844d3793471163ae4a56d8f95897be9e5bd554
 %global eppic_shortver %(c=%{eppic_ver}; echo ${c:0:7})
 %global mkdf_ver 1.7.0
 %global mkdf_shortver %(c=%{mkdf_ver}; echo ${c:0:7})
@@ -109,7 +109,6 @@ Requires:       systemd-udev%{?_isa}
 #
 # Patches 601 onward are generic patches
 #
-Patch601: ./kexec-tools-2.0.20-eppic-Remove-duplicated-variable-declaration.patch
 
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -125,8 +124,6 @@ mkdir -p -m755 kcp
 tar -z -x -v -f %{SOURCE9}
 tar -z -x -v -f %{SOURCE19}
 
-%patch601 -p1
-
 %ifarch ppc
 %define archdef ARCH=ppc
 %endif