Solve mutiple definition compilation error

This commit is contained in:
yixiangzhike 2021-07-30 12:23:27 +08:00
parent 48d3e2db03
commit cab0b37544
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From 641d3f489cf6238bb916368d4ba0d9325a235afb Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org>
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

View File

@ -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 <zhangxingliang3@huawei.com> - 2.13-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Solve mutiple definition compilation error
* Fri Jun 4 2021 fuanan <fuanan3@huawei.com> - 2.13-4
- Type:bugfix
- ID:NA