SecBSD/ports
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SecBSD's official ports repository

Browse source
This commit is contained in:
purplerain 2023-08-16 22:26:55 +00:00
commit 2c0afcbbf3
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
64331 changed files with 5339189 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

105
net/librenms/patches/patch-daily_sh Normal file
View file

@ -0,0 +1,105 @@
Index: daily.sh
--- daily.sh.orig
+++ daily.sh
@@ -23,16 +23,16 @@
# define DAILY_SCRIPT as the full path to this script and LIBRENMS_DIR as the directory this script is in
DAILY_SCRIPT=$(readlink -f "$0")
LIBRENMS_DIR=$(dirname "$DAILY_SCRIPT")
-COMPOSER="php ${LIBRENMS_DIR}/scripts/composer_wrapper.php --no-interaction"
+COMPOSER="${MODPHP_BIN} ${LIBRENMS_DIR}/scripts/composer_wrapper.php --no-interaction"
# set log_file, using librenms 'log_dir' config setting, if set
# otherwise we default to <LibreNMS Install Directory>/logs
-LOG_DIR=$(php -r "@include '${LIBRENMS_DIR}/config.php'; echo isset(\$config['log_dir']) ? \$config['log_dir'] : '${LIBRENMS_DIR}/logs';")
+LOG_DIR=$(${MODPHP_BIN} -r "@include '${LIBRENMS_DIR}/config.php'; echo isset(\$config['log_dir']) ? \$config['log_dir'] : '${LIBRENMS_DIR}/logs';")
# get the librenms user
# shellcheck source=.env.example
source "${LIBRENMS_DIR}/.env"
-LIBRENMS_USER="${LIBRENMS_USER:-librenms}"
+LIBRENMS_USER="${LIBRENMS_USER:-_librenms}"
LIBRENMS_USER_ID=$(id -u "$LIBRENMS_USER")
#######################################
@@ -72,7 +72,7 @@ status_run() {
else
printf " \\033[0;31mFAIL\\033[0m\\n"
if [[ "${arg_option}" == "update" ]]; then
- php "${LIBRENMS_DIR}/daily.php" -f notify -o "${tmp}"
+ ${MODPHP_BIN} "${LIBRENMS_DIR}/daily.php" -f notify -o "${tmp}"
fi
if [[ -n "${tmp}" ]]; then
# print output in case of failure
@@ -99,7 +99,7 @@ call_daily_php() {
args=("$@")
for arg in "${args[@]}"; do
- php "${LIBRENMS_DIR}/daily.php" -f "${arg}"
+ ${MODPHP_BIN} "${LIBRENMS_DIR}/daily.php" -f "${arg}"
done
}
@@ -121,7 +121,7 @@ set_notifiable_result() {
arg_type=$1
arg_result=$2
- php "${LIBRENMS_DIR}/daily.php" -f handle_notifiable -t "${arg_type}" -r "${arg_result}"
+ ${MODPHP_BIN} "${LIBRENMS_DIR}/daily.php" -f handle_notifiable -t "${arg_type}" -r "${arg_result}"
}
#######################################
@@ -132,13 +132,13 @@ set_notifiable_result() {
check_dependencies() {
local branch ver_71 ver_72 ver_73 ver_81 python3 python_deps phpver pythonver old_branches msg
- branch=$(git rev-parse --abbrev-ref HEAD)
+ branch=master
scripts/check_requirements.py > /dev/null 2>&1 || pip3 install -r requirements.txt > /dev/null 2>&1
- ver_71=$(php -r "echo (int)version_compare(PHP_VERSION, '7.1.3', '<');")
- ver_72=$(php -r "echo (int)version_compare(PHP_VERSION, '7.2.5', '<');")
- ver_73=$(php -r "echo (int)version_compare(PHP_VERSION, '7.3', '<');")
- ver_81=$(php -r "echo (int)version_compare(PHP_VERSION, '8.1', '<');")
+ ver_71=$(${MODPHP_BIN} -r "echo (int)version_compare(PHP_VERSION, '7.1.3', '<');")
+ ver_72=$(${MODPHP_BIN} -r "echo (int)version_compare(PHP_VERSION, '7.2.5', '<');")
+ ver_73=$(${MODPHP_BIN} -r "echo (int)version_compare(PHP_VERSION, '7.3', '<');")
+ ver_81=$(${MODPHP_BIN} -r "echo (int)version_compare(PHP_VERSION, '8.1', '<');")
python3=$(python3 -c "import sys;print(int(sys.version_info < (3, 4)))" 2> /dev/null)
python_deps=$("${LIBRENMS_DIR}/scripts/check_requirements.py" > /dev/null 2>&1; echo $?)
phpver="master"
@@ -276,7 +276,7 @@ main () {
fi
if [[ -z "$arg" ]]; then
- up=$(php daily.php -f update >&2; echo $?)
+ up=$(${MODPHP_BIN} daily.php -f update >&2; echo $?)
if [[ "$up" == "0" ]]; then
"${DAILY_SCRIPT}" no-code-update
set_notifiable_result update 1 # make sure there are no update notifications if update is disabled
@@ -287,7 +287,7 @@ main () {
php_ver_ret=$?
# Restore composer files if user installed plugins
- git checkout --quiet -- composer.json composer.lock
+ #git checkout --quiet -- composer.json composer.lock
update_res=0
if [[ "$up" == "1" ]] || [[ "$php_ver_ret" == "1" ]]; then
@@ -339,7 +339,7 @@ main () {
no-code-update)
# Updates of the code are disabled, just check for schema updates
# and clean up the db.
- status_run 'Updating SQL-Schema' 'php includes/sql-schema/update.php'
+ status_run 'Updating SQL-Schema' '${MODPHP_BIN} includes/sql-schema/update.php'
status_run 'Cleaning up DB' "'$DAILY_SCRIPT' cleanup"
status_run 'Caching Mac OUI data' "$DAILY_SCRIPT mac_oui"
;;
@@ -366,7 +366,7 @@ main () {
fi
# List all tasks to do after pull in the order of execution
- status_run 'Updating SQL-Schema' 'php includes/sql-schema/update.php'
+ status_run 'Updating SQL-Schema' '${MODPHP_BIN} includes/sql-schema/update.php'
status_run 'Updating submodules' "$DAILY_SCRIPT submodules"
status_run 'Cleaning up DB' "$DAILY_SCRIPT cleanup"
status_run 'Fetching notifications' "$DAILY_SCRIPT notifications"