git: 811fa21f7d8f - main - www/nextcloud: Fix CleanupBackgroundJobsJob.php
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 29 Jun 2026 20:11:42 UTC
The branch main has been updated by brnrd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=811fa21f7d8f03fd282c217c420dc2441c75b691
commit 811fa21f7d8f03fd282c217c420dc2441c75b691
Author: Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2026-06-29 20:10:09 +0000
Commit: Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2026-06-29 20:10:09 +0000
www/nextcloud: Fix CleanupBackgroundJobsJob.php
PR: 296323
Reported by: Martin Birgmeier <d8zNeCFG aon at>
---
www/nextcloud/Makefile | 1 +
www/nextcloud/files/patch-PR296323 | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile
index 6f9cbeeca176..94ca6d40a8b1 100644
--- a/www/nextcloud/Makefile
+++ b/www/nextcloud/Makefile
@@ -1,5 +1,6 @@
PORTNAME= nextcloud
PORTVERSION= 34.0.1
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://github.com/nextcloud-releases/server/releases/download/v${PORTVERSION}/ \
https://download.nextcloud.com/server/releases/
diff --git a/www/nextcloud/files/patch-PR296323 b/www/nextcloud/files/patch-PR296323
new file mode 100644
index 000000000000..e4e82f9ed434
--- /dev/null
+++ b/www/nextcloud/files/patch-PR296323
@@ -0,0 +1,25 @@
+--- core/BackgroundJobs/CleanupBackgroundJobsJob.php.orig 2026-06-25 12:29:12 UTC
++++ core/BackgroundJobs/CleanupBackgroundJobsJob.php
+@@ -47,10 +47,8 @@ class CleanupBackgroundJobsJob extends TimedJob {
+ if ($job->serverId !== $currentServerId) {
+ continue;
+ }
+- $output = [];
+- $result = 0;
+- exec('ps -p ' . escapeshellarg((string)$job->pid) . ' -o cmd', $output, $result);
+- if (count($output) === 1 && current($output) === 'CMD' && $result === 1) {
++ $processExists = posix_kill($job->pid, 0) || posix_get_last_error() === POSIX_EPERM;
++ if (!$processExists) {
+ // Process doesn't exists anymore
+ $maxDuration = (new DateTimeImmutable())->diff($job->startedAt);
+ $maxDuration
+--- lib/private/BackgroundJob/JobRuns.php.orig 2026-06-29 20:06:31 UTC
++++ lib/private/BackgroundJob/JobRuns.php
+@@ -63,7 +63,6 @@ final readonly class JobRuns implements IJobRuns {
+
+ public function deleteBefore(int $timestamp): int {
+ $beforeSnowflake = $this->snowflakeGenerator->minForTimeId($timestamp);
+- $beforeSnowflake = '91480652934574081';
+ $qb = $this->connection->getQueryBuilder();
+ $result = $qb
+ ->delete(self::TABLE)