!3 cryptsetup: renumber patches

Merge pull request !3 from liuzhiqiang/master
This commit is contained in:
openeuler-ci-bot 2020-06-30 15:31:08 +08:00 committed by Gitee
commit baa47ad7c0
14 changed files with 18 additions and 17 deletions

View File

@ -1,28 +1,26 @@
Name: cryptsetup Name: cryptsetup
Version: 2.0.4 Version: 2.0.4
Release: 2 Release: 3
Summary: Utility used to conveniently set up disk encryption Summary: Utility used to conveniently set up disk encryption
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
URL: https://gitlab.com/cryptsetup/cryptsetup URL: https://gitlab.com/cryptsetup/cryptsetup
Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{version}.tar.xz Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{version}.tar.xz
Patch0: 0000-cryptsetup-add-system-library-paths.patch Patch0: 0000-cryptsetup-add-system-library-paths.patch
Patch1: 0001-Emit-error-message-for-converting-inactive-keyslot.patch
Patch6000: 6000-Emit-error-message-for-converting-inactive-keyslot.patch Patch2: 0002-Move-blkid-scan-after-device-context-initialization.patch
Patch6001: 6001-Move-blkid-scan-after-device-context-initialization.patch Patch3: 0003-Add-blkid-scan-when-attemting-to-open-plain-device.patch
Patch6002: 6002-Add-blkid-scan-when-attemting-to-open-plain-device.patch Patch4: 0004-Wiping-empty-device-should-not-fail.patch
Patch6003: 6003-Wiping-empty-device-should-not-fail.patch Patch5: 0005-Do-not-copy-buffer-if-read-fails.patch
Patch6004: 6004-Do-not-copy-buffer-if-read-fails.patch Patch6: 0006-Do-not-fail-if-device-is-smaller-than-requested-wipe.patch
Patch6005: 6005-Do-not-fail-if-device-is-smaller-than-requested-wipe.patch Patch7: 0007-Do-not-print-error-for-used-device-twice.patch
Patch6006: 6006-Do-not-print-error-for-used-device-twice.patch Patch8: 0008-Fix-issues-found-by-Coverity-scan.patch
Patch6007: 6007-Fix-issues-found-by-Coverity-scan.patch Patch9: 0009-Properly-propagate-error-from-AF-diffuse-function.patch
Patch6008: 6008-Properly-propagate-error-from-AF-diffuse-function.patch Patch10: 0010-Check-for-device-size-and-sector-size-misalignment.patch
Patch6009: 6009-Check-for-device-size-and-sector-size-misalignment.patch Patch11: 0011-Fix-a-possible-NULL-pointer-in-opt_type.patch
Patch6010: 6010-Fix-a-possible-NULL-pointer-in-opt_type.patch Patch12: 0012-Upstream-fixes-to-bundled-Argon2-code.patch
Patch6011: 6011-Upstream-fixes-to-bundled-Argon2-code.patch Patch13: 0013-fix-blockwise-compat-and-compat-test.patch
Patch9000: 9000-fix-blockwise-compat-and-compat-test.patch
BuildRequires: openssl-devel, popt-devel, device-mapper-devel git BuildRequires: openssl-devel, popt-devel, device-mapper-devel git
BuildRequires: libuuid-devel, json-c-devel, libargon2-devel, libpwquality-devel libblkid-devel BuildRequires: libuuid-devel, json-c-devel, libargon2-devel, libpwquality-devel libblkid-devel
@ -171,6 +169,9 @@ popd
%changelog %changelog
* Tue Jun 30 2020 Zhiqiang Liu <liuzhiqiang26@huawei.com> - 2.0.4-3
- renumber patches.
* Wed Aug 28 2019 zhanghaibo <ted.zhang@huawei.com> - 2.0.4-2 * Wed Aug 28 2019 zhanghaibo <ted.zhang@huawei.com> - 2.0.4-2
- Type:enhancemnet - Type:enhancemnet
- ID:NA - ID:NA