Revision: 10422 https://osdn.net/projects/ttssh2/scm/svn/commits/10422 Author: nmaya Date: 2022-12-22 08:04:43 +0900 (Thu, 22 Dec 2022) Log Message: ----------- Oniguruma 6.9.8 に更新 ticket #45654 Ticket Links: ------------ https://osdn.net/projects/ttssh2/tracker/detail/45654 Modified Paths: -------------- branches/4-stable/doc/en/html/about/history.html branches/4-stable/doc/en/html/reference/develop.html branches/4-stable/doc/ja/html/about/history.html branches/4-stable/doc/ja/html/reference/develop.html branches/4-stable/libs/oniguruma.cmake -------------- next part -------------- Modified: branches/4-stable/doc/en/html/about/history.html =================================================================== --- branches/4-stable/doc/en/html/about/history.html 2022-12-21 23:04:39 UTC (rev 10421) +++ branches/4-stable/doc/en/html/about/history.html 2022-12-21 23:04:43 UTC (rev 10422) @@ -74,6 +74,7 @@ <li>Misc <ul> <li>Added about EAR(Export Administration Regulations) to Frequently asked questions.</li> + <li>upgraded Oniguruma to 6.9.8.</li> </ul> </li> </ul> Modified: branches/4-stable/doc/en/html/reference/develop.html =================================================================== --- branches/4-stable/doc/en/html/reference/develop.html 2022-12-21 23:04:39 UTC (rev 10421) +++ branches/4-stable/doc/en/html/reference/develop.html 2022-12-21 23:04:43 UTC (rev 10422) @@ -137,7 +137,7 @@ <h2 id="library">Libraries</h2> <ul> - <li>Oniguruma 6.9.7.1 (<a href="https://github.com/kkos/oniguruma/">https://github.com/kkos/oniguruma/</a>)</li> + <li>Oniguruma 6.9.8 (<a href="https://github.com/kkos/oniguruma/">https://github.com/kkos/oniguruma/</a>)</li> <li>SFMT 1.5.1 (<a href="http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html">http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html</a>)</li> <li>OpenSSL 1.1.1k (<a href="https://www.openssl.org/">https://www.openssl.org/</a>)</li> <li>zlib 1.2.13 (<a href="https://www.zlib.net/">https://www.zlib.net/</a>)</li> Modified: branches/4-stable/doc/ja/html/about/history.html =================================================================== --- branches/4-stable/doc/ja/html/about/history.html 2022-12-21 23:04:39 UTC (rev 10421) +++ branches/4-stable/doc/ja/html/about/history.html 2022-12-21 23:04:43 UTC (rev 10422) @@ -74,6 +74,7 @@ <li>\x82\xBB\x82̑\xBC <ul> <li>Q & A\x8FW\x82ɗA\x8Fo\x8BK\x90\xA7(EAR)\x82ɂ\xA2\x82ĒNjL\x82\xB5\x82\xBD\x81B</li> + <li>Oniguruma 6.9.8\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li> </ul> </li> </ul> Modified: branches/4-stable/doc/ja/html/reference/develop.html =================================================================== --- branches/4-stable/doc/ja/html/reference/develop.html 2022-12-21 23:04:39 UTC (rev 10421) +++ branches/4-stable/doc/ja/html/reference/develop.html 2022-12-21 23:04:43 UTC (rev 10422) @@ -141,7 +141,7 @@ <h2 id="library">\x83\x89\x83C\x83u\x83\x89\x83\x8A</h2> <ul> - <li>Oniguruma 6.9.7.1 (<a href="https://github.com/kkos/oniguruma/">https://github.com/kkos/oniguruma/</a>)</li> + <li>Oniguruma 6.9.8 (<a href="https://github.com/kkos/oniguruma/">https://github.com/kkos/oniguruma/</a>)</li> <li>SFMT 1.5.1 (<a href="http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html">http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html</a>)</li> <li>OpenSSL 1.1.1k (<a href="https://www.openssl.org/">https://www.openssl.org/</a>)</li> <li>zlib 1.2.13 (<a href="https://www.zlib.net/">https://www.zlib.net/</a>)</li> Modified: branches/4-stable/libs/oniguruma.cmake =================================================================== --- branches/4-stable/libs/oniguruma.cmake 2022-12-21 23:04:39 UTC (rev 10421) +++ branches/4-stable/libs/oniguruma.cmake 2022-12-21 23:04:43 UTC (rev 10422) @@ -58,14 +58,14 @@ include(script_support.cmake) -set(SRC_DIR_BASE "5adee14d43128abe8170e0e5de66c43f89df5295") +set(SRC_DIR_BASE "onig-6.9.8") set(SRC_ARC "${SRC_DIR_BASE}.tar.gz") -set(SRC_URL "https://github.com/kkos/oniguruma/archive/${SRC_ARC}") -set(SRC_ARC_HASH_SHA1 ede358aca7d8b8392d60003cc5810e0684053ed8) +set(SRC_URL "https://github.com/kkos/oniguruma/releases/download/v6.9.8/${SRC_ARC}") +set(SRC_ARC_HASH_SHA256 28cd62c1464623c7910565fb1ccaaa0104b2fe8b12bcd646e81f73b47535213e) set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/oniguruma") set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src") -set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src/oniguruma-5adee14d43128abe8170e0e5de66c43f89df5295") +set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src/${SRC_DIR_BASE}") set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/build_${TOOLSET}") set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/oniguruma_${TOOLSET}") if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("${ARCHITECTURE}" MATCHES "x64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32")) @@ -80,7 +80,7 @@ file(DOWNLOAD ${SRC_URL} ${DOWN_DIR}/${SRC_ARC} - EXPECTED_HASH SHA1=${SRC_ARC_HASH_SHA1} + EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256} SHOW_PROGRESS )