From 2d6ec1ff8324ad28e3c798249463bc03d6a70017 Mon Sep 17 00:00:00 2001 From: Andras Gemes Date: Wed, 23 Oct 2024 21:00:38 +0200 Subject: [PATCH] BSim: Update PostgreSQL (15.3->17.0) to fix SSL errors --- Ghidra/Features/BSim/Module.manifest | 2 +- Ghidra/Features/BSim/build.gradle | 2 +- Ghidra/Features/BSim/make-postgres.sh | 6 +++--- .../main/help/help/topics/BSim/DatabaseConfiguration.html | 8 ++++---- gradle/support/fetchDependencies.gradle | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Ghidra/Features/BSim/Module.manifest b/Ghidra/Features/BSim/Module.manifest index 60e6f9f4249..a0c98b55690 100755 --- a/Ghidra/Features/BSim/Module.manifest +++ b/Ghidra/Features/BSim/Module.manifest @@ -1,5 +1,5 @@ ##MODULE IP: Oxygen Icons - LGPL 3.0 -MODULE FILE LICENSE: postgresql-15.3.tar.gz Postgresql License +MODULE FILE LICENSE: postgresql-17.0.tar.gz Postgresql License MODULE FILE LICENSE: lib/postgresql-42.6.2.jar PostgresqlJDBC License MODULE FILE LICENSE: lib/json-simple-1.1.1.jar Apache License 2.0 MODULE FILE LICENSE: lib/commons-dbcp2-2.9.0.jar Apache License 2.0 diff --git a/Ghidra/Features/BSim/build.gradle b/Ghidra/Features/BSim/build.gradle index a7b3909fe9a..39695e0b974 100755 --- a/Ghidra/Features/BSim/build.gradle +++ b/Ghidra/Features/BSim/build.gradle @@ -26,7 +26,7 @@ import java.nio.file.Files import org.gradle.util.GUtil // NOTE: fetchDependencies.gradle must be updated if postgresql version changes -def postgresql_distro = "postgresql-15.3.tar.gz" +def postgresql_distro = "postgresql-17.0.tar.gz" dependencies { api project(":Decompiler") diff --git a/Ghidra/Features/BSim/make-postgres.sh b/Ghidra/Features/BSim/make-postgres.sh index 9bdf7898b45..775ffa37215 100755 --- a/Ghidra/Features/BSim/make-postgres.sh +++ b/Ghidra/Features/BSim/make-postgres.sh @@ -18,11 +18,11 @@ # This script builds the postgresql server and BSim extension within a # GHIDRA installation. # -# The PostgreSQL source distribution file postgresql-15.3.tar.gz must +# The PostgreSQL source distribution file postgresql-17.0.tar.gz must # be placed in the BSim module directory prior to running this script. # This file can be downloaded directly from the PostgreSQL website at: # -# https://www.postgresql.org/ftp/source/v15.3 +# https://www.postgresql.org/ftp/source/v17.0 # # Within development environments, this script will first check the # ghidra.bin repo for this source file. @@ -46,7 +46,7 @@ # # -POSTGRES=postgresql-15.3 +POSTGRES=postgresql-17.0 POSTGRES_GZ=${POSTGRES}.tar.gz POSTGRES_CONFIG_OPTIONS="--disable-rpath --with-openssl" diff --git a/Ghidra/Features/BSim/src/main/help/help/topics/BSim/DatabaseConfiguration.html b/Ghidra/Features/BSim/src/main/help/help/topics/BSim/DatabaseConfiguration.html index b9244a645cd..5bdcc340c06 100644 --- a/Ghidra/Features/BSim/src/main/help/help/topics/BSim/DatabaseConfiguration.html +++ b/Ghidra/Features/BSim/src/main/help/help/topics/BSim/DatabaseConfiguration.html @@ -107,13 +107,13 @@

Building the Server

in the module directory Ghidra/Features/BSim that builds both the PostgreSQL server and the BSim extension from source and prepares the installation for use with Ghidra. If not already included in the Ghidra installation, the source distribution - file, currently postgresql-15.3.tar.gz, can be obtained from the PostgreSQL + file, currently postgresql-17.0.tar.gz, can be obtained from the PostgreSQL website at

-
https://www.postgresql.org/ftp/source/v15.3 + https://www.postgresql.org/ftp/source/v17.0
@@ -122,12 +122,12 @@

Building the Server

The steps to build the PostgreSQL server with the BSim extension then are:

1) If not already present, place the PostgreSQL source distribution file - postgresql-15.3.tar.gz in the Ghidra installation at

+ postgresql-17.0.tar.gz in the Ghidra installation at

-
$(ROOT)/Ghidra/Features/BSim/postgresql-15.3.tar.gz + $(ROOT)/Ghidra/Features/BSim/postgresql-17.0.tar.gz
diff --git a/gradle/support/fetchDependencies.gradle b/gradle/support/fetchDependencies.gradle index 4b358694dbb..0a4ddd03741 100644 --- a/gradle/support/fetchDependencies.gradle +++ b/gradle/support/fetchDependencies.gradle @@ -89,9 +89,9 @@ ext.deps = [ destination: file("${DEPS_DIR}/GhidraServer") ], [ - name: "postgresql-15.3.tar.gz", - url: "https://ftp.postgresql.org/pub/source/v15.3/postgresql-15.3.tar.gz", - sha256: "086d38533e28747966a4d5f1e78ea432e33a78f21dcb9133010ecb5189fad98c", + name: "postgresql-17.0.tar.gz", + url: "https://ftp.postgresql.org/pub/source/v17.0/postgresql-17.0.tar.gz", + sha256: "bf81c0c5161e456a886ede5f1f4133f43af000637e377156a02e7e83569081ad", destination: file("${DEPS_DIR}/BSim") ], [