From 7cc781a59cebb93df53a93af46a12b8f75aa8a57 Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Fri, 20 Dec 2024 11:19:24 -0500 Subject: [PATCH] GP-5212 Updated to postgresql server 15.10 and JDBC driver 42.7.3 --- Ghidra/Features/BSim/Module.manifest | 4 +-- Ghidra/Features/BSim/build.gradle | 8 ++--- Ghidra/Features/BSim/make-postgres.sh | 32 +++++++++---------- .../topics/BSim/DatabaseConfiguration.html | 8 ++--- gradle/support/fetchDependencies.gradle | 6 ++-- licenses/Postgresql_License.txt | 2 +- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Ghidra/Features/BSim/Module.manifest b/Ghidra/Features/BSim/Module.manifest index 60e6f9f424..455bebee67 100755 --- a/Ghidra/Features/BSim/Module.manifest +++ b/Ghidra/Features/BSim/Module.manifest @@ -1,6 +1,6 @@ ##MODULE IP: Oxygen Icons - LGPL 3.0 -MODULE FILE LICENSE: postgresql-15.3.tar.gz Postgresql License -MODULE FILE LICENSE: lib/postgresql-42.6.2.jar PostgresqlJDBC License +MODULE FILE LICENSE: postgresql-15.10.tar.gz Postgresql License +MODULE FILE LICENSE: lib/postgresql-42.7.3.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 MODULE FILE LICENSE: lib/commons-pool2-2.11.1.jar Apache License 2.0 diff --git a/Ghidra/Features/BSim/build.gradle b/Ghidra/Features/BSim/build.gradle index f573ad83d9..4b2a368579 100755 --- a/Ghidra/Features/BSim/build.gradle +++ b/Ghidra/Features/BSim/build.gradle @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,13 +26,13 @@ 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-15.10.tar.gz" dependencies { api project(":Decompiler") api project(":CodeCompare") - api "org.postgresql:postgresql:42.6.2" + api "org.postgresql:postgresql:42.7.3" api "com.googlecode.json-simple:json-simple:1.1.1" api "org.apache.commons:commons-dbcp2:2.9.0" api "org.apache.commons:commons-pool2:2.11.1" diff --git a/Ghidra/Features/BSim/make-postgres.sh b/Ghidra/Features/BSim/make-postgres.sh index 9bdf7898b4..8ed4c91306 100755 --- a/Ghidra/Features/BSim/make-postgres.sh +++ b/Ghidra/Features/BSim/make-postgres.sh @@ -1,28 +1,28 @@ #!/bin/bash ## ### -# IP: GHIDRA -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# IP: GHIDRA +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. ## # # 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-15.10.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/v15.10 # # 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-15.10 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 9509130c56..4f5ac27aad 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 @@ 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-15.10.tar.gz, can be obtained from the PostgreSQL website at

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

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-15.10.tar.gz in the Ghidra installation at

-
$(ROOT)/Ghidra/Features/BSim/postgresql-15.3.tar.gz + $(ROOT)/Ghidra/Features/BSim/postgresql-15.10.tar.gz
diff --git a/gradle/support/fetchDependencies.gradle b/gradle/support/fetchDependencies.gradle index 9ee0b539ce..559326cdce 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-15.10.tar.gz", + url: "https://ftp.postgresql.org/pub/source/v15.10/postgresql-15.10.tar.gz", + sha256: "173366605259a83dc189c4327ff4c37254afed65b4f866cbd8a5ef2ea449e8f3", destination: file("${DEPS_DIR}/BSim") ], [ diff --git a/licenses/Postgresql_License.txt b/licenses/Postgresql_License.txt index 1681966945..548f346f46 100644 --- a/licenses/Postgresql_License.txt +++ b/licenses/Postgresql_License.txt @@ -1,7 +1,7 @@ PostgreSQL Database Management System (formerly known as Postgres, then as Postgres95) -Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group +Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group Portions Copyright (c) 1994, The Regents of the University of California