!6 Upgrade to 6.2.6.14

From: @houyingchao 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2022-05-23 07:32:29 +00:00 committed by Gitee
commit aab78a3292
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 13 additions and 39 deletions

View File

@ -1,29 +0,0 @@
From 52f12fea424e62dc6b14aff69406eebe76bf2984 Mon Sep 17 00:00:00 2001
From: "Christopher N. Hesse" <raymanfx@gmail.com>
Date: Wed, 3 Apr 2019 22:23:06 +0200
Subject: [PATCH 1/2] utils: fileUtils: Fix null string
syncAndCloseFile() takes an error message string as second argument, so
do not pass NULL.
Signed-off-by: Christopher N. Hesse <raymanfx@gmail.com>
---
utils/uds/fileUtils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/uds/fileUtils.c b/utils/uds/fileUtils.c
index d3f6e70..43f1e10 100644
--- a/utils/uds/fileUtils.c
+++ b/utils/uds/fileUtils.c
@@ -157,7 +157,7 @@ int syncAndCloseFile(int fd, const char *errorMessage)
/**********************************************************************/
void trySyncAndCloseFile(int fd)
{
- int result = syncAndCloseFile(fd, NULL);
+ int result = syncAndCloseFile(fd, "");
if (result != UDS_SUCCESS) {
logDebugWithStringError(result, "error syncing and closing file");
}
--
2.21.0

BIN
6.2.6.14.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,14 +1,10 @@
%global commit 84517ca07dce84b4921aa5731fd48a114f6884a4
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: vdo
Version: 6.2.0.298
Release: 13
Version: 6.2.6.14
Release: 1
Summary: Management tools for Virtual Data Optimizer
License: GPLv2
URL: http://github.com/dm-vdo/vdo
Source0: https://github.com/dm-vdo/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
Patch0001: 0001-utils-fileUtils-Fix-null-string.patch
Source0: https://github.com/dm-vdo/vdo/archive/refs/tags/%{version}.tar.gz
Patch0002: 0002-Ignore-misaligned-pointers.patch
BuildRequires: gcc libuuid-devel device-mapper-devel device-mapper-event-devel
@ -27,7 +23,7 @@ This package provides the user-space management tools for VDO.
%package_help
%prep
%autosetup -n %{name}-%{commit} -p1
%autosetup -n %{name}-%{version} -p1
%build
%make_build
@ -40,8 +36,7 @@ This package provides the user-space management tools for VDO.
# Fix the python3 shebangs
for file in %{_bindir}/vdo \
%{_bindir}/vdostats \
%{_defaultdocdir}/%{name}/examples/ansible/vdo.py
%{_bindir}/vdostats
do
pathfix.py -pni "%{__python3}" %{buildroot}${file}
done
@ -74,12 +69,20 @@ done
%{python3_sitelib}/%{name}/utils/*
%{_unitdir}/vdo.service
%{_presetdir}/97-vdo.preset
/bash_completion.d/vdo
/bash_completion.d/vdostats
/etc/udev/rules.d/69-vdo-start-by-dev.rules
/usr/lib/systemd/system/vdo-start-by-dev@.service
/usr/libexec/vdoprepareforlvm
%files help
%defattr(-,root,root)
%{_mandir}/man8/*
%changelog
* Fri May 20 2022 houyingchao <houyingchao@h-partners.com> - 6.2.6.14-1
- Upgrade to 6.2.6.14
* Fri Jun 5 2020 leiju<leiju4@huawei.com> - 6.2.0.298-13
- Fix null string and misaligned pointers