diff --git a/0001-utils-fileUtils-Fix-null-string.patch b/0001-utils-fileUtils-Fix-null-string.patch deleted file mode 100644 index 7c2bf378c7ddd3c36bd39af74b07137e5b4f2a14..0000000000000000000000000000000000000000 --- a/0001-utils-fileUtils-Fix-null-string.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 52f12fea424e62dc6b14aff69406eebe76bf2984 Mon Sep 17 00:00:00 2001 -From: "Christopher N. Hesse" -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 ---- - 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 - diff --git a/6.2.6.14.tar.gz b/6.2.6.14.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bac9ecc375d5912012e78e7aa3f919b42e877e26 Binary files /dev/null and b/6.2.6.14.tar.gz differ diff --git a/vdo-84517ca.tar.gz b/vdo-84517ca.tar.gz deleted file mode 100644 index 4167000d3a49f6d552bdbb6eb683416e3606522f..0000000000000000000000000000000000000000 Binary files a/vdo-84517ca.tar.gz and /dev/null differ diff --git a/vdo.spec b/vdo.spec index 5cdc836d1ea9aba6e5722ebb605d59176faf0f27..1d143cdd09d786fd0f191d179beae6ee49e0e474 100644 --- a/vdo.spec +++ b/vdo.spec @@ -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 - 6.2.6.14-1 +- Upgrade to 6.2.6.14 + * Fri Jun 5 2020 leiju - 6.2.0.298-13 - Fix null string and misaligned pointers