Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-10 06:02:09 +00:00
Code Issues 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
commit b30a94edc6
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Features/GhidraServer/Module.manifest
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

6
Ghidra/Features/GhidraServer/build.gradle
View File

@ -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.
@ -21,7 +21,7 @@ apply plugin: 'eclipse'
eclipse.project.name = 'Features GhidraServer'
def yajswRelease = "yajsw-stable-13.09"
def yajswRelease = "yajsw-stable-13.12"
configurations {
runGhidraServer

6
Ghidra/RuntimeScripts/Common/server/server.conf
View File

@ -214,12 +214,6 @@ wrapper.logfile.maxsize=10m
# files are deleted. The default value of 0 implies no limit.
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
#********************************************************************

10
gradle/support/fetchDependencies.gradle
View File

@ -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.
@ -82,9 +82,9 @@ ext.deps = [
destination: FLAT_REPO_DIR
],
[
name: "yajsw-stable-13.09.zip",
url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.09/yajsw-stable-13.09.zip",
sha256: "4dae732a535846ae5dfab753e82a4d5f93ad9a05a065e2172bb9774a1b15453a",
name: "yajsw-stable-13.12.zip",
url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.12/yajsw-stable-13.12.zip",
sha256: "c6fc59815d3800d14ec977926a8afd3f606a0ebd74d2cfd60601677466edeaa2",
destination: file("${DEPS_DIR}/GhidraServer")
],
[