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