fix multiple definition of pgp_algo_mapping
This commit is contained in:
parent
c5165ef43c
commit
eb8a3b814e
@ -1,6 +1,6 @@
|
||||
name: digest-list-tools
|
||||
Version: 0.3.95
|
||||
Release: 2
|
||||
Release: 3
|
||||
Summary: Utilities for IMA Digest Lists extension
|
||||
|
||||
Source0: https://gitee.com/openeuler/%{name}/repository/archive/v%{version}.tar.gz
|
||||
@ -8,6 +8,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
License: GPLv2+
|
||||
Url: https://gitee.com/openeuler/digest-list-tools
|
||||
|
||||
Patch0: fix-multiple-definition-of-pgp_algo_mapping.patch
|
||||
|
||||
BuildRequires: autoconf automake libcurl-devel libtool rpm-devel dracut gzip
|
||||
BuildRequires: libcap-devel libcmocka-devel libselinux-devel
|
||||
|
||||
@ -118,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man1/%{name}.1.gz
|
||||
|
||||
%changelog
|
||||
* Mon Aug 2 2021 Anakin Zhang <zhangtianxing3@huawei.com> - 0.3.95-3
|
||||
- Fix multiple definition of pgp_algo_mapping
|
||||
|
||||
* Tue Mar 30 2021 Anakin Zhang <zhangtianxing3@huawei.com> - 0.3.95-2
|
||||
- Add devel subpackage
|
||||
|
||||
|
||||
26
fix-multiple-definition-of-pgp_algo_mapping.patch
Normal file
26
fix-multiple-definition-of-pgp_algo_mapping.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From e5c1f8066959b5ed3ca7bca3acb4a59cb3e3cd16 Mon Sep 17 00:00:00 2001
|
||||
From: Zhang Tianxing <zhangtianxing3@huawei.com>
|
||||
Date: Tue, 3 Aug 2021 00:32:46 +0800
|
||||
Subject: [PATCH] fix multiple definition of pgp_algo_mapping
|
||||
|
||||
Signed-off-by: Zhang Tianxing <zhangtianxing3@huawei.com>
|
||||
---
|
||||
include/lib.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/lib.h b/include/lib.h
|
||||
index 604871b..27b71eb 100644
|
||||
--- a/include/lib.h
|
||||
+++ b/include/lib.h
|
||||
@@ -44,7 +44,7 @@ enum pgp_hash_algo {
|
||||
PGP_HASH__LAST
|
||||
};
|
||||
|
||||
-enum hash_algo pgp_algo_mapping[PGP_HASH__LAST];
|
||||
+extern enum hash_algo pgp_algo_mapping[PGP_HASH__LAST];
|
||||
|
||||
int read_file_from_path(int dirfd, const char *path, void **buf, loff_t *size);
|
||||
int read_write_file_from_path(int dirfd, const char *path, void **buf,
|
||||
--
|
||||
2.26.2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user