summaryrefslogtreecommitdiff
path: root/sysutils/froxlor
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/froxlor')
-rw-r--r--sysutils/froxlor/Makefile3
-rw-r--r--sysutils/froxlor/distinfo6
-rw-r--r--sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cli_MasterCron.php11
-rw-r--r--sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cron_Traffic_TrafficCron.php11
-rw-r--r--sysutils/froxlor/pkg-plist48
5 files changed, 58 insertions, 21 deletions
diff --git a/sysutils/froxlor/Makefile b/sysutils/froxlor/Makefile
index bf8ef28d1d0f..1cc391cb5026 100644
--- a/sysutils/froxlor/Makefile
+++ b/sysutils/froxlor/Makefile
@@ -1,5 +1,6 @@
PORTNAME= froxlor
-DISTVERSION= 2.2.5
+DISTVERSION= 2.2.7
+PORTREVISION= 2
CATEGORIES= sysutils www
MASTER_SITES= https://files.froxlor.org/releases/
diff --git a/sysutils/froxlor/distinfo b/sysutils/froxlor/distinfo
index 4e7a4a2a15ef..514fd92677e1 100644
--- a/sysutils/froxlor/distinfo
+++ b/sysutils/froxlor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731688250
-SHA256 (froxlor-2.2.5.tar.gz) = b8ebcba5a9e2752b4f8efcbf9a5a5207254fa2d056d367e9ed9c40d7a427b033
-SIZE (froxlor-2.2.5.tar.gz) = 3788019
+TIMESTAMP = 1746486315
+SHA256 (froxlor-2.2.7.tar.gz) = f8767224b62cdaabe450540ad336c45ec700bdf1602e102db1ef8cbac6dc7ac8
+SIZE (froxlor-2.2.7.tar.gz) = 3903448
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..16c063a76a12
--- /dev/null
+++ b/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cli_MasterCron.php
@@ -0,0 +1,11 @@
+--- froxlor/lib/Froxlor/Cli/MasterCron.php.orig 2025-05-07 03:26:39 UTC
++++ froxlor/lib/Froxlor/Cli/MasterCron.php
+@@ -211,7 +211,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..56bc0ee1600e
--- /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 2025-05-07 03:27:51 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 a17324832ed5..1f61b033da55 100644
--- a/sysutils/froxlor/pkg-plist
+++ b/sysutils/froxlor/pkg-plist
@@ -383,6 +383,7 @@
%%WWWDIR%%/lng/en.lng.php
%%WWWDIR%%/lng/es.lng.php
%%WWWDIR%%/lng/fr.lng.php
+%%WWWDIR%%/lng/hu.lng.php
%%WWWDIR%%/lng/index.html
%%WWWDIR%%/lng/it.lng.php
%%WWWDIR%%/lng/nl.lng.php
@@ -432,16 +433,16 @@
%%WWWDIR%%/templates/Froxlor/assets/scss/components/index.html
%%WWWDIR%%/templates/Froxlor/assets/scss/index.html
%%WWWDIR%%/templates/Froxlor/base.html.twig
-%%WWWDIR%%/templates/Froxlor/build/assets/app-65a6b342.js
-%%WWWDIR%%/templates/Froxlor/build/assets/app-8baf2336.css
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-brands-400-003f1154.ttf
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-brands-400-faae6fc0.woff2
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-regular-400-7d81a1a7.ttf
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-regular-400-9169d8be.woff2
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-solid-900-886c8611.woff2
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-solid-900-cea79b34.ttf
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-v4compatibility-335fd7d9.woff2
-%%WWWDIR%%/templates/Froxlor/build/assets/fa-v4compatibility-455e8e72.ttf
+%%WWWDIR%%/templates/Froxlor/build/assets/app-BNFip9fw.js
+%%WWWDIR%%/templates/Froxlor/build/assets/app-Cj1XHuKC.css
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-brands-400-D1LuMI3I.ttf
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-brands-400-D_cYUPeE.woff2
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-regular-400-BjRzuEpd.woff2
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-regular-400-DZaxPHgR.ttf
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-solid-900-CTAAxXor.woff2
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-solid-900-D0aA9rwL.ttf
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-v4compatibility-C9RhG_FT.woff2
+%%WWWDIR%%/templates/Froxlor/build/assets/fa-v4compatibility-CCth-dXg.ttf
%%WWWDIR%%/templates/Froxlor/build/assets/index.html
%%WWWDIR%%/templates/Froxlor/build/index.html
%%WWWDIR%%/templates/Froxlor/build/manifest.json
@@ -611,10 +612,12 @@
%%WWWDIR%%/vendor/league/commonmark/composer.json
%%WWWDIR%%/vendor/league/commonmark/src/CommonMarkConverter.php
%%WWWDIR%%/vendor/league/commonmark/src/ConverterInterface.php
+%%WWWDIR%%/vendor/league/commonmark/src/Delimiter/Bracket.php
%%WWWDIR%%/vendor/league/commonmark/src/Delimiter/Delimiter.php
%%WWWDIR%%/vendor/league/commonmark/src/Delimiter/DelimiterInterface.php
%%WWWDIR%%/vendor/league/commonmark/src/Delimiter/DelimiterParser.php
%%WWWDIR%%/vendor/league/commonmark/src/Delimiter/DelimiterStack.php
+%%WWWDIR%%/vendor/league/commonmark/src/Delimiter/Processor/CacheableDelimiterProcessorInterface.php
%%WWWDIR%%/vendor/league/commonmark/src/Delimiter/Processor/DelimiterProcessorCollection.php
%%WWWDIR%%/vendor/league/commonmark/src/Delimiter/Processor/DelimiterProcessorCollectionInterface.php
%%WWWDIR%%/vendor/league/commonmark/src/Delimiter/Processor/DelimiterProcessorInterface.php
@@ -868,6 +871,7 @@
%%WWWDIR%%/vendor/league/commonmark/src/Parser/MarkdownParserState.php
%%WWWDIR%%/vendor/league/commonmark/src/Parser/MarkdownParserStateInterface.php
%%WWWDIR%%/vendor/league/commonmark/src/Parser/ParserLogicException.php
+%%WWWDIR%%/vendor/league/commonmark/src/Reference/MemoryLimitedReferenceMap.php
%%WWWDIR%%/vendor/league/commonmark/src/Reference/Reference.php
%%WWWDIR%%/vendor/league/commonmark/src/Reference/ReferenceInterface.php
%%WWWDIR%%/vendor/league/commonmark/src/Reference/ReferenceMap.php
@@ -1159,11 +1163,11 @@
%%WWWDIR%%/vendor/pear/net_dns2/tests/Tests_Net_DNS2_DNSSECTest.php
%%WWWDIR%%/vendor/pear/net_dns2/tests/Tests_Net_DNS2_ParserTest.php
%%WWWDIR%%/vendor/pear/net_dns2/tests/Tests_Net_DNS2_ResolverTest.php
-%%WWWDIR%%/vendor/phpmailer/phpmailer/.editorconfig
%%WWWDIR%%/vendor/phpmailer/phpmailer/COMMITMENT
%%WWWDIR%%/vendor/phpmailer/phpmailer/LICENSE
%%WWWDIR%%/vendor/phpmailer/phpmailer/README.md
%%WWWDIR%%/vendor/phpmailer/phpmailer/SECURITY.md
+%%WWWDIR%%/vendor/phpmailer/phpmailer/SMTPUTF8.md
%%WWWDIR%%/vendor/phpmailer/phpmailer/VERSION
%%WWWDIR%%/vendor/phpmailer/phpmailer/composer.json
%%WWWDIR%%/vendor/phpmailer/phpmailer/get_oauth_token.php
@@ -1198,6 +1202,7 @@
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php
+%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ku.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php
@@ -1219,6 +1224,7 @@
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php
+%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ur.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
@@ -1532,11 +1538,6 @@
%%WWWDIR%%/vendor/symfony/polyfill-mbstring/bootstrap.php
%%WWWDIR%%/vendor/symfony/polyfill-mbstring/bootstrap80.php
%%WWWDIR%%/vendor/symfony/polyfill-mbstring/composer.json
-%%WWWDIR%%/vendor/symfony/polyfill-php72/LICENSE
-%%WWWDIR%%/vendor/symfony/polyfill-php72/Php72.php
-%%WWWDIR%%/vendor/symfony/polyfill-php72/README.md
-%%WWWDIR%%/vendor/symfony/polyfill-php72/bootstrap.php
-%%WWWDIR%%/vendor/symfony/polyfill-php72/composer.json
%%WWWDIR%%/vendor/symfony/polyfill-php73/LICENSE
%%WWWDIR%%/vendor/symfony/polyfill-php73/Php73.php
%%WWWDIR%%/vendor/symfony/polyfill-php73/README.md
@@ -1554,6 +1555,13 @@
%%WWWDIR%%/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php
%%WWWDIR%%/vendor/symfony/polyfill-php80/bootstrap.php
%%WWWDIR%%/vendor/symfony/polyfill-php80/composer.json
+%%WWWDIR%%/vendor/symfony/polyfill-php81/LICENSE
+%%WWWDIR%%/vendor/symfony/polyfill-php81/Php81.php
+%%WWWDIR%%/vendor/symfony/polyfill-php81/README.md
+%%WWWDIR%%/vendor/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php
+%%WWWDIR%%/vendor/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php
+%%WWWDIR%%/vendor/symfony/polyfill-php81/bootstrap.php
+%%WWWDIR%%/vendor/symfony/polyfill-php81/composer.json
%%WWWDIR%%/vendor/symfony/service-contracts/Attribute/Required.php
%%WWWDIR%%/vendor/symfony/service-contracts/Attribute/SubscribedService.php
%%WWWDIR%%/vendor/symfony/service-contracts/CHANGELOG.md
@@ -1594,8 +1602,10 @@
%%WWWDIR%%/vendor/twig/twig/composer.json
%%WWWDIR%%/vendor/twig/twig/src/Attribute/YieldReady.php
%%WWWDIR%%/vendor/twig/twig/src/Cache/CacheInterface.php
+%%WWWDIR%%/vendor/twig/twig/src/Cache/ChainCache.php
%%WWWDIR%%/vendor/twig/twig/src/Cache/FilesystemCache.php
%%WWWDIR%%/vendor/twig/twig/src/Cache/NullCache.php
+%%WWWDIR%%/vendor/twig/twig/src/Cache/ReadOnlyFilesystemCache.php
%%WWWDIR%%/vendor/twig/twig/src/Compiler.php
%%WWWDIR%%/vendor/twig/twig/src/Environment.php
%%WWWDIR%%/vendor/twig/twig/src/Error/Error.php
@@ -1673,6 +1683,7 @@
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ConditionalExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/ConstantExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Filter/DefaultFilter.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/Filter/RawFilter.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/FilterExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/FunctionExpression.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Expression/GetAttrExpression.php
@@ -1703,6 +1714,7 @@
%%WWWDIR%%/vendor/twig/twig/src/Node/IncludeNode.php
%%WWWDIR%%/vendor/twig/twig/src/Node/MacroNode.php
%%WWWDIR%%/vendor/twig/twig/src/Node/ModuleNode.php
+%%WWWDIR%%/vendor/twig/twig/src/Node/NameDeprecation.php
%%WWWDIR%%/vendor/twig/twig/src/Node/Node.php
%%WWWDIR%%/vendor/twig/twig/src/Node/NodeCaptureInterface.php
%%WWWDIR%%/vendor/twig/twig/src/Node/NodeOutputInterface.php
@@ -1777,6 +1789,7 @@
%%WWWDIR%%/vendor/twig/twig/src/TwigFunction.php
%%WWWDIR%%/vendor/twig/twig/src/TwigTest.php
%%WWWDIR%%/vendor/twig/twig/src/Util/DeprecationCollector.php
+%%WWWDIR%%/vendor/twig/twig/src/Util/ReflectionCallable.php
%%WWWDIR%%/vendor/twig/twig/src/Util/TemplateDirIterator.php
%%WWWDIR%%/vendor/voku/anti-xss/CHANGELOG.md
%%WWWDIR%%/vendor/voku/anti-xss/LICENSE
@@ -1784,6 +1797,7 @@
%%WWWDIR%%/vendor/voku/anti-xss/composer.json
%%WWWDIR%%/vendor/voku/anti-xss/src/voku/helper/AntiXSS.php
%%WWWDIR%%/vendor/voku/anti-xss/src/voku/helper/data/entities_fallback.php
+%%WWWDIR%%/vendor/voku/portable-ascii/.deepsource.toml
%%WWWDIR%%/vendor/voku/portable-ascii/CHANGELOG.md
%%WWWDIR%%/vendor/voku/portable-ascii/LICENSE.txt
%%WWWDIR%%/vendor/voku/portable-ascii/README.md
@@ -1983,7 +1997,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
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 01:31:39 +0000