From nobody Thu May 08 00:18:49 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtCRG1N7nz5vWV0; Thu, 08 May 2025 00:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtCRG0cvdz4Kdt; Thu, 08 May 2025 00:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746663530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ErV582AYZalxlgXpaE7IdluhcFfS3v186zOwKhHFpko=; b=WNK66dpxjH2dC5KW7YEUMlK3YMpHW+5V/TpQab9J9EOolQJAOM5NFW6YQiMToXCenEDzq0 xu8IugGeWgWvPeGWwFFheNK03Wmzs3PTKGrqri0jtGBYWNTDJ+dhjrOaTEGcu511/S3sLy keNUnfA21LC5G+LWdxqnnd+nNrP39IcnPr9rwyWuAKhw6dL5+Im+WQlJJthkXVv3gJ8BVb 2HLcBZGBxmL2qlkuLjIFolc6evT50RRL0x9Z+aG5ZtYxG+2Eg+IjO32iaXzwdqABhgj4Ye WWoKg2jn3Pb9y3PJavpvklKVpydiJk3MxeOPICkG9oFDGBPIvtfUzZ82IdzSjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746663530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ErV582AYZalxlgXpaE7IdluhcFfS3v186zOwKhHFpko=; b=FpWkWNalmFmQzDNtcXarZw0R1S9pti5hRS7vfs/XvGhtsKY3+i6S7wDUEz1iCGqicSK0XN b3Q3R1Nkao0jidTWzAdLN3/TnlH9+OOUbBSa1r2B9EsCsnXS+eEGVW8XCR1N5twjHaEWdv ruHo2Tkpsb9Paa2Uu8VXMVA6T9x/1mQ+2AMQesdXuErxLqruCEg55R+I1Pj3ezEhFPVLjZ CxCllceDEfaKNcOjHcEq3mZBxDFr7oUIhbhSnMQwvBaQ3USdJcGF4q9Dyw41An9u4QM9Es vP5jf9I+d7whmJx9wSL7GXyCqQDMjtOI4W2xrI79o+ip760AGevN2Wv+7asCNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746663530; a=rsa-sha256; cv=none; b=PMhy3hbPmwFfkbhOeM7KdajeRQN1PsSo6bpNnWuB9+mX0buf5Prj3AjV8Qi2yi2sd4nu4U e9P574yiV81bGDmgdFdrvzRlY2WMzHPTopwFpgA80GslTALBmVZInFxDcaDwBK0iAyno2G CBWVpNiwR0c5kmt1Qw8KCR6rT4OgYr5CpMoGsM9cCoUMvS4ucjPyN8rwMlTODmtUSuUXUA CrOOT1ko6UbgAxUOk2fv2bYQk1cRbjjo9ScsyPFSxIk1VRNOLLCasWvOodcHHw++M4QPrR 9cFMC0B7rTk64bRyd43zOU+41/VMbi3bt5PHOEfb9g8SPAu/aOjQSfvPzs75wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtCRG0BCQzrh8; Thu, 08 May 2025 00:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5480In9Q092886; Thu, 8 May 2025 00:18:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5480InTm092883; Thu, 8 May 2025 00:18:49 GMT (envelope-from git) Date: Thu, 8 May 2025 00:18:49 GMT Message-Id: <202505080018.5480InTm092883@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 5b39c611152d - main - sysutils/froxlor: pkg-plist typo fix and option/path fixes List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b39c611152d1ceb15d30837866038422e0e5685 Auto-Submitted: auto-generated The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b39c611152d1ceb15d30837866038422e0e5685 commit 5b39c611152d1ceb15d30837866038422e0e5685 Author: No Name AuthorDate: 2025-05-08 00:17:10 +0000 Commit: Neel Chauhan CommitDate: 2025-05-08 00:17:10 +0000 sysutils/froxlor: pkg-plist typo fix and option/path fixes PR: 286642 Reported by: ek@purplehat.org Approved by: self (maintainer) --- sysutils/froxlor/Makefile | 1 + .../files/patch-froxlor_lib_Froxlor_Cli_MasterCron.php | 11 +++++++++++ .../patch-froxlor_lib_Froxlor_Cron_Traffic_TrafficCron.php | 11 +++++++++++ sysutils/froxlor/pkg-plist | 2 +- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/sysutils/froxlor/Makefile b/sysutils/froxlor/Makefile index 1f3ca4da854d..1cc391cb5026 100644 --- a/sysutils/froxlor/Makefile +++ b/sysutils/froxlor/Makefile @@ -1,5 +1,6 @@ PORTNAME= froxlor DISTVERSION= 2.2.7 +PORTREVISION= 2 CATEGORIES= sysutils www MASTER_SITES= https://files.froxlor.org/releases/ 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 19ff5f28973b..1f61b033da55 100644 --- a/sysutils/froxlor/pkg-plist +++ b/sysutils/froxlor/pkg-plist @@ -1997,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