vcpkg-ports: restore trailing whitespaces in .patch files
PATCH 1/1 vcpkg-ports: restore trailing whitespaces in .patch files
From: Lev Stipakov <[email protected]...>
Commit 36b9aa "contrib/vcpkg-ports: add pkcs11-helper port" has trimmed trailing white space in .patch files and thus corrupted them.
Restore trailing whitespaces to "uncorrupt" patches.
--- .../0001-nmake-openssl-1.1.1-support.patch | 6 +- .../pkcs11-helper-001-RFC7512.patch | 240 +++++++++--------- 2 files changed, 123 insertions(+), 123 deletions(-)
contrib/vcpkg-ports/pkcs11-helper/0001-nmake-openssl-1.1.1-support.patch +3 -3
@@ -74,7 +74,7 @@ index 2edab39..b2ac746 100644 +++ b/lib/Makefile.w32-vc @@ -60,9 +60,9 @@ OPENSSL_HOME = ..\..\openssl-0.9.8a !endif - + !ifdef OPENSSL -OPENSSL_STATIC = libeay32.lib +OPENSSL_STATIC = libcrypto.lib
@@ -82,7 +82,7 @@ index 2edab39..b2ac746 100644 -OPENSSL_DYNAMIC = libeay32.lib +OPENSSL_DYNAMIC = libcrypto.lib #OPENSSL_DYNAMIC = libeay32d.lib - + OPENSSL_INC=$(OPENSSL_HOME)\include --- +-- 2.23.0.windows.1
contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch +120 -120
443 lines not on this page · raw message
Signature · 1 line
2.23.0.windows.1
Hi,
Quoted 6 lines · Lev Stipakov
From: Lev Stipakov <[email protected]...>
Commit 36b9aa "contrib/vcpkg-ports: add pkcs11-helper port" has trimmed trailing white space in .patch files and thus corrupted them.
Restore trailing whitespaces to "uncorrupt" patches.
Sorry on that. My git defaults to "git am --whitespace=fix", because half the patches I get have trailing whitespace somewhere - in your case, it messed up the embedded patch.
Applying this one without my usual scripts, with "git am --whitespace=nowarn", and verifying that "git format-patch" really shows "trailing whitespace".
Also, Lev verified that the resulting commit *really* works, before I push out another broken copy :-)
commit 742123498253e9a8aa0cbe12752e0e4a09b46f21 (master) commit 1601f79bc2c771976a68a708abd11fd024adc4dc (release/2.5)
Author: Lev Stipakov <[email protected]...> Date: Tue Jun 15 13:43:31 2021 +0300
vcpkg-ports: restore trailing whitespaces in .patch files
Signed-off-by: Lev Stipakov <[email protected]...>
Acked-By: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg22553.html
Signed-off-by: Gert Doering <[email protected]...>gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...