Merge remote-tracking branch 'origin/GP-1830_ghidra1_BSim_GSON'

This commit is contained in:
ghidra1 2024-12-20 18:37:50 -05:00
commit 747edbfc67
6 changed files with 15 additions and 15 deletions

View file

@ -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/commons-dbcp2-2.9.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/commons-pool2-2.11.1.jar Apache License 2.0
MODULE FILE LICENSE: lib/commons-logging-1.2.jar Apache License 2.0

View file

@ -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 "org.apache.commons:commons-dbcp2:2.9.0"
api "org.apache.commons:commons-pool2:2.11.1"
api "commons-logging:commons-logging:1.2"

View file

@ -107,13 +107,13 @@
in the module directory <CODE>Ghidra/Features/BSim/support</CODE> 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 <CODE>postgresql-15.3.tar.gz</CODE>, can be obtained from the PostgreSQL
file, currently <CODE>postgresql-15.10.tar.gz</CODE>, can be obtained from the PostgreSQL
website at </P>
<DIV class="informalexample">
<TABLE border="0" summary="Simple list" class="simplelist">
<TR>
<TD><CODE class="computeroutput">https://www.postgresql.org/ftp/source/v15.3
<TD><CODE class="computeroutput">https://www.postgresql.org/ftp/source/v15.10
</CODE></TD>
</TR>
</TABLE>
@ -122,12 +122,12 @@
<P>The steps to build the PostgreSQL server with the BSim extension then are:</P>
<P>1) If not already present, place the PostgreSQL source distribution file
<CODE>postgresql-15.3.tar.gz</CODE> in the Ghidra installation at</P>
<CODE>postgresql-15.10.tar.gz</CODE> in the Ghidra installation at</P>
<DIV class="informalexample">
<TABLE border="0" summary="Simple list" class="simplelist">
<TR>
<TD><CODE class="computeroutput">$(ROOT)/Ghidra/Features/BSim/support/postgresql-15.3.tar.gz
<TD><CODE class="computeroutput">$(ROOT)/Ghidra/Features/BSim/support/postgresql-15.10.tar.gz
</CODE></TD>
</TR>
</TABLE>

View file

@ -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-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"

View file

@ -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")
],
[

View file

@ -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