Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[shiftmedia-libgnutls, nettle] update shiftmedia-libgnutls to 3.8.7, add symbols in nettle for shiftmedia-libgnutls #41704

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+69 −78
Open

[shiftmedia-libgnutls, nettle] update shiftmedia-libgnutls to 3.8.7, add symbols in nettle for shiftmedia-libgnutls #41704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ports/nettle/nettle-arm.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,3 +561,7 @@ EXPORTS
_nettle_aes_decrypt_table
nettle_aes_decrypt
_nettle_aes_decrypt
nettle_sha3_256_shake_output
nettle_sha3_128_init
nettle_sha3_128_update
nettle_sha3_128_shake_output
4 changes: 4 additions & 0 deletions ports/nettle/nettle-arm64.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,3 +585,7 @@ EXPORTS
_nettle_aes_decrypt_table
nettle_aes_decrypt
_nettle_aes_decrypt
nettle_sha3_256_shake_output
nettle_sha3_128_init
nettle_sha3_128_update
nettle_sha3_128_shake_output
4 changes: 4 additions & 0 deletions ports/nettle/nettle-x64.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,3 +592,7 @@ EXPORTS
_nettle_aes_decrypt_table
nettle_aes_decrypt
_nettle_aes_decrypt
nettle_sha3_256_shake_output
nettle_sha3_128_init
nettle_sha3_128_update
nettle_sha3_128_shake_output
4 changes: 4 additions & 0 deletions ports/nettle/nettle-x86.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,3 +561,7 @@ EXPORTS
_nettle_aes_decrypt_table
nettle_aes_decrypt
_nettle_aes_decrypt
nettle_sha3_256_shake_output
nettle_sha3_128_init
nettle_sha3_128_update
nettle_sha3_128_shake_output
1 change: 1 addition & 0 deletions ports/nettle/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "nettle",
"version": "3.10",
"port-version": 1,
"description": "Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.",
"homepage": "https://git.lysator.liu.se/nettle/nettle",
"license": null,
Expand Down
47 changes: 37 additions & 10 deletions ports/shiftmedia-libgnutls/external-libtasn1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
diff --git a/SMP/libgnutls.vcxproj.filters b/SMP/libgnutls.vcxproj.filters
index 0e810b202..5a69f12ec 100644
index ef202f4ac..a397e1574 100644
--- a/SMP/libgnutls.vcxproj.filters
+++ b/SMP/libgnutls.vcxproj.filters
@@ -1520,30 +1520,6 @@
@@ -103,9 +103,6 @@
<Filter Include="Header Files\lib\inih">
<UniqueIdentifier>{ae0c3eeb-53df-4c72-a85a-6b46de35e7ba}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\libtasn1">
- <UniqueIdentifier>{32be60b7-8c65-486e-9df5-7e529443cf07}</UniqueIdentifier>
- </Filter>
<Filter Include="Source Files\lib\nettle\gost">
<UniqueIdentifier>{1f3549a8-3c3d-475f-8fd6-20451d336464}</UniqueIdentifier>
</Filter>
@@ -1535,30 +1532,6 @@
<ClCompile Include="..\lib\nettle\sysrng-bcrypt.c">
<Filter>Source Files\lib\nettle</Filter>
</ClCompile>
Expand Down Expand Up @@ -34,31 +44,48 @@ index 0e810b202..5a69f12ec 100644
<Filter>Source Files\lib\nettle\gost</Filter>
</ClCompile>
diff --git a/SMP/libgnutls_files.props b/SMP/libgnutls_files.props
index 7fe1f88d5..cbc2d45c1 100644
index 55049b70b..2bb76e3b0 100644
--- a/SMP/libgnutls_files.props
+++ b/SMP/libgnutls_files.props
@@ -172,16 +172,6 @@
@@ -175,13 +175,6 @@
<ItemGroup>
<ClCompile Include="lib\gnutls_asn1_tab.c" />
<ClCompile Include="lib\pkix_asn1_tab.c" />
- <ClCompile Include="..\devel\libtasn1\lib\coding.c" />
- <ClCompile Include="..\devel\libtasn1\lib\decoding.c" />
- <ClCompile Include="..\devel\libtasn1\lib\element.c" />
- <ClCompile Include="..\devel\libtasn1\lib\errors.c">
- <ObjectFileName>$(IntDir)\tasn1_$(filename).obj</ObjectFileName>
- </ClCompile>
- <ClCompile Include="..\devel\libtasn1\lib\gstr.c" />
- <ClCompile Include="..\devel\libtasn1\lib\parser_aux.c" />
- <ClCompile Include="..\devel\libtasn1\lib\structure.c" />
- <ClCompile Include="..\devel\libtasn1\lib\version.c" />
<ClCompile Include="..\gnulib\lib\c-strcasecmp.c" />
<ClCompile Include="..\gnulib\lib\c-strncasecmp.c" />
<ClCompile Include="..\gnulib\lib\gl_linkedhash_list.c" />
<ClCompile Include="..\gnulib\lib\cloexec.c" />
@@ -545,9 +538,6 @@
</ClCompile>
<ClCompile Include="..\gnulib\lib\stdio-write.c">
<PreprocessorDefinitions>REPLACE_PRINTF_POSIX=1;REPLACE_FPRINTF_POSIX=1;REPLACE_VPRINTF_POSIX=1;REPLACE_VFPRINTF_POSIX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\devel\libtasn1\lib\errors.c">
- <ObjectFileName>$(IntDir)\tasn1_$(filename).obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\lib\algorithms\ecc.c">
<ObjectFileName>$(IntDir)\alg_%(Filename).obj</ObjectFileName>
diff --git a/SMP/libgnutls_winrt.vcxproj.filters b/SMP/libgnutls_winrt.vcxproj.filters
index 761877440..cd40b5bb7 100644
index f6a355e7e..299749c2a 100644
--- a/SMP/libgnutls_winrt.vcxproj.filters
+++ b/SMP/libgnutls_winrt.vcxproj.filters
@@ -1520,30 +1520,6 @@
@@ -103,9 +103,6 @@
<Filter Include="Header Files\lib\inih">
<UniqueIdentifier>{ae0c3eeb-53df-4c72-a85a-6b46de35e7ba}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\libtasn1">
- <UniqueIdentifier>{32be60b7-8c65-486e-9df5-7e529443cf07}</UniqueIdentifier>
- </Filter>
<Filter Include="Header Files\lib\nettle\gost">
<UniqueIdentifier>{4fada990-3138-4089-a6c7-ae722a0e7fe9}</UniqueIdentifier>
</Filter>
@@ -1535,30 +1532,6 @@
<ClCompile Include="..\lib\nettle\sysrng-bcrypt.c">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@talregev Can you submit this patch upstream?

Copy link
Contributor Author

@talregev talregev Oct 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cannot, because they using internal libtasn1.
This patch is exist from the creation of this port:
https://github.com/microsoft/vcpkg/pull/18029/files#r947705859
#18029

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/microsoft/vcpkg/pull/18029/files#r947705859

<Filter>Source Files\lib\nettle</Filter>
</ClCompile>
Expand Down
32 changes: 0 additions & 32 deletions ports/shiftmedia-libgnutls/fix-warnings.patch
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ports/shiftmedia-libgnutls/mkdir.patch
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions ports/shiftmedia-libgnutls/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ShiftMediaProject/gnutls
REF ${VERSION}
SHA512 5bd515da85f9e87b98f09a29472f788e869ccc3355f9583fbb4215d954cc5f97239e017120a0b358d259e58d0bd8e538fd00ea102fdbc1b29363cd92f06d0299
SHA512 ff3991012425fb047229b3a72f3ab465981e002f93840df0dc3729b152fb497f88c74cb50022fc6f30aa2f6db3c34ed4e44e5556ec249f8da5b20886bb4116b1
HEAD_REF master
PATCHES
external-libtasn1.patch
pkgconfig.patch
ssize_t_already_define.patch
fix-warnings.patch
mkdir.patch
)

file(REMOVE_RECURSE "${SOURCE_PATH}/devel/perlasm")
Expand Down
14 changes: 0 additions & 14 deletions ports/shiftmedia-libgnutls/ssize_t_already_define.patch
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions ports/shiftmedia-libgnutls/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "shiftmedia-libgnutls",
"version": "3.8.4",
"port-version": 3,
"version": "3.8.7",
"description": "Unofficial GnuTLS fork with added custom native Visual Studio project build tools. ",
"homepage": "https://github.com/ShiftMediaProject/gnutls",
"license": "LGPL-2.1-only",
Expand Down
6 changes: 3 additions & 3 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6282,7 +6282,7 @@
},
"nettle": {
"baseline": "3.10",
"port-version": 0
"port-version": 1
},
"networkdirect-sdk": {
"baseline": "2.0.1",
Expand Down Expand Up @@ -8265,8 +8265,8 @@
"port-version": 1
},
"shiftmedia-libgnutls": {
"baseline": "3.8.4",
"port-version": 3
"baseline": "3.8.7",
"port-version": 0
},
"shiftmedia-libgpg-error": {
"baseline": "1.45",
Expand Down
5 changes: 5 additions & 0 deletions versions/n-/nettle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8e33e188623d99135e4d6db52d98840da86ffc0d",
"version": "3.10",
"port-version": 1
},
{
"git-tree": "9326fbe0ac4d6a3e70d622443d40b29d9538a9ff",
"version": "3.10",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/shiftmedia-libgnutls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "86914b66df06648d0bf9cfff13c272a852768df4",
"version": "3.8.7",
"port-version": 0
},
{
"git-tree": "b18bd4e582995b852d1b9eac4b79805d84aaa656",
"version": "3.8.4",
Expand Down