From 6defa19c2c74af14812d5a072a927169425bdc46 Mon Sep 17 00:00:00 2001 From: Hsiao-nan Cheung Date: Wed, 8 Jan 2025 15:40:30 +0800 Subject: [PATCH] oracle-instant-client: Update to version 23.6.0.24.10 (#6439) --- bucket/oracle-instant-client-odbc.json | 24 +++++++---------- bucket/oracle-instant-client-sdk.json | 23 ++++++---------- bucket/oracle-instant-client-sqlplus.json | 23 ++++++---------- bucket/oracle-instant-client.json | 32 ++++++++--------------- 4 files changed, 36 insertions(+), 66 deletions(-) diff --git a/bucket/oracle-instant-client-odbc.json b/bucket/oracle-instant-client-odbc.json index 8fbe5f3c23..59a13eb8ef 100644 --- a/bucket/oracle-instant-client-odbc.json +++ b/bucket/oracle-instant-client-odbc.json @@ -1,5 +1,5 @@ { - "version": "21.15.0.0.0", + "version": "23.6.0.24.10", "description": "Additional libraries for enabling ODBC applications with Oracle Instant Client.", "homepage": "https://www.oracle.com/database/technologies/instant-client.html", "license": { @@ -9,42 +9,36 @@ "depends": "oracle-instant-client", "architecture": { "64bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/2115000/instantclient-odbc-windows.x64-21.15.0.0.0dbru.zip", - "hash": "7bdc4b06d75364487a729c84a0ea591fdb77654d975124b1028fbb0cf8de0849" - }, - "32bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/2115000/instantclient-odbc-nt-21.15.0.0.0dbru.zip", - "hash": "157170fca3f6130134a04a28235ad55685fb1071790602f4b47133cb107f2258" + "url": "https://download.oracle.com/otn_software/nt/instantclient/2360000/instantclient-odbc-windows.x64-23.6.0.24.10.zip", + "hash": "fb786bcdfba478f898b4d51f2d579aa1a466b113662359b0ee64e6bb2f23fe21" } }, - "extract_dir": "instantclient_21_15", + "extract_dir": "instantclient_23_6", "pre_install": [ - "$instantclient = versiondir 'oracle-instant-client' 'current'", + "$instantclient = currentdir 'oracle-instant-client'", "Copy-Item -Path \"$dir\\*\" -Destination \"$instantclient\" -Force -Recurse | Out-Null" ], "uninstaller": { "script": [ - "$instantclient = versiondir 'oracle-instant-client' 'current'", + "$instantclient = currentdir 'oracle-instant-client'", "Get-ChildItem -Path \"$dir\" -Exclude *.json | ForEach-Object { Remove-Item -LiteralPath \"$instantclient\\$($_.Name)\" -Recurse -Force -ErrorAction SilentlyContinue }" ] }, "checkver": { - "url": "https://www.oracle.com/database/technologies/instant-client/microsoft-windows-32-downloads.html", + "url": "https://www.oracle.com/database/technologies/instant-client/winx64-64-downloads.html", "regex": "Version ([\\d.]+)", "useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/$cleanVersion/instantclient-odbc-windows.x64-$versiondbru.zip" - }, - "32bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/$cleanVersion/instantclient-odbc-nt-$versiondbru.zip" + "url": "https://download.oracle.com/otn_software/nt/instantclient/$majorVersion$minorVersion$patchVersion000/instantclient-odbc-windows.x64-$version.zip" } }, "extract_dir": "instantclient_$majorVersion_$minorVersion" }, "notes": [ + "Note: The following steps requir Administrator privileges.", "Use 'odbc_install.exe' in Oracle Instant Client's dir to install ODBC.", "Use 'odbc_uninstall.exe' in above dir to uninstall it." ] diff --git a/bucket/oracle-instant-client-sdk.json b/bucket/oracle-instant-client-sdk.json index d4bb1562ca..ff384f72e1 100644 --- a/bucket/oracle-instant-client-sdk.json +++ b/bucket/oracle-instant-client-sdk.json @@ -1,5 +1,5 @@ { - "version": "21.15.0.0.0", + "version": "23.6.0.24.10", "description": "Additional header files and an example makefile for developing Oracle applications with Instant Client.", "homepage": "https://www.oracle.com/database/technologies/instant-client.html", "license": { @@ -9,37 +9,30 @@ "depends": "oracle-instant-client", "architecture": { "64bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/2115000/instantclient-sdk-windows.x64-21.15.0.0.0dbru.zip", - "hash": "864494e1a5a5f40d1dbf618d14e112fb9ab2bfcebaa94d70d7eb09851c59c903" - }, - "32bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/2115000/instantclient-sdk-nt-21.15.0.0.0dbru.zip", - "hash": "8447bc89035b790b231c6ae2ec9620b550752f8feb5f5ed0e50b2aa15f2f0fde" + "url": "https://download.oracle.com/otn_software/nt/instantclient/2360000/instantclient-sdk-windows.x64-23.6.0.24.10.zip", + "hash": "f9935a05c00c9da8026a7fdd5f4e7e043b5d026ed9c1a967b90f14ebe0bf8c85" } }, - "extract_dir": "instantclient_21_15", + "extract_dir": "instantclient_23_6", "pre_install": [ - "$instantclient = versiondir 'oracle-instant-client' 'current'", + "$instantclient = currentdir 'oracle-instant-client'", "Copy-Item -Path \"$dir\\*\" -Destination \"$instantclient\" -Force -Recurse | Out-Null" ], "uninstaller": { "script": [ - "$instantclient = versiondir 'oracle-instant-client' 'current'", + "$instantclient = currentdir 'oracle-instant-client'", "Get-ChildItem -Path \"$dir\" -Exclude *.json | ForEach-Object { Remove-Item -LiteralPath \"$instantclient\\$($_.Name)\" -Recurse -Force -ErrorAction SilentlyContinue }" ] }, "checkver": { - "url": "https://www.oracle.com/database/technologies/instant-client/microsoft-windows-32-downloads.html", + "url": "https://www.oracle.com/database/technologies/instant-client/winx64-64-downloads.html", "regex": "Version ([\\d.]+)", "useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/$cleanVersion/instantclient-sdk-windows.x64-$versiondbru.zip" - }, - "32bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/$cleanVersion/instantclient-sdk-nt-$versiondbru.zip" + "url": "https://download.oracle.com/otn_software/nt/instantclient/$majorVersion$minorVersion$patchVersion000/instantclient-sdk-windows.x64-$version.zip" } }, "extract_dir": "instantclient_$majorVersion_$minorVersion" diff --git a/bucket/oracle-instant-client-sqlplus.json b/bucket/oracle-instant-client-sqlplus.json index b227052af2..20c822a9eb 100644 --- a/bucket/oracle-instant-client-sqlplus.json +++ b/bucket/oracle-instant-client-sqlplus.json @@ -1,5 +1,5 @@ { - "version": "21.15.0.0.0", + "version": "23.6.0.24.10", "description": "The SQL*Plus command line tool for SQL and PL/SQL queries with Oracle Instant Client.", "homepage": "https://www.oracle.com/database/technologies/instant-client.html", "license": { @@ -9,37 +9,30 @@ "depends": "oracle-instant-client", "architecture": { "64bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/2115000/instantclient-sqlplus-windows.x64-21.15.0.0.0dbru.zip", - "hash": "f2355f95fec1528a0494d6e3594f8f14d97e0c526a3d699a3955bda1f895733a" - }, - "32bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/2115000/instantclient-sqlplus-nt-21.15.0.0.0dbru.zip", - "hash": "55e16c273bc3139e49177f72d5359da89f04df2840566da16d956d6937049a97" + "url": "https://download.oracle.com/otn_software/nt/instantclient/2360000/instantclient-sqlplus-windows.x64-23.6.0.24.10.zip", + "hash": "09ebe010ba87b90f2f8aa8cca901b0f4738af43030112cdd13d820de7e27ca74" } }, - "extract_dir": "instantclient_21_15", + "extract_dir": "instantclient_23_6", "pre_install": [ - "$instantclient = versiondir 'oracle-instant-client' 'current'", + "$instantclient = currentdir 'oracle-instant-client'", "Copy-Item -Path \"$dir\\*\" -Destination \"$instantclient\" -Force -Recurse | Out-Null" ], "uninstaller": { "script": [ - "$instantclient = versiondir 'oracle-instant-client' 'current'", + "$instantclient = currentdir 'oracle-instant-client'", "Get-ChildItem -Path \"$dir\" -Exclude *.json | ForEach-Object { Remove-Item -LiteralPath \"$instantclient\\$($_.Name)\" -Recurse -Force -ErrorAction SilentlyContinue }" ] }, "checkver": { - "url": "https://www.oracle.com/database/technologies/instant-client/microsoft-windows-32-downloads.html", + "url": "https://www.oracle.com/database/technologies/instant-client/winx64-64-downloads.html", "regex": "Version ([\\d.]+)", "useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/$cleanVersion/instantclient-sqlplus-windows.x64-$versiondbru.zip" - }, - "32bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/$cleanVersion/instantclient-sqlplus-nt-$versiondbru.zip" + "url": "https://download.oracle.com/otn_software/nt/instantclient/$majorVersion$minorVersion$patchVersion000/instantclient-sqlplus-windows.x64-$version.zip" } }, "extract_dir": "instantclient_$majorVersion_$minorVersion" diff --git a/bucket/oracle-instant-client.json b/bucket/oracle-instant-client.json index d8865b010f..795d91a2f8 100644 --- a/bucket/oracle-instant-client.json +++ b/bucket/oracle-instant-client.json @@ -1,49 +1,39 @@ { - "version": "21.15.0.0.0", + "version": "23.6.0.24.10", "description": "Connect to a local or remote Oracle Database for development and production deployment.", "homepage": "https://www.oracle.com/database/technologies/instant-client.html", "license": { "identifier": "Freeware", "url": "https://www.oracle.com/downloads/licenses/instant-client-lic.html" }, + "suggest": { + "vcredist": "extras/vcredist2022" + }, "architecture": { "64bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/2115000/instantclient-basic-windows.x64-21.15.0.0.0dbru.zip", - "hash": "9cb28a535f3b19cb95cc2d14b5e67c7ea4efeaa1b1358913c1ce60183debd2c5", + "url": "https://download.oracle.com/otn_software/nt/instantclient/2360000/instantclient-basic-windows.x64-23.6.0.24.10.zip", + "hash": "33dde93f8ccc29f4520af4d9426b957ac0a1551e848569bb32b8ba1d99ac2769", "env_set": { "OCI_LIB64": "$dir", "TNS_ADMIN": "$dir\\network\\admin" } - }, - "32bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/2115000/instantclient-basic-nt-21.15.0.0.0dbru.zip", - "hash": "74b86a60faff68a9978e1a5f1516408fcbd0ba05f45b708c79a7d1c49fda90f5", - "env_set": { - "OCI_LIB32": "$dir", - "TNS_ADMIN": "$dir\\network\\admin" - } } }, - "suggest": { - "vcredist": "extras/vcredist2022" - }, - "extract_dir": "instantclient_21_15", + "extract_dir": "instantclient_23_6", "env_add_path": ".", "persist": "network\\admin", "checkver": { - "url": "https://www.oracle.com/database/technologies/instant-client/microsoft-windows-32-downloads.html", + "url": "https://www.oracle.com/database/technologies/instant-client/winx64-64-downloads.html", "regex": "Version ([\\d.]+)", "useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/$cleanVersion/instantclient-basic-windows.x64-$versiondbru.zip" - }, - "32bit": { - "url": "https://download.oracle.com/otn_software/nt/instantclient/$cleanVersion/instantclient-basic-nt-$versiondbru.zip" + "url": "https://download.oracle.com/otn_software/nt/instantclient/$majorVersion$minorVersion$patchVersion000/instantclient-basic-windows.x64-$version.zip" } }, "extract_dir": "instantclient_$majorVersion_$minorVersion" - } + }, + "notes": "For 32bit, use 'versions/oracle-instant-client21'." }