Skip to content

Commit ff2dab8

Browse files
ghidra1ghidra1
committed
Merge remote-tracking branch 'origin/GP-5212_ghidra1_PostgresqlUpdate'
into patch (Closes NationalSecurityAgency#7084, Closes NationalSecurityAgency#6115)
2 parents f67da58 + 7cc781a commit ff2dab8

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

‎Ghidra/Features/BSim/Module.manifest

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
##MODULE IP: Oxygen Icons - LGPL 3.0
2-
MODULE FILE LICENSE: postgresql-15.3.tar.gz Postgresql License
3-
MODULE FILE LICENSE: lib/postgresql-42.6.2.jar PostgresqlJDBC License
2+
MODULE FILE LICENSE: postgresql-15.10.tar.gz Postgresql License
3+
MODULE FILE LICENSE: lib/postgresql-42.7.3.jar PostgresqlJDBC License
44
MODULE FILE LICENSE: lib/json-simple-1.1.1.jar Apache License 2.0
55
MODULE FILE LICENSE: lib/commons-dbcp2-2.9.0.jar Apache License 2.0
66
MODULE FILE LICENSE: lib/commons-pool2-2.11.1.jar Apache License 2.0

‎Ghidra/Features/BSim/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
7-
*
7+
*
88
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
9+
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
1212
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,13 +26,13 @@ import java.nio.file.Files
2626
import org.gradle.util.GUtil
2727

2828
// NOTE: fetchDependencies.gradle must be updated if postgresql version changes
29-
def postgresql_distro = "postgresql-15.3.tar.gz"
29+
def postgresql_distro = "postgresql-15.10.tar.gz"
3030

3131
dependencies {
3232
api project(":Decompiler")
3333
api project(":CodeCompare")
3434

35-
api "org.postgresql:postgresql:42.6.2"
35+
api "org.postgresql:postgresql:42.7.3"
3636
api "com.googlecode.json-simple:json-simple:1.1.1"
3737
api "org.apache.commons:commons-dbcp2:2.9.0"
3838
api "org.apache.commons:commons-pool2:2.11.1"

‎Ghidra/Features/BSim/make-postgres.sh

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
#!/bin/bash
22
## ###
3-
# IP: GHIDRA
4-
#
5-
# Licensed under the Apache License, Version 2.0 (the "License");
6-
# you may not use this file except in compliance with the License.
7-
# You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing, software
12-
# distributed under the License is distributed on an "AS IS" BASIS,
13-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
# See the License for the specific language governing permissions and
15-
# limitations under the License.
3+
# IP: GHIDRA
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
1616
##
1717
#
1818
# This script builds the postgresql server and BSim extension within a
1919
# GHIDRA installation.
2020
#
21-
# The PostgreSQL source distribution file postgresql-15.3.tar.gz must
21+
# The PostgreSQL source distribution file postgresql-15.10.tar.gz must
2222
# be placed in the BSim module directory prior to running this script.
2323
# This file can be downloaded directly from the PostgreSQL website at:
2424
#
25-
# https://www.postgresql.org/ftp/source/v15.3
25+
# https://www.postgresql.org/ftp/source/v15.10
2626
#
2727
# Within development environments, this script will first check the
2828
# ghidra.bin repo for this source file.
@@ -46,7 +46,7 @@
4646
#
4747
#
4848

49-
POSTGRES=postgresql-15.3
49+
POSTGRES=postgresql-15.10
5050
POSTGRES_GZ=${POSTGRES}.tar.gz
5151
POSTGRES_CONFIG_OPTIONS="--disable-rpath --with-openssl"
5252

‎Ghidra/Features/BSim/src/main/help/help/topics/BSim/DatabaseConfiguration.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@ <H4 class="title"><A name="PostBuild"></A>Building the Server</H4>
107107
in the module directory <CODE>Ghidra/Features/BSim</CODE> that builds both the PostgreSQL
108108
server and the BSim extension from source and prepares the installation for use with
109109
Ghidra. If not already included in the Ghidra installation, the source distribution
110-
file, currently <CODE>postgresql-15.3.tar.gz</CODE>, can be obtained from the PostgreSQL
110+
file, currently <CODE>postgresql-15.10.tar.gz</CODE>, can be obtained from the PostgreSQL
111111
website at </P>
112112

113113
<DIV class="informalexample">
114114
<TABLE border="0" summary="Simple list" class="simplelist">
115115
<TR>
116-
<TD><CODE class="computeroutput">https://www.postgresql.org/ftp/source/v15.3
116+
<TD><CODE class="computeroutput">https://www.postgresql.org/ftp/source/v15.10
117117
</CODE></TD>
118118
</TR>
119119
</TABLE>
@@ -122,12 +122,12 @@ <H4 class="title"><A name="PostBuild"></A>Building the Server</H4>
122122
<P>The steps to build the PostgreSQL server with the BSim extension then are:</P>
123123

124124
<P>1) If not already present, place the PostgreSQL source distribution file
125-
<CODE>postgresql-15.3.tar.gz</CODE> in the Ghidra installation at</P>
125+
<CODE>postgresql-15.10.tar.gz</CODE> in the Ghidra installation at</P>
126126

127127
<DIV class="informalexample">
128128
<TABLE border="0" summary="Simple list" class="simplelist">
129129
<TR>
130-
<TD><CODE class="computeroutput">$(ROOT)/Ghidra/Features/BSim/postgresql-15.3.tar.gz
130+
<TD><CODE class="computeroutput">$(ROOT)/Ghidra/Features/BSim/postgresql-15.10.tar.gz
131131
</CODE></TD>
132132
</TR>
133133
</TABLE>

‎gradle/support/fetchDependencies.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ ext.deps = [
8989
destination: file("${DEPS_DIR}/GhidraServer")
9090
],
9191
[
92-
name: "postgresql-15.3.tar.gz",
93-
url: "https://ftp.postgresql.org/pub/source/v15.3/postgresql-15.3.tar.gz",
94-
sha256: "086d38533e28747966a4d5f1e78ea432e33a78f21dcb9133010ecb5189fad98c",
92+
name: "postgresql-15.10.tar.gz",
93+
url: "https://ftp.postgresql.org/pub/source/v15.10/postgresql-15.10.tar.gz",
94+
sha256: "173366605259a83dc189c4327ff4c37254afed65b4f866cbd8a5ef2ea449e8f3",
9595
destination: file("${DEPS_DIR}/BSim")
9696
],
9797
[

‎licenses/Postgresql_License.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PostgreSQL Database Management System
22
(formerly known as Postgres, then as Postgres95)
33

4-
Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
4+
Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
55

66
Portions Copyright (c) 1994, The Regents of the University of California
77

0 commit comments

Comments
 (0)