[Openvpn-devel,master+release/2.5] vcpkg-ports\pkcs11-helper: shorten patch filename

Message ID 20220316135411.217-1-lstipakov@gmail.com
State Accepted
Headers show
Series
  • [Openvpn-devel,master+release/2.5] vcpkg-ports\pkcs11-helper: shorten patch filename
Related show

Commit Message

Lev Stipakov March 16, 2022, 1:54 p.m.
From: Lev Stipakov <lev@openvpn.net>

"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.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
---
 ...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%)

Comments

Frank Lichtenheld March 16, 2022, 5:22 p.m. | #1
> Lev Stipakov <lstipakov@gmail.com> hat am 16.03.2022 14:54 geschrieben:
> 
>  
> From: Lev Stipakov <lev@openvpn.net>
> 
> "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
Lev Stipakov March 17, 2022, 8:09 a.m. | #2
This is something which Gert could fix on commit, I think?

ke 16. maalisk. 2022 klo 19.22 Frank Lichtenheld (frank@lichtenheld.com)
kirjoitti:

>
>
> > Lev Stipakov <lstipakov@gmail.com> hat am 16.03.2022 14:54 geschrieben:
> >
> >
> > From: Lev Stipakov <lev@openvpn.net>
> >
> > "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
>
Gert Doering March 17, 2022, 8:24 a.m. | #3
Acked-by: Gert Doering <gert@greenie.muc.de>

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 <lev@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20220316135411.217-1-lstipakov@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg23977.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/contrib/vcpkg-ports/pkcs11-helper/0003-config-w32-vc.h.in-indicate-OpenSSL-EC-support.patch b/contrib/vcpkg-ports/pkcs11-helper/0003-config-w32-vc.h.in-indicate-OpenSSL.patch
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
diff --git a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake
index 55c65335..22e9bd1f 100644
--- a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake
+++ b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake
@@ -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
 )