Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-02 03:37:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4860_ryanmkurtz_yajsw--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz
2024-08-27 11:56:05 -04:00
parent 67a2f88803 67851b9e05
commit b30a94edc6
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/GhidraServer/Module.manifest
+1 -1
View File
@@ -1,2 +1,2 @@
DATA SEARCH IGNORE DIR: yajsw-stable-13.09 DATA SEARCH IGNORE DIR: yajsw-stable-13.12
EXCLUDE FROM GHIDRA JAR: true EXCLUDE FROM GHIDRA JAR: true
Ghidra/Features/GhidraServer/build.gradle
+1 -1
View File
@@ -21,7 +21,7 @@ apply plugin: 'eclipse'
eclipse.project.name = 'Features GhidraServer' eclipse.project.name = 'Features GhidraServer'
def yajswRelease = "yajsw-stable-13.09" def yajswRelease = "yajsw-stable-13.12"
configurations { configurations {
runGhidraServer runGhidraServer
Ghidra/RuntimeScripts/Common/server/server.conf
-6
View File
@@ -214,12 +214,6 @@ wrapper.logfile.maxsize=10m
# files are deleted. The default value of 0 implies no limit. # files are deleted. The default value of 0 implies no limit.
wrapper.logfile.maxfiles=10 wrapper.logfile.maxfiles=10
#********************************************************************
# Service Wrapper Linux Properties
#********************************************************************
# Force initd (systemd had issues during testing on Ubuntu 21.04 with yajsw-13.00)
wrapper.daemon.system = initd
#******************************************************************** #********************************************************************
# Service Wrapper Windows Properties # Service Wrapper Windows Properties
#******************************************************************** #********************************************************************
gradle/support/fetchDependencies.gradle
+3 -3
View File
@@ -82,9 +82,9 @@ ext.deps = [
destination: FLAT_REPO_DIR destination: FLAT_REPO_DIR
], ],
[ [
name: "yajsw-stable-13.09.zip", name: "yajsw-stable-13.12.zip",
url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.09/yajsw-stable-13.09.zip", url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.12/yajsw-stable-13.12.zip",
sha256: "4dae732a535846ae5dfab753e82a4d5f93ad9a05a065e2172bb9774a1b15453a", sha256: "c6fc59815d3800d14ec977926a8afd3f606a0ebd74d2cfd60601677466edeaa2",
destination: file("${DEPS_DIR}/GhidraServer") destination: file("${DEPS_DIR}/GhidraServer")
], ],
[ [