| Message ID | 20230619132934.76085-3-frank@lichtenheld.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Various dist-related fixes | expand |
Acked-by: Gert Doering <gert@greenie.muc.de> Indeed, this fixes bundling for the one patch with an extra-long name (so the tar file diffs have 2 file renames, plus one extra file). To verify whether things still build, I've run via local mingw build (works) and GHA (works). This does not apply to release/2.6, because the "fix build with disable shared" commit (commit 17746e53f6) is not in 2.6. Do we need it there? Your patch has been applied to the master branch. commit 0c25a5462e945f537d1836b47a5f147a2132875c Author: Frank Lichtenheld Date: Mon Jun 19 15:29:32 2023 +0200 vcpkg-ports/pkcs11-helper: rename patches to make file names shorter Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20230619132934.76085-3-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26747.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
On Wed, Jun 21, 2023 at 02:18:27PM +0200, Gert Doering wrote: > Acked-by: Gert Doering <gert@greenie.muc.de> > > Indeed, this fixes bundling for the one patch with an extra-long name > (so the tar file diffs have 2 file renames, plus one extra file). > > To verify whether things still build, I've run via local mingw build > (works) and GHA (works). > > This does not apply to release/2.6, because the "fix build with disable > shared" commit (commit 17746e53f6) is not in 2.6. Do we need it there? Not right now. But if we want to merge CMake to release/2.6 we will need to merge the pkcs11 changes as well and then we need this patch as well. The CMake patches will also not apply cleanly on release/2.6 so we would need to make a separate patch series for that anyway. > Your patch has been applied to the master branch. > > commit 0c25a5462e945f537d1836b47a5f147a2132875c > Author: Frank Lichtenheld > Date: Mon Jun 19 15:29:32 2023 +0200 > > vcpkg-ports/pkcs11-helper: rename patches to make file names shorter > > Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> > Acked-by: Gert Doering <gert@greenie.muc.de> > Message-Id: <20230619132934.76085-3-frank@lichtenheld.com> > URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26747.html > Signed-off-by: Gert Doering <gert@greenie.muc.de> > > > -- > kind regards, > > Gert Doering >
diff --git a/contrib/vcpkg-ports/pkcs11-helper/0001-Allow-the-build-to-succeed-if-configured-with-disabl.patch b/contrib/vcpkg-ports/pkcs11-helper/Fix-build-with-disable-shared.patch similarity index 100% rename from contrib/vcpkg-ports/pkcs11-helper/0001-Allow-the-build-to-succeed-if-configured-with-disabl.patch rename to contrib/vcpkg-ports/pkcs11-helper/Fix-build-with-disable-shared.patch diff --git a/contrib/vcpkg-ports/pkcs11-helper/0002-config-w32-vc.h.in-indicate-OpenSSL.patch b/contrib/vcpkg-ports/pkcs11-helper/config-w32-vc.h.in-indicate-OpenSSL.patch similarity index 100% rename from contrib/vcpkg-ports/pkcs11-helper/0002-config-w32-vc.h.in-indicate-OpenSSL.patch rename to contrib/vcpkg-ports/pkcs11-helper/config-w32-vc.h.in-indicate-OpenSSL.patch diff --git a/contrib/vcpkg-ports/pkcs11-helper/0001-nmake-compatibility-with-vcpkg-nmake.patch b/contrib/vcpkg-ports/pkcs11-helper/nmake-compatibility-with-vcpkg-nmake.patch similarity index 100% rename from contrib/vcpkg-ports/pkcs11-helper/0001-nmake-compatibility-with-vcpkg-nmake.patch rename to contrib/vcpkg-ports/pkcs11-helper/nmake-compatibility-with-vcpkg-nmake.patch diff --git a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake index 67e9a2bf..47919bc6 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake +++ b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake @@ -11,9 +11,9 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} REF ${VERSION} PATCHES - 0001-nmake-compatibility-with-vcpkg-nmake.patch - 0002-config-w32-vc.h.in-indicate-OpenSSL.patch - 0001-Allow-the-build-to-succeed-if-configured-with-disabl.patch + nmake-compatibility-with-vcpkg-nmake.patch + config-w32-vc.h.in-indicate-OpenSSL.patch + Fix-build-with-disable-shared.patch pkcs11-helper-001-RFC7512.patch pkcs11-helper-002-dynamic_loader_flags.patch )
Remove the number prefixes we do not use anyway. And then rename Allow-the-build-to-succeed-if-configured-with-disabl.patch to make it short enough that it can fit in a tar archive built with --old-archive. Otherwise make dist might not include it: tar: openvpn-2.7_git/contrib/vcpkg-ports/pkcs11-helper/Allow-the-build-to-succeed-if-configured-with-disabl.patch: file name is too long (max 99); not dumped Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> --- ...ith-disabl.patch => Fix-build-with-disable-shared.patch} | 0 ...nSSL.patch => config-w32-vc.h.in-indicate-OpenSSL.patch} | 0 ...ake.patch => nmake-compatibility-with-vcpkg-nmake.patch} | 0 contrib/vcpkg-ports/pkcs11-helper/portfile.cmake | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename contrib/vcpkg-ports/pkcs11-helper/{0001-Allow-the-build-to-succeed-if-configured-with-disabl.patch => Fix-build-with-disable-shared.patch} (100%) rename contrib/vcpkg-ports/pkcs11-helper/{0002-config-w32-vc.h.in-indicate-OpenSSL.patch => config-w32-vc.h.in-indicate-OpenSSL.patch} (100%) rename contrib/vcpkg-ports/pkcs11-helper/{0001-nmake-compatibility-with-vcpkg-nmake.patch => nmake-compatibility-with-vcpkg-nmake.patch} (100%) Note: unchanged from previous submission