From c5db2f9a0f62756e931d8dcfe0678a9d5bbe99a0 Mon Sep 17 00:00:00 2001 From: Domen Vrankar Date: Tue, 10 Oct 2017 23:09:27 +0200 Subject: CPack/Deb: fix for regex passing even if invalid characters are present Regex [+-~] passes all characters between + and ~ and not only +, - and ~ --- Modules/CPackDeb.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 3e6d0a8..1879827 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -764,9 +764,9 @@ function(cpack_deb_prepare_package_vars) if(DEFINED CPACK_DEBIAN_PACKAGE_RELEASE OR DEFINED CPACK_DEBIAN_PACKAGE_EPOCH) # only test the version format if CPACK_DEBIAN_PACKAGE_RELEASE or # CPACK_DEBIAN_PACKAGE_EPOCH is set - if(NOT CPACK_DEBIAN_PACKAGE_VERSION MATCHES "^[0-9][A-Za-z0-9.+-~]*$") + if(NOT CPACK_DEBIAN_PACKAGE_VERSION MATCHES "^[0-9][A-Za-z0-9.+~-]*$") message(FATAL_ERROR - "CPackDeb: Debian package version must confirm to \"^[0-9][A-Za-z0-9.+-~]*$\" regex!") + "CPackDeb: Debian package version must confirm to \"^[0-9][A-Za-z0-9.+~-]*$\" regex!") endif() else() # before CMake 3.10 version format was not tested so only warn to preserve -- cgit v0.12