From 3bafba79cc4d2aabfbd74016248c2d47c297b3ab Mon Sep 17 00:00:00 2001 From: Julien Richard Date: Fri, 3 Sep 2021 10:48:50 +0200 Subject: [PATCH 1/3] Update libgit2 to v1.2.0 --- libgit2 | 2 +- .../build/LibGit2Sharp.NativeBinaries.props | 4 +- .../net46/LibGit2Sharp.NativeBinaries.props | 4 +- nuget.package/libgit2/LibGit2Sharp.dll.config | 8 +- nuget.package/libgit2/libgit2.license.txt | 110 +++++++++++++++++- nuget.package/libgit2/libgit2_hash.txt | 2 +- 6 files changed, 119 insertions(+), 11 deletions(-) diff --git a/libgit2 b/libgit2 index 8a0dc678..4fd32be0 160000 --- a/libgit2 +++ b/libgit2 @@ -1 +1 @@ -Subproject commit 8a0dc6783c340e61a44c179c48f832165ad2053c +Subproject commit 4fd32be01c79a5c003bb47674ac1d76d948518b7 diff --git a/nuget.package/build/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/LibGit2Sharp.NativeBinaries.props index 2081ac68..e643759c 100644 --- a/nuget.package/build/LibGit2Sharp.NativeBinaries.props +++ b/nuget.package/build/LibGit2Sharp.NativeBinaries.props @@ -1,7 +1,7 @@ $(MSBuildThisFileFullPath) - 8a0dc6783c340e61a44c179c48f832165ad2053c - git2-8a0dc67 + 4fd32be01c79a5c003bb47674ac1d76d948518b7 + git2-4fd32be diff --git a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props index 1da2c35c..bb4f3aee 100644 --- a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props +++ b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props @@ -1,8 +1,8 @@ $(MSBuildThisFileFullPath) - 8a0dc6783c340e61a44c179c48f832165ad2053c - git2-8a0dc67 + 4fd32be01c79a5c003bb47674ac1d76d948518b7 + git2-4fd32be diff --git a/nuget.package/libgit2/LibGit2Sharp.dll.config b/nuget.package/libgit2/LibGit2Sharp.dll.config index a3bbabd8..fce9d57a 100644 --- a/nuget.package/libgit2/LibGit2Sharp.dll.config +++ b/nuget.package/libgit2/LibGit2Sharp.dll.config @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/nuget.package/libgit2/libgit2.license.txt b/nuget.package/libgit2/libgit2.license.txt index c0f61fb9..6bb39b0c 100644 --- a/nuget.package/libgit2/libgit2.license.txt +++ b/nuget.package/libgit2/libgit2.license.txt @@ -420,7 +420,7 @@ The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -1019,3 +1019,111 @@ following restrictions are are met: THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +---------------------------------------------------------------------- + +Portions of the OpenSSL headers are included under the OpenSSL license: + +Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) +All rights reserved. + +This package is an SSL implementation written +by Eric Young (eay@cryptsoft.com). +The implementation was written so as to conform with Netscapes SSL. + +This library is free for commercial and non-commercial use as long as +the following conditions are aheared to. The following conditions +apply to all code found in this distribution, be it the RC4, RSA, +lhash, DES, etc., code; not just the SSL code. The SSL documentation +included with this distribution is covered by the same copyright terms +except that the holder is Tim Hudson (tjh@cryptsoft.com). + +Copyright remains Eric Young's, and as such any Copyright notices in +the code are not to be removed. +If this package is used in a product, Eric Young should be given attribution +as the author of the parts of the library used. +This can be in the form of a textual message at program startup or +in documentation (online or textual) provided with the package. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + "This product includes cryptographic software written by + Eric Young (eay@cryptsoft.com)" + The word 'cryptographic' can be left out if the rouines from the library + being used are not cryptographic related :-). +4. If you include any Windows specific code (or a derivative thereof) from + the apps directory (application code) you must include an acknowledgement: + "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" + +THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +The licence and distribution terms for any publically available version or +derivative of this code cannot be changed. i.e. this code cannot simply be +copied and put under another distribution licence +[including the GNU Public Licence.] + +==================================================================== +Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +3. All advertising materials mentioning features or use of this + software must display the following acknowledgment: + "This product includes software developed by the OpenSSL Project + for use in the OpenSSL Toolkit. (http://www.openssl.org/)" + +4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + endorse or promote products derived from this software without + prior written permission. For written permission, please contact + openssl-core@openssl.org. + +5. Products derived from this software may not be called "OpenSSL" + nor may "OpenSSL" appear in their names without prior written + permission of the OpenSSL Project. + +6. Redistributions of any form whatsoever must retain the following + acknowledgment: + "This product includes software developed by the OpenSSL Project + for use in the OpenSSL Toolkit (http://www.openssl.org/)" + +THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY +EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR +ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/nuget.package/libgit2/libgit2_hash.txt b/nuget.package/libgit2/libgit2_hash.txt index eae3ea79..698b7143 100644 --- a/nuget.package/libgit2/libgit2_hash.txt +++ b/nuget.package/libgit2/libgit2_hash.txt @@ -1 +1 @@ -8a0dc6783c340e61a44c179c48f832165ad2053c +4fd32be01c79a5c003bb47674ac1d76d948518b7 From 5c6ea3f95f370e716287eb1f8b209fba1b6986fb Mon Sep 17 00:00:00 2001 From: Julien Richard Date: Sat, 4 Sep 2021 09:07:00 +0200 Subject: [PATCH 2/3] Remove compilation hack --- build.libgit2.ps1 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.libgit2.ps1 b/build.libgit2.ps1 index a68a38a3..aeefd202 100644 --- a/build.libgit2.ps1 +++ b/build.libgit2.ps1 @@ -100,11 +100,6 @@ function Assert-Consistent-Naming($expected, $path) { try { Push-Location $libgit2Directory - # Patch CMakeLists.txt to fix LIBGIT2_FILENAME not being used when compiling the .rc file - # To remove when https://github.com/libgit2/libgit2/pull/5994 is included - $libgit2CMakeLists = Join-Path $libgit2Directory "src\CMakeLists.txt" - (Get-Content $libgit2CMakeLists).Replace('target_compile_definitions(git2internal PRIVATE LIBGIT2_FILENAME', 'target_compile_definitions(git2 PRIVATE LIBGIT2_FILENAME') | Set-Content $libgit2CMakeLists - $cmake = Find-CMake $ctest = Join-Path (Split-Path -Parent $cmake) "ctest.exe" From a5b460d89818869970f00bfb251b06748cd116bb Mon Sep 17 00:00:00 2001 From: Julien Richard Date: Sat, 4 Sep 2021 22:10:55 +0200 Subject: [PATCH 3/3] Set HTTPS to OpenSSL-Dynamic --- build.libgit2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.libgit2.sh b/build.libgit2.sh index 2e574e92..b8cdd25b 100755 --- a/build.libgit2.sh +++ b/build.libgit2.sh @@ -11,7 +11,7 @@ PACKAGEPATH="nuget.package/runtimes" if [[ $OS == "Darwin" ]]; then USEHTTPS="ON" else - USEHTTPS="OFF" + USEHTTPS="OpenSSL-Dynamic" fi rm -rf libgit2/build