Attachment 253764 Details for Bug 281655 – Hardcoded link and path value changes.

[patch] Hardcoded link and path value changes.

froxlor_v2.2.0_2-patch.diff (text/plain), 2.49 KB, created by ek on 2024-09-22 23:51:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ek

Created: 2024-09-22 23:51:09 UTC

Size: 2.49 KB

patch

obsolete

>diff --git a/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cli_MasterCron.php b/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cli_MasterCron.php
>new file mode 100644
>index 000000000000..643bd1cb9973
>--- /dev/null
>+++ b/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cli_MasterCron.php
>@@ -0,0 +1,11 @@
>+--- froxlor/lib/Froxlor/Cli/MasterCron.php.orig	2024-09-22 23:29:40 UTC
>++++ froxlor/lib/Froxlor/Cli/MasterCron.php
>+@@ -210,7 +210,7 @@ final class MasterCron extends CliCommand
>+ 	private function lockJob(string $job, OutputInterface $output): bool
>+ 	{
>+ 
>+-		$this->lockFile = '/run/lock/froxlor_' . $job . '.lock';
>++		$this->lockFile = '/var/run/froxlor_' . $job . '.lock';
>+ 
>+ 		if (file_exists($this->lockFile)) {
>+ 			$jobinfo = json_decode(file_get_contents($this->lockFile), true);
>diff --git a/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cron_Traffic_TrafficCron.php b/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cron_Traffic_TrafficCron.php
>new file mode 100644
>index 000000000000..551d3af9b4f1
>--- /dev/null
>+++ b/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cron_Traffic_TrafficCron.php
>@@ -0,0 +1,11 @@
>+--- froxlor/lib/Froxlor/Cron/Traffic/TrafficCron.php.orig	2024-09-22 23:30:45 UTC
>++++ froxlor/lib/Froxlor/Cron/Traffic/TrafficCron.php
>+@@ -861,7 +861,7 @@ class TrafficCron extends FroxlorCron
>+ 			// the default selection is 'current',
>+ 			// so link the latest dir to it
>+ 			$new_current = FileDir::makeCorrectFile($outputdir . '/current');
>+-			FileDir::safe_exec('ln -fTs ' . escapeshellarg($staticOutputdir) . ' ' . escapeshellarg($new_current));
>++			FileDir::safe_exec('ln -fFs ' . escapeshellarg($staticOutputdir) . ' ' . escapeshellarg($new_current));
>+ 
>+ 			// statistics file looks like: 'awstats[month][year].[domain].txt'
>+ 			$file = FileDir::makeCorrectFile($outputdir . '/awstats' . date('mY', time()) . '.' . $domain . '.txt');
>diff --git a/sysutils/froxlor/pkg-plist b/sysutils/froxlor/pkg-plist
>index a2164ddefd55..47d1d6d2a560 100644
>--- a/sysutils/froxlor/pkg-plist
>+++ b/sysutils/froxlor/pkg-plist
>@@ -1982,7 +1982,7 @@
> %%WWWDIR%%/vendor/voku/portable-ascii/src/voku/helper/data/x1d7.php
> %%WWWDIR%%/vendor/voku/portable-ascii/src/voku/helper/data/x1f1.php
> %%WWWDIR%%/vendor/voku/portable-utf8/CHANGELOG.md
>-%%WWWDIR%%/vendor/voku/portable-utf8/LICENSE%%AP_MOD_EN%%PACHE
>+%%WWWDIR%%/vendor/voku/portable-utf8/LICENSE-APACHE
> %%WWWDIR%%/vendor/voku/portable-utf8/LICENSE-GPL
> %%WWWDIR%%/vendor/voku/portable-utf8/README.md
> %%WWWDIR%%/vendor/voku/portable-utf8/SECURITY.md

Actions: View | Diff

Attachments on bug 281655: 253760 | 253764 | 255349