Skip to contentSkip to conversation

vcpkg-ports\pkcs11-helper: shorten patch filename

PATCH In review Lev Stipakov 3 participants 4 messages Mar 16, 2022 – Mar 17, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vcpkg-ports\pkcs11-helper: shorten patch filename

From: Lev Stipakov <[email protected]...>

"make dist" uses tar which breaks on long filenames:

tar:
openvpn-2.5.6/contrib/vcpkg-ports/pkcs11-helper/0003-config-w32-vc.h.in-indicate-OpenSSL-EC-support.patch:
file name is too long (max 99); not dumped
tar: Exiting with failure status due to previous errors

and then "make dist" continues.

Make filename shorter to make tar happy.

---
 ...ort.patch => 0003-config-w32-vc.h.in-indicate-OpenSSL.patch} | 0
 contrib/vcpkg-ports/pkcs11-helper/portfile.cmake                | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename contrib/vcpkg-ports/pkcs11-helper/{0003-config-w32-vc.h.in-indicate-OpenSSL-EC-support.patch => 0003-config-w32-vc.h.in-indicate-OpenSSL.patch} (100%)
contrib/vcpkg-ports/pkcs11-helper/0003-config-w32-vc.h.in-indicate-OpenSSL.patch renamed from contrib/vcpkg-ports/pkcs11-helper/0003-config-w32-vc.h.in-indicate-OpenSSL-EC-support.patch +0 -0
similarity index 100%
rename from contrib/vcpkg-ports/pkcs11-helper/0003-config-w32-vc.h.in-indicate-OpenSSL-EC-support.patch
rename to contrib/vcpkg-ports/pkcs11-helper/0003-config-w32-vc.h.in-indicate-OpenSSL.patch
contrib/vcpkg-ports/pkcs11-helper/portfile.cmake +1 -1
index 55c65335..22e9bd1f 100644
@@ -13,7 +13,7 @@ vcpkg_extract_source_archive_ex(
     PATCHES
         0001-nmake-compatibility-with-vcpkg-nmake.patch
         0002-pkcs11.h-rename-interface-parameter.patch
-        0003-config-w32-vc.h.in-indicate-OpenSSL-EC-support.patch
+        0003-config-w32-vc.h.in-indicate-OpenSSL.patch
         pkcs11-helper-001-RFC7512.patch
 )
 
Signature · 1 line
2.23.0.windows.1
#1 lore raw
Quoted 8 lines

Lev Stipakov <[email protected]...> hat am 16.03.2022 14:54 geschrieben:

From: Lev Stipakov <[email protected]...>

"make dist" uses tar which breaks on long filenames:

I think this should specfically mention "uses tar -o". Most modern usages of tar do not have this limit.

Regards,
--
Frank Lichtenheld

#2 lore raw

This is something which Gert could fix on commit, I think?

ke 16. maalisk. 2022 klo 19.22 Frank Lichtenheld ([email protected]...) kirjoitti:

Quoted 16 lines
Quoted 8 lines

Lev Stipakov <[email protected]...> hat am 16.03.2022 14:54 geschrieben:

From: Lev Stipakov <[email protected]...>

"make dist" uses tar which breaks on long filenames:

I think this should specfically mention "uses tar -o". Most modern usages of tar do not have this limit.

Regards,
--
Frank Lichtenheld

Signature · 1 line
-Lev
Acked-by on v1 1/1
#3 lore raw
In reply to Lev Stipakov

Tested on "master" and "release/2.5", make dist now proceeds without error, and the file is contained in the tarball.

"tar" changed to "tar -o", makes sense.

Your patch has been applied to the master and release/2.5 branch.

commit 2047522286f179cac09bd7615bf845d67a5dc1c8 (master) commit 6aba9e8854155a8b8e9628a1184f3c13a8031688 (release/2.5)

Author: Lev Stipakov
Date:   Wed Mar 16 15:54:11 2022 +0200
     vcpkg-ports\pkcs11-helper: shorten patch filename

     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]/msg23977.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering