From cab0b375447d3f83a28a42608e9763895a0a0de7 Mon Sep 17 00:00:00 2001 From: yixiangzhike Date: Fri, 30 Jul 2021 12:23:27 +0800 Subject: [PATCH] Solve mutiple definition compilation error --- backport-cpio-2.13-mutiple-definition.patch | 27 +++++++++++++++++++++ cpio.spec | 9 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 backport-cpio-2.13-mutiple-definition.patch diff --git a/backport-cpio-2.13-mutiple-definition.patch b/backport-cpio-2.13-mutiple-definition.patch new file mode 100644 index 0000000..4a23474 --- /dev/null +++ b/backport-cpio-2.13-mutiple-definition.patch @@ -0,0 +1,27 @@ +From 641d3f489cf6238bb916368d4ba0d9325a235afb Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Mon, 20 Jan 2020 07:45:39 +0200 +Subject: [PATCH] Minor fix * src/global.c: Remove superfluous declaration of + program_name + +--- + src/global.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/global.c b/src/global.c +index fb3abe9..acf92bc 100644 +--- a/src/global.c ++++ b/src/global.c +@@ -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) (); +-- +1.8.3.1 + diff --git a/cpio.spec b/cpio.spec index ac0dcc5..bf5a4b6 100644 --- a/cpio.spec +++ b/cpio.spec @@ -1,6 +1,6 @@ Name: cpio Version: 2.13 -Release: 4 +Release: 5 Summary: A GNU archiving program License: GPLv3+ @@ -17,6 +17,7 @@ Patch6: cpio-2.11-crc-fips-nit.patch Patch7: add-option-to-add-metadata-in-copy-out-mode.patch Patch8: Fix-use-after-free-and-return-appropriate-error.patch Patch9: revert-CVE-2015-1197.patch +Patch10: backport-cpio-2.13-mutiple-definition.patch Provides: bundled(gnulib) Provides: /bin/cpio @@ -59,6 +60,12 @@ make check %{_datadir}/man/man1/%{name}.1.gz %changelog +* Fri Jul 30 2021 yixiangzhike - 2.13-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Solve mutiple definition compilation error + * Fri Jun 4 2021 fuanan - 2.13-4 - Type:bugfix - ID:NA