diff --git a/ps/build.ps1 b/ps/build.ps1 index 90aedc9c4afb2ee2eadd49631a6bb481e40a4660..84af1829cb64b3c224d66fbcd5131966ad17d2e6 100755 --- a/ps/build.ps1 +++ b/ps/build.ps1 @@ -251,13 +251,13 @@ if ($ec -ne 0) { "RUNTIME_PREFIX = YesPlease`nNO_CURL=" | Out-File -Append -Encoding utf8 -FilePath "$gitdir/config.mak.autogen" -$ec = Exec -FilePath "make" -Argv "`"CURL_LIBCURL=-lcurl -lnghttp2_static -lssl -lcrypto -lpthread`" " -WD $gitdir +$ec = Exec -FilePath "make" -Argv "`"CURL_LIBCURL=-lcurl -lnghttp2 -lssl -lcrypto -lpthread`" " -WD $gitdir if ($ec -ne 0) { exit 1 } if (!$pack) { - $ec = Exec -FilePath "make" -Argv "`"CURL_LIBCURL=-lcurl -lnghttp2_static -lssl -lcrypto -lpthread`" install" -WD $gitdir + $ec = Exec -FilePath "make" -Argv "`"CURL_LIBCURL=-lcurl -lnghttp2 -lssl -lcrypto -lpthread`" install" -WD $gitdir if ($ec -ne 0) { exit 1 } @@ -267,7 +267,7 @@ if (!$pack) { # create STGZ file $env:DESTDIR = $Destdir $TGZDIR = "$Destdir$prefix" -$ec = Exec -FilePath "make" -Argv "`"CURL_LIBCURL=-lcurl -lnghttp2_static -lssl -lcrypto -lpthread`" install" -WD $gitdir +$ec = Exec -FilePath "make" -Argv "`"CURL_LIBCURL=-lcurl -lnghttp2 -lssl -lcrypto -lpthread`" install" -WD $gitdir if ($ec -ne 0) { exit 1 } @@ -313,4 +313,4 @@ finally { [char]$Esc = 0x1b Write-Host "$Esc[32mPackaged successfully$Esc[0m -Your can run '$StgzDistPath --prefix=$prefix' to install git" \ No newline at end of file +Your can run '$StgzDistPath --prefix=$prefix' to install git" diff --git a/ps/version.ps1 b/ps/version.ps1 index d54ec10b8b907bcebdc2c1dd60ef495f9b5f0088..a4bc5aed27180edc01957c7cff14abcdbe3415fb 100644 --- a/ps/version.ps1 +++ b/ps/version.ps1 @@ -8,18 +8,18 @@ $ZLIB_HASH = "629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff" $OPENSSL_VERSION = "1.1.1g" $OPENSSL_HASH = "ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46" -$NGHTTP2_VERSION = "1.40.0" -$NGHTTP2_HASH = "63de2828bf6a43a501a982140b7ee969b8118f80351a9e43a1432b0979221957" +$NGHTTP2_VERSION = "1.41.0" +$NGHTTP2_HASH = "3d53e8bd1513a271a45b6ecda2e22fa05e9eb90fa92f7c5daf57b08c6e40cc55" # tar.gz -$CURL_VERSION = "7.70.0" -$CURL_HASH = "ca2feeb8ef13368ce5d5e5849a5fd5e2dd4755fecf7d8f0cc94000a4206fb8e7" +$CURL_VERSION = "7.71.1" +$CURL_HASH = "59ef1f73070de67b87032c72ee6037cedae71dcb1d7ef2d7f59487704aec069d" $EXPAT_VERSION = "2.2.7" $EXPAT_HASH = "30e3f40acf9a8fdbd5c379bdcc8d1178a1d9af306de29fc8ece922bc4c57bef8" -$GIT_VERSION = "2.26.2" -$GIT_HASH = "6d65132471df9e531807cb2746f8be317e22a343b9385bbe11c9ce7f0d2fc848" +$GIT_VERSION = "2.28.0" +$GIT_HASH = "dfa5d1a253aa451465478fe45c6a40ab8605b340fdb4c4e80b16d7f87708439d" # Filename $ZLIB_FILENAME = "zlib-${ZLIB_VERSION}" @@ -47,7 +47,7 @@ $GIT_FILE = "git-${GIT_VERSION}" #curl-ca-bundle -$CA_BUNDLE_URL = "https://curl.haxx.se/ca/cacert-2020-01-01.pem" +$CA_BUNDLE_URL = "https://curl.haxx.se/ca/cacert-2020-07-22.pem" Function DumpLocal { $dumptext = $ZLIB_VERSION + $ZLIB_HASH + $ZLIB_FILENAME + $ZLIB_URL diff --git a/version b/version index d7637a90da25fb0d0c943e692e4cb84da507d4dd..e316e921ed7bfb655c0d716f5f3c9c0ed7b83039 100644 --- a/version +++ b/version @@ -1,5 +1,5 @@ -GIT_REAL_VERSION="2.27.0" -GIT_KERNAL_HASH="" +GIT_REAL_VERSION="2.28.0" +GIT_KERNAL_HASH="dfa5d1a253aa451465478fe45c6a40ab8605b340fdb4c4e80b16d7f87708439d" GIT_GITHUB_HASH="" -CMAKE_VERSION="3.17" -CMAKE_PATCH="2" +CMAKE_VERSION="3.18" +CMAKE_PATCH="0"