demus/nextcloud-rpm
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/nextcloud.git synced 2026-07-27 21:00:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

31.04 release RHBZ#2359048

Browse Source
This commit is contained in:
Andrew Bauer
2025-04-19 07:53:07 -05:00
parent ab682ab5e5
commit 7ab2f104e8
4 changed files with 5 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nextcloud-integritycheck-exclusion.patch
+1 -1
View File
@@ -12,7 +12,7 @@ index a6de3cf6030d7..3974483601b08 100644
--- a/lib/private/IntegrityCheck/Checker.php
+++ b/lib/private/IntegrityCheck/Checker.php
@@ -337,7 +337,20 @@ private function verify(string $signaturePath, string $basePath, string $certifi
$differencesB = array_diff($currentInstanceHashes, $expectedHashes);
$differencesB = array_diff_assoc($currentInstanceHashes, $expectedHashes);
$differences = array_unique(array_merge($differencesA, $differencesB));
$differenceArray = [];
+
nextcloud.spec
+2 -2
View File
@@ -5,7 +5,7 @@
%endif
Name: nextcloud
Version: 31.0.2
Version: 31.0.4
Release: %autorelease
Summary: Private file sync and share server
# Automatically converted from old format: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe - review is highly recommended.
@@ -41,7 +41,7 @@ Source303: %{name}-MIGRATION.fedora
# version are possible
Patch0: 0000-disable-update-version-check.patch
# Add the ability to exclude files we specify from the nextcloud integrity checker
Patch1: nextcloud30-integritycheck-exclusion.patch
Patch1: nextcloud-integritycheck-exclusion.patch
BuildArch: noarch
nextcloud30-integritycheck-exclusion.patch
-34
View File
@@ -1,34 +0,0 @@
From 9f38c6300712a23ccdc75e140143a1c461e15705 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Mon, 24 Jun 2024 10:11:23 -0500
Subject: [PATCH] silence integrity check for excluded files
---
lib/private/IntegrityCheck/Checker.php | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php
index a6de3cf6030d7..3974483601b08 100644
--- a/lib/private/IntegrityCheck/Checker.php
+++ b/lib/private/IntegrityCheck/Checker.php
@@ -337,7 +337,20 @@ private function verify(string $signaturePath, string $basePath, string $certifi
$differencesB = array_diff_assoc($currentInstanceHashes, $expectedHashes);
$differences = array_unique(array_merge($differencesA, $differencesB));
$differenceArray = [];
+
+ # Nasty hack to silence the integrity checker for files patched during the build process or files we simply don't care about
+ $excludedFilenames = [
+//sedplaceholder ];
+
foreach ($differences as $filename => $hash) {
+
+ # Skip if the file in question matches our exclusion list
+ foreach ($excludedFilenames as $excludedFilename) {
+ if (strpos($filename, $excludedFilename)!==false) {
+ break 2;
+ }
+ }
+
// Check if file should not exist in the new signature table
if (!array_key_exists($filename, $expectedHashes)) {
$differenceArray['EXTRA_FILE'][$filename]['expected'] = '';
sources
+2 -2
View File
@@ -1,2 +1,2 @@
SHA512 (nextcloud-29.0.12.tar.bz2) = 10a5bbc61d2a85090aaa6174eac415337b63adaf23e8044d25c674d0ce8d6bcfff949d3950abd369ecfa2c2b9c4a747d0744a47777bc3d51799804b696579a6e
SHA512 (nextcloud-31.0.2.tar.bz2) = bef29a4fdde468ae61b7d504b1f6d2bb031841edf97837116025d0966f812be95fff1ab7e02105cdf8250de11c62f82d89f08bcae30d4dd91d10694f7b267e4c
SHA512 (nextcloud-29.0.8.tar.bz2) = ec99d5efc6a573627cae9b42f7f34e3c8ee7ba9bc3bfe1bb032c9e8fcef2831ce32f7dcb72c3303582b205de390619bd7f892a7bc4415c0826e02f73496714b0
SHA512 (nextcloud-31.0.4.tar.bz2) = 85535638556b9f727989cc1baceec8a89ef52a6f7dc132ad807326492ffc904bc3f462afea18dd0749bb8c194ef57932dcbfd494e8290a6f7b0f5d224e69429d