From b8d6b37eba77725e7be49ff553c01d8971ef13f6 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Jan 30 2020 16:27:09 +0000
Subject: Fix multiple definition of program_name


---

diff --git a/cpio-2.13-mutiple-definition.patch b/cpio-2.13-mutiple-definition.patch
new file mode 100644
index 0000000..ac97b81
--- /dev/null
+++ b/cpio-2.13-mutiple-definition.patch
@@ -0,0 +1,13 @@
+diff -up cpio-2.13/src/global.c.me cpio-2.13/src/global.c
+--- cpio-2.13/src/global.c.me	2020-01-30 17:17:42.015259283 +0100
++++ cpio-2.13/src/global.c	2020-01-30 17:24:12.680794025 +0100
+@@ -184,9 +184,6 @@ unsigned int warn_option = 0;
+ /* Extract to standard output? */
+ bool to_stdout_option = false;
+ 
+-/* The name this program was run with.  */
+-char *program_name;
+-
+ /* A pointer to either lstat or stat, depending on whether
+    dereferencing of symlinks is done for input files.  */
+ int (*xstat) ();
diff --git a/cpio.spec b/cpio.spec
index 2abfd9b..b9f8fad 100644
--- a/cpio.spec
+++ b/cpio.spec
@@ -1,7 +1,7 @@
 Summary: A GNU archiving program
 Name: cpio
 Version: 2.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/cpio/
 Source: ftp://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.bz2
@@ -36,6 +36,8 @@ Patch7: cpio-2.10-longnames-split.patch
 # Cpio does Sum32 checksum, not CRC (downstream)
 Patch8: cpio-2.11-crc-fips-nit.patch
 
+# Fix multiple definition of `program_name'
+Patch9: cpio-2.13-mutiple-definition.patch
 
 Provides: bundled(gnulib)
 Provides: bundled(paxutils)
@@ -97,6 +99,9 @@ make check || {
 %{_infodir}/*.info*
 
 %changelog
+* Thu Jan 30 2020 Than Ngo <than@redhat.com> - 2.13-3
+- Fix multiple definition of program_name
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild