Fix typo and 2 RPM build warnings

absolute symlink: /etc/nextcloud/ca-bundle.crt -> /etc/pki/tls/certs/ca-bundle.crt absolute symlink: /usr/share/nextcloud/config -> /etc/nextcloud
Update nextcloud to 28.0.4
2024-04-22 23:51:15 +01:00 · 2024-04-22 23:51:10 +01:00 · 2024-04-22 23:51:01 +01:00 · 2024-04-22 23:50:55 +01:00 · 2024-04-09 18:47:04 -06:00 · 2023-09-12 20:13:56 -06:00
11 changed files with 311 additions and 149 deletions
--- a/0000-disable-update-version-check.patch
+++ b/0000-disable-update-version-check.patch
@ -2,7 +2,7 @@ diff --git a/lib/private/Updater.php b/lib/private/Updater.php
 index 5a14bb17507..38dcb55db7f 100644
 --- a/lib/private/Updater.php
 +++ b/lib/private/Updater.php
-@@ -174,10 +174,13 @@
+@@ -214,15 +214,17 @@ class Updater extends BasicEmitter {
 			$this->config->setAppValue('core', 'vendor', $currentVendor);
 		}
 
@ -13,9 +13,15 @@ index 5a14bb17507..38dcb55db7f 100644
 +		*/
 		if ($currentVendor === 'nextcloud') {
 -			return isset($allowedPreviousVersions[$currentVendor][$majorMinor])
-				&& (version_compare($oldVersion, $newVersion, '<=')
-					|| $this->config->getSystemValueBool('debug', false));
+-				&& (version_compare($oldVersion, $newVersion, '<=') ||
+-					$this->config->getSystemValueBool('debug', false));
 +			return true;
 		}
 
 		// Check if the instance can be migrated
+-		return isset($allowedPreviousVersions[$currentVendor][$majorMinor]) ||
+-			isset($allowedPreviousVersions[$currentVendor][$oldVersion]);
+		return true;
+ 	}
+ 
+ 	/**
--- a/README.md
+++ b/README.md
@ -4,8 +4,8 @@ Nextcloud requires some additional steps after installation/upgrade that are not

 ### Other versions

-[modular nextcloud package Fedora and CentOS/RHEL](https://src.fedoraproject.org/modules/nextcloud) is over 
+Nextcloud maintains multiple stable branches at the same time. To install those, check out the [modular nextcloud package](https://src.fedoraproject.org/modules/nextcloud).

-https://fedoraproject.org/wiki/Changes/RetireModularity
+### CentOS/RHEL

-Once Fedora Linux 38 reaches end of life, we will retire the Fedora instance of Module Build Service. 
+For CentOS/RHEL 8+, nextcloud is available through the [modular repository](https://src.fedoraproject.org/modules/nextcloud). Due to incompatible PHP versions, nextcloud is no longer available for CentOS/RHEL 7 or older.
--- a/nextcloud-README.fedora
+++ b/nextcloud-README.fedora
@ -12,7 +12,7 @@ If not, make sure your webserver is running properly.

 Webserver
 ---------
-Currently nextcloud in Fedora/EPEL supports httpd (Apache) and nginx. You must install
+Currently nextcloud in Fedora supports httpd (Apache) and nginx. You must install
 at least one webserver subpackage (nextcloud-<webserver>). These packages
 include additional configuration files for the webservers. Remote access is
 disabled by default on httpd. To enable access from any host for Apache **AFTER** you
@ -67,7 +67,7 @@ ownership and SELinux context attributes.
 Logging
 -------
 As specified by the configuration file, nextcloud sends messages to the system
-logger, which means in a standard Fedora/EPEL configuration it will log to the
+logger, which means in a standard Fedora configuration it will log to the
 systemd journal: try "journalctl -b -t Nextcloud". You can also change the
 loglevel or switch to the built-in log mechanism of nextcloud.

@ -115,4 +115,4 @@ systemctl enable --now nextcloud-cron.timer
 Migration from owncloud
 -----------------------

-For detailed instructions on this please read MIGRATION.distro
+For detailed instructions on this please read MIGRATION.fedora
--- a/nextcloud-defaults.inc
+++ b/nextcloud-defaults.inc
@ -1,8 +1,76 @@
-# The contents of the default Nextcloud .htaccess file are appended to this
-# file during build. Some directives may be irrelevant to the Fedora/EPEL
-# ecosystem but are NOT omitted.
+# These are based on the .htaccess file shipped by ownCloud, with
+# appropriate adjustments for distribution packaging. Some directives
+# that are irrelevant to the Fedora/EPEL ecosystem are omitted. This
+# file contains directives that should be applied within the /nextcloud
+# filesystem; directives that should be applied site-wide when
+# ownCloud is installed are placed directly in nextcloud.conf.
 #
 # DO NOT EDIT THIS FILE DIRECTLY. To override any element of the
-# packaged Nextcloud configuration, create a new /etc/httpd/conf.d/
-# file which will be read later than this one.
+# packaged ownCloud configuration, create a new /etc/httpd/conf.d/
+# file which will be read later than 'nextcloud.conf'.

+AllowOverride None
+
+ErrorDocument 403 /nextcloud/core/templates/403.php
+ErrorDocument 404 /nextcloud/core/templates/404.php
+
+<IfModule mod_fcgid.c>
+    <IfModule mod_setenvif.c>
+        <IfModule mod_headers.c>
+            SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
+            RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
+        </IfModule>
+    </IfModule>
+    <FilesMatch \.(php|phar)$>
+        SetHandler "proxy:unix:/run/php-fpm/nextcloud.sock|fcgi://localhost"
+    </FilesMatch>
+</IfModule>
+
+<IfModule mod_php5.c>
+    php_value upload_max_filesize 10G
+    php_value post_max_size 10G
+    php_value memory_limit 512M
+    php_value mbstring.func_overload 0
+    php_value always_populate_raw_post_data -1
+    php_value default_charset 'UTF-8'
+    php_value output_buffering off
+    <IfModule mod_env.c>
+        SetEnv htaccessWorking true
+    </IfModule>
+</IfModule>
+
+<IfModule mod_php7.c>
+    php_value upload_max_filesize 10G
+    php_value post_max_size 10G
+    php_value memory_limit 512M
+    php_value mbstring.func_overload 0
+    php_value always_populate_raw_post_data -1
+    php_value default_charset 'UTF-8'
+    php_value output_buffering off
+    <IfModule mod_env.c>
+        SetEnv htaccessWorking true
+    </IfModule>
+</IfModule>
+
+# The rewrites for legacy caldav and carddav URLs are omitted here
+# because they do not work with Fedora's ownCloud directory layout.
+# See https://github.com/nextcloud/core/issues/243#issuecomment-75426453
+<IfModule mod_rewrite.c>
+    RewriteEngine on
+    RewriteBase /nextcloud/
+    RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+    RewriteRule ^remote/(.*) remote.php [QSA,L]
+</IfModule>
+
+AddDefaultCharset utf-8
+Options -Indexes
+
+<IfModule pagespeed_module>
+    ModPagespeed Off
+</IfModule>
+
+<IfModule mod_headers.c>
+    <FilesMatch "\.(css|js)$">
+        Header set Cache-Control "max-age=7200, public"
+    </FilesMatch>
+</IfModule>
--- a/nextcloud-fedora-autoloader.php
+++ b/nextcloud-fedora-autoloader.php
@ -0,0 +1,70 @@
+<?php
+$vendor = '##DATADIR##/php';
+
+if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
+    if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
+        require_once $vendor . '/Symfony/Component/ClassLoader/ClassLoader.php';
+    }
+
+    $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
+    $fedoraClassLoader->register();
+}
+
+// For PEAR components
+$fedoraClassLoader->setUseIncludePath(true);
+
+// Dependencies from 3rdparty composer.json
+// "guzzlehttp/guzzle"
+require_once $vendor . '/GuzzleHttp/autoload.php';
+// "sabre/dav"
+require_once $vendor . '/Sabre/DAV/autoload.php';
+// "doctrine/dbal"
+require_once $vendor . '/Doctrine/DBAL/autoload.php';
+// mcnetic/zipstreamer"
+require_once $vendor . '/ZipStreamer/autoload.php';
+// "phpeclib/phpseclib"
+require_once $vendor . '/phpseclib/autoload.php';
+// "rackspace/php-opencloud"
+require_once $vendor . '/OpenCloud/autoload.php';
+// "jeremeamia/superclosure"
+require_once $vendor . '/SuperClosure/autoload.php';
+// "bantu/ini-get-wrapper"
+require_once $vendor . '/bantu/IniGetWrapper/IniGetWrapper.php';
+// "natxet/CssMin"
+require_once $vendor . '/natxet/CssMin/autoload.php';
+// "punic/punic"
+require_once $vendor . '/Punic/autoload.php';
+// "patchwork/utf8"
+require_once $vendor . '/Patchwork/autoload.php';
+// "symfony/console"
+require_once $vendor . '/Symfony/Component/Console/autoload.php';
+// "symfony/event-dispatcher"
+require_once $vendor . '/Symfony/Component/EventDispatcher/autoload.php';
+// "symfony/routing"
+require_once $vendor . '/Symfony/Component/Routing/autoload.php';
+// "symfony/process"
+require_once $vendor . '/Symfony/Component/Process/autoload.php';
+// "pimple/pimple"
+require_once $vendor . '/Pimple/autoload.php';
+// "ircmaxell/password-compat"
+if (file_exists($vendor . '/password_compat/password.php')) {
+   require_once $vendor . '/password_compat/password.php';
+}
+// "nikic/php-parser"
+require_once $vendor . '/PhpParser/autoload.php';
+// "icewind/Streams"
+require_once $vendor . '/Icewind/Streams/autoload.php';
+// "swiftmailer/swiftmailer
+require_once $vendor . '/Swift/swift_required.php';
+// "league/flysystem"
+require_once $vendor . '/League/Flysystem/autoload.php';
+// "interfasys/lognormalizer"
+require_once $vendor . '/InterfaSys/LogNormalizer/autoload.php';
+// "deepdiver1975/TarSTreamer"
+require_once $vendor . '/ownCloud/TarStreamer/autoload.php';
+// "patchwork/jsqueeze"
+require_once $vendor . '/Patchwork/JSqueeze.php';
+// "symfony/polyfill-php{55,56,70}"
+require_once $vendor . '/Symfony/Polyfill/autoload.php';
+// "lukasreschke/id3parser": "^0.0.1"
+require_once $vendor . '/ID3Parser/autoload.php';
--- a/nextcloud-httpd.conf
+++ b/nextcloud-httpd.conf
@ -16,12 +16,9 @@ Alias /nextcloud /usr/share/nextcloud
 # Allows compliant CalDAV / CardDAV clients to be configured using only
 # the domain name. For more details see # http://tools.ietf.org/html/rfc6764

-# Nextcloud 29 checks specifically for trailing slash in dav 301 redirects
-# https://github.com/nextcloud/server/issues/45033#issuecomment-2079306503
-
-Redirect 301 /.well-known/carddav    /nextcloud/remote.php/dav/
-Redirect 301 /.well-known/caldav     /nextcloud/remote.php/dav/
-Redirect 301 /.well-known/webdav     /nextcloud/remote.php/dav/
+Redirect 301 /.well-known/carddav    /nextcloud/remote.php/dav
+Redirect 301 /.well-known/caldav     /nextcloud/remote.php/dav
+Redirect 301 /.well-known/webdav     /nextcloud/remote.php/dav
 Redirect 301 /.well-known/webfinger  /nextcloud/index.php/.well-known/webfinger
 Redirect 301 /.well-known/nodeinfo   /nextcloud/index.php/.well-known/nodeinfo

--- a/nextcloud-integritycheck-exclusion.patch
+++ b/nextcloud-integritycheck-exclusion.patch
@ -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'] = '';
--- a/nextcloud-php.ini
+++ b/nextcloud-php.ini
@ -1 +0,0 @@
-apc.enable_cli=1
--- a/nextcloud-systemd-timer.service
+++ b/nextcloud-systemd-timer.service
@ -2,10 +2,7 @@
 Description=Cron for nextcloud background jobs

 [Service]
-# https://docs.nextcloud.com/server/25/admin_manual/configuration_server/background_jobs_configuration.html#systemd
 Type=oneshot
-User=apache
-KillMode=process
 ExecStart=/usr/bin/php -f /usr/share/nextcloud/cron.php
-
+User=apache

--- a/nextcloud.spec
+++ b/nextcloud.spec
@ -1,17 +1,11 @@
-%if 0%{?fedora}
-%global distro fedora
-%else
-%global distro epel
-%endif
-
 Name:           nextcloud
-Version:        34.0.3
+Version:        28.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.
-License:        AGPL-3.0-or-later AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-BSD AND Apache-2.0 AND WTFPL AND LicenseRef-Callaway-CC-BY-SA AND GPL-3.0-or-later AND Adobe-2006
+License:        AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe
 URL:            http://nextcloud.com
 Source0:        https://download.nextcloud.com/server/releases/%{name}-%{version}.tar.bz2
+%define php_version 8.2

 # basic nextcloud config.php, nextcloud's
 # initial setup will fill out other settings appropriately
@ -30,7 +24,6 @@ Source105:      %{name}-defaults.inc
 Source200:      %{name}-default-nginx.conf
 Source201:      %{name}-conf-nginx.conf
 Source202:      %{name}-php-fpm.conf
-Source203:      %{name}-php.ini
 # packaging notes and doc
 Source300:      %{name}-README.fedora
 Source301:      %{name}-mysql.txt
@ -40,20 +33,16 @@ Source303:      %{name}-MIGRATION.fedora
 # Remove updater version check, we know that updates across more than one
 # version are possible
 Patch0:         0000-disable-update-version-check.patch
-# Add the ability to exclude files we specify from the nextcloud integrity checker
-Patch1:         nextcloud-integritycheck-exclusion.patch
+# Change occ shebang to /usr/bin/php
+Patch1:         0001-mangle-shebang.patch

 BuildArch:      noarch
-
-# Set this to the minimum supported php version Nextcloud will run on
-# Exists to prevent accidental building on distros with outdated php's
-BuildRequires:  php(language) >= 8.2
+# For the systemd macros
+%if 0%{?fedora} > 29
 BuildRequires:  systemd-rpm-macros
-BuildRequires:  sed
-
-# Auto-generate Provides from bundled php-composer libraries
-BuildRequires:  composer-generators
-
+%else
+BuildRequires:  systemd
+%endif
 # expand pear macros on install
 BuildRequires:  php-pear

@ -82,24 +71,148 @@ Requires:       php-pdo
 Requires:       php-pecl-apcu
 Requires:       php-pecl-imagick
 Requires:       php-pecl-memcached
-Requires:       (php-pecl-redis6 or php-pecl-redis5)
+Requires:       php-pecl-redis5
 Requires:       php-process
 Requires:       php-session
 Requires:       php-simplexml
 Requires:       php-smbclient
 Requires:       php-spl
-Recommends:     php-sodium
+Requires:       php-sodium
 Requires:       php-opcache
 Requires:       php-xmlwriter
 Requires:       php-zip
 # For systemd support during install/uninstall
 %{?systemd_requires}
-# Fedora dropped legacy CA cert bundle symlinks
-# See https://fedoraproject.org/wiki/Changes/dropingOfCertPemFile
-Requires:       %{_sysconfdir}/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
+# the CA cert bundle is linked to from the config dir
+Requires:       %{_sysconfdir}/pki/tls/certs/ca-bundle.crt

+# Bundled composer libraries
+# many of these can be unbundled
+Provides: bundled(php-composer(amphp/amp)) = 2.6.2
+Provides: bundled(php-composer(amphp/byte-stream)) = 1.8.1
+Provides: bundled(php-composer(amphp/parallel)) = 1.4.3
+Provides: bundled(php-composer(amphp/parser)) = 1.1.0
+Provides: bundled(php-composer(amphp/process)) = 1.1.4
+Provides: bundled(php-composer(amphp/serialization)) = 1.0.0
+Provides: bundled(php-composer(amphp/sync)) = 1.4.2
+Provides: bundled(php-composer(league/flysystem)) = 2.5.0
+Provides: bundled(php-composer(league/mime-type-detection)) = 1.11.0
+Provides: bundled(php-composer(psr/log)) = 1.1.4
+Provides: bundled(php-composer(rubix/ml)) = 0.4.1
+Provides: bundled(php-composer(rubix/tensor)) = 2.2.3
+Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.27.0
+Provides: bundled(php-composer(symfony/polyfill-php73)) = 1.26.0
+Provides: bundled(php-composer(symfony/polyfill-php80)) = 1.27.0
+Provides: bundled(php-composer(adhocore/cli)) = 1.6.1
+Provides: bundled(php-composer(nextcloud/openapi-extractor)) = 1.6.1
+Provides: bundled(php-composer(nikic/php-parser)) = 4.17.1
+Provides: bundled(php-composer(phpstan/phpdoc-parser)) = 1.24.2
+Provides: bundled(php-composer(hexogen/kdtree)) = 0.2.5
+Provides: bundled(php-composer(christian-riesen/base32)) = 1.6.0
+Provides: bundled(php-composer(rullzer/easytotp)) = 0.1.4
+Provides: bundled(php-composer(icewind/smb)) = 3.5.4
+Provides: bundled(php-composer(icewind/streams)) = 0.7.7
+Provides: bundled(php-composer(bamarni/composer-bin-plugin)) = 1.8.2
+Provides: bundled(php-composer(aws/aws-crt-php)) = 1.0.2
+Provides: bundled(php-composer(aws/aws-sdk-php)) = 3.240.8
+Provides: bundled(php-composer(bantu/ini-get-wrapper)) = 1.0.1
+Provides: bundled(php-composer(beberlei/assert)) = 3.3.1
+Provides: bundled(php-composer(brick/math)) = 0.9.2
+Provides: bundled(php-composer(cweagans/composer-patches)) = 1.7.3
+Provides: bundled(php-composer(deepdiver/zipstreamer)) = 2.0.0
+Provides: bundled(php-composer(deepdiver1975/tarstreamer)) = 2.1.0
+Provides: bundled(php-composer(doctrine/cache)) = 2.2.0
+Provides: bundled(php-composer(doctrine/dbal)) = 3.7.0
+Provides: bundled(php-composer(doctrine/deprecations)) = 1.1.2
+Provides: bundled(php-composer(doctrine/event-manager)) = 1.2.0
+Provides: bundled(php-composer(doctrine/lexer)) = 1.2.3
+Provides: bundled(php-composer(egulias/email-validator)) = 3.2.5
+Provides: bundled(php-composer(fgrosse/phpasn1)) = 2.3.0
+Provides: bundled(php-composer(fusonic/linq)) = 1.1.0
+Provides: bundled(php-composer(fusonic/opengraph)) = 2.2.0
+Provides: bundled(php-composer(giggsey/libphonenumber-for-php-lite)) = 8.13.12
+Provides: bundled(php-composer(guzzlehttp/guzzle)) = 7.5.0
+Provides: bundled(php-composer(guzzlehttp/promises)) = 1.5.2
+Provides: bundled(php-composer(guzzlehttp/psr7)) = 2.4.5
+Provides: bundled(php-composer(guzzlehttp/uri-template)) = 0.2.0
+Provides: bundled(php-composer(icewind/searchdav)) = 3.1.0
+Provides: bundled(php-composer(icewind/streams)) = 0.7.7
+Provides: bundled(php-composer(justinrainbow/json-schema)) = 5.2.10
+Provides: bundled(php-composer(laravel/serializable-closure)) = 1.2.2
+Provides: bundled(php-composer(league/uri)) = 6.4.0
+Provides: bundled(php-composer(league/uri-interfaces)) = 2.2.0
+Provides: bundled(php-composer(mexitek/phpcolors)) = 1.0.4
+Provides: bundled(php-composer(microsoft/azure-storage-blob)) = 1.5.4
+Provides: bundled(php-composer(microsoft/azure-storage-common)) = 1.5.2
+Provides: bundled(php-composer(mlocati/ip-lib)) = 1.18.0
+Provides: bundled(php-composer(mtdowling/jmespath.php)) = 2.6.1
+Provides: bundled(php-composer(nextcloud/lognormalizer)) = 1.0.0
+Provides: bundled(php-composer(pear/archive_tar)) = 1.4.14
+Provides: bundled(php-composer(pear/console_getopt)) = 1.4.3
+Provides: bundled(php-composer(pear/pear-core-minimal)) = 1.10.10
+Provides: bundled(php-composer(pear/pear_exception)) = 1.0.2
+Provides: bundled(php-composer(php-http/guzzle7-adapter)) = 1.0.0
+Provides: bundled(php-composer(php-http/httplug)) = 2.2.0
+Provides: bundled(php-composer(php-http/promise)) = 1.1.0
+Provides: bundled(php-composer(php-opencloud/openstack)) = 3.2.1
+Provides: bundled(php-composer(phpseclib/phpseclib)) = 2.0.45
+Provides: bundled(php-composer(pimple/pimple)) = 3.5.0
+Provides: bundled(php-composer(psr/cache)) = 3.0.0
+Provides: bundled(php-composer(psr/clock)) = 1.0.0
+Provides: bundled(php-composer(psr/container)) = 2.0.2
+Provides: bundled(php-composer(psr/event-dispatcher)) = 1.0.0
+Provides: bundled(php-composer(psr/http-client)) = 1.0.1
+Provides: bundled(php-composer(psr/http-factory)) = 1.0.1
+Provides: bundled(php-composer(psr/http-message)) = 1.0.1
+Provides: bundled(php-composer(psr/log)) = 1.1.4
+Provides: bundled(php-composer(punic/punic)) = 3.8.1
+Provides: bundled(php-composer(ralouphie/getallheaders)) = 3.0.3
+Provides: bundled(php-composer(ramsey/collection)) = 1.1.3
+Provides: bundled(php-composer(ramsey/uuid)) = 4.1.1
+Provides: bundled(php-composer(sabre/dav)) = 4.5.0
+Provides: bundled(php-composer(sabre/event)) = 5.1.4
+Provides: bundled(php-composer(sabre/http)) = 5.1.10
+Provides: bundled(php-composer(sabre/uri)) = 2.3.3
+Provides: bundled(php-composer(sabre/vobject)) = 4.5.4
+Provides: bundled(php-composer(sabre/xml)) = 2.2.6
+Provides: bundled(php-composer(scssphp/scssphp)) = 1.11.0
+Provides: bundled(php-composer(spomky-labs/base64url)) = 2.0.4
+Provides: bundled(php-composer(spomky-labs/cbor-php)) = 2.0.1
+Provides: bundled(php-composer(stecman/symfony-console-completion)) = 0.11.0
+Provides: bundled(php-composer(symfony/console)) = 5.4.24
+Provides: bundled(php-composer(symfony/css-selector)) = 5.4.11
+Provides: bundled(php-composer(symfony/deprecation-contracts)) = 3.0.2
+Provides: bundled(php-composer(symfony/dom-crawler)) = 5.4.11
+Provides: bundled(php-composer(symfony/event-dispatcher)) = 5.4.26
+Provides: bundled(php-composer(symfony/event-dispatcher-contracts)) = 3.0.2
+Provides: bundled(php-composer(symfony/http-foundation)) = 5.4.25
+Provides: bundled(php-composer(symfony/mailer)) = 5.4.22
+Provides: bundled(php-composer(symfony/mime)) = 5.4.19
+Provides: bundled(php-composer(symfony/polyfill-ctype)) = 1.23.0
+Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = 1.23.1
+Provides: bundled(php-composer(symfony/polyfill-intl-idn)) = 1.27.0
+Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = 1.27.0
+Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.27.0
+Provides: bundled(php-composer(symfony/polyfill-php72)) = 1.27.0
+Provides: bundled(php-composer(symfony/polyfill-php73)) = 1.23.0
+Provides: bundled(php-composer(symfony/polyfill-php80)) = 1.27.0
+Provides: bundled(php-composer(symfony/process)) = 5.4.24
+Provides: bundled(php-composer(symfony/routing)) = 5.4.25
+Provides: bundled(php-composer(symfony/service-contracts)) = 3.0.2
+Provides: bundled(php-composer(symfony/string)) = 6.0.19
+Provides: bundled(php-composer(symfony/translation)) = 5.4.24
+Provides: bundled(php-composer(symfony/translation-contracts)) = 2.4.0
+Provides: bundled(php-composer(thecodingmachine/safe)) = 1.3.3
+Provides: bundled(php-composer(wapmorgan/mp3info)) = 0.1.0
+Provides: bundled(php-composer(web-auth/cose-lib)) = 3.3.9
+Provides: bundled(php-composer(web-auth/metadata-service)) = 3.3.9
+Provides: bundled(php-composer(web-auth/webauthn-lib)) = 3.3.9
+# OpenIconic icons bundled via sabre-dav
+Provides:       bundled(openiconic-fonts) = 1.0.0
+# jscolor bundled via themeing app
+Provides:       bundled(jscolor) = 2.0.4
 # jquery-ui-multiselect bundled via user_ldap app
-Provides:       bundled(jquery-ui-multiselect) = 1.13
+Provides:       bundled(jquery-ui-multiselect) = 0.3.1
 # zxcvbn bundled via core
 Provides:       bundled(zxcvbn) = 4.4.2

@ -150,7 +263,6 @@ If you want the database to be on the same system as NextCloud itself, you must
 also install and enable a MySQL / MariaDB server package. See README.mysql for
 more details.

-
 %package postgresql
 Summary:        PostgreSQL database support for NextCloud
 Provides:       %{name}-database = %{version}-%{release}
@ -179,33 +291,20 @@ Requires:       %{name} = %{version}-%{release}
 This package ensures the necessary dependencies are in place for NextCloud to
 work with an SQLite 3 database stored on the local system.

+
 %prep
 %autosetup -n %{name} -p1

-# Fix php shebang in occ
-sed -ri 's\^#!/usr/bin/env php$\#!%{_bindir}/php\' occ
-
 # patch backup files and .git stuff
-find . -name \*.orig    -type f -delete -print
-find . -name .gitignore -type f -delete -print
+find . -name \*.orig    -type f        -exec rm    {} \; -print
+find . -name .gitignore -type f        -exec rm    {} \; -print
 find . -name .github    -type d -prune -exec rm -r {} \; -print

-# fix CLI upgrade advice on splash screen            
-if ! file=$(grep -l 'occ upgrade' dist/*.map); then
-    echo "Could not find the occ upgrade instructions in dist/*.map"
-    exit 1
-fi
-echo "Updating occ upgrade instructions in $file"
-sed -i -e 's#\./\(occ upgrade\)#sudo -u apache php /usr/share/nextcloud/\1#' $file
-
 # prepare package doc
-cp %{SOURCE300} README.%{distro}
+cp %{SOURCE300} README.fedora
 cp %{SOURCE301} README.mysql
 cp %{SOURCE302} README.postgresql
-cp %{SOURCE303} MIGRATION.%{distro}
-
-# point the reader to the correct README filename
-sed -i 's/distro/%{distro}/g' README.%{distro}
+cp %{SOURCE303} MIGRATION.fedora

 # Locate license files and put them sensibly in place
 # get rid of all composer licenses
@ -215,41 +314,6 @@ find -wholename "*/composer/LICENSE" -exec mv {} composer-LICENSE \;
 find . -mindepth 2 \( -name '*LICENSE*' -o -name '*LICENCE*' \) | { while read a ; do mv "$a" $(echo $a | sed "s_^./__" | tr "/ " "__" )-LICENSE ; done ; }
 find . -mindepth 2 -name '*COPYING*' | { while read a ; do mv "$a" $(echo $a | sed "s_^./__" | tr "/ " "__" )-COPYING ; done ; }

-# case-sensitive list of partial matches to exclude from the nextcloud integrity checker
-# include readme, license, other docs, and any files we move or patch during the build
-excludedFilenames="
-README
-readme
-LICENSE
-LICENCE
-license
-copying
-COPYING
-AUTHORS
-htaccess
-gitignore
-user.ini
-update.admin.php
-Updater.php
-occ
-Checker.php
-"
-
-# nextcloud source files use tabs rather than spaces, ew
-tabs="				"
-cr="
-"
-
-# Add quotes, commas, and escaped newlines
-for f in $excludedFilenames; do
-  formattedlist="$formattedlist$tabs'$f',\\$cr"
-done
-
-# look for our sed placeholder we patched in earlier, then insert our formatted list of keywords
-sed -i "s|//sedplaceholder|${formattedlist}|" lib/private/IntegrityCheck/Checker.php
-
-# Build nextcloud-defaults.inc from upstream .htaccess. We will install it later.
-cat .htaccess >> %{SOURCE105}

 %check
 # Make sure there are no license files left over
@ -291,7 +355,7 @@ install -pm 755 occ %{buildroot}%{_datadir}/%{name}
 ln -s ../../../%{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config

 # nextcloud looks for ca-bundle.crt in config dir
-ln -s ../pki/ca-trust/extracted/pem/tls-ca-bundle.pem %{buildroot}%{_sysconfdir}/%{name}/ca-bundle.crt
+ln -s ../pki/tls/certs/ca-bundle.crt %{buildroot}%{_sysconfdir}/%{name}/ca-bundle.crt

 # set default config
 install -pm 644 %{SOURCE1}    %{buildroot}%{_sysconfdir}/%{name}/config.php
@ -314,10 +378,6 @@ install -Dpm 644 %{SOURCE201} \
 install -Dpm 644 %{SOURCE202} \
    %{buildroot}%{_sysconfdir}/php-fpm.d/%{name}.conf

-# php.ini config
-install -Dpm 644 %{SOURCE203} \
-    %{buildroot}%{_sysconfdir}/php.d/60-%{name}.ini
-
 # Install the systemd timer
 install -Dpm 644 %{SOURCE2} %{buildroot}%{_unitdir}/nextcloud-cron.service
 install -Dpm 644 %{SOURCE3} %{buildroot}%{_unitdir}/nextcloud-cron.timer
@ -354,12 +414,11 @@ if [ $1 -eq 0 ]; then
 fi

 %files
-%doc AUTHORS README.%{distro} MIGRATION.%{distro} config/config.sample.php
+%doc AUTHORS README.fedora MIGRATION.fedora config/config.sample.php
 %license *-LICENSE
 %dir %attr(-,apache,apache) %{_sysconfdir}/%{name}
 # contains sensitive data (dbpassword, passwordsalt)
 %config(noreplace) %attr(0600,apache,apache) %{_sysconfdir}/%{name}/config.php
-%config(noreplace) %{_sysconfdir}/php.d/60-%{name}.ini
 # need the symlink in confdir but it's not config
 %{_sysconfdir}/%{name}/ca-bundle.crt
 %{_datadir}/%{name}
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (nextcloud-34.0.3.tar.bz2) = 3463dbbdeae5275a0791b115cf86aed41c5a138fdd19bb32ec12837a6698106b6f172e24fb1264a2d4e20b2b805bcf7841b2338e4e02f1fd5394fbed830cc695
+SHA512 (nextcloud-28.0.4.tar.bz2) = bb26831d9143ab5ea06ffdf9f2c98c5851c26c23002c6124c9443cd2636d7a102e5da053e0fbd0e7ed6da634d292deeaa0219038b6def4bf302e922b48135fb2
Author	SHA1	Message	Date
Sérgio M. Basto	57c78c4d81	Fix typo and 2 RPM build warnings absolute symlink: /etc/nextcloud/ca-bundle.crt -> /etc/pki/tls/certs/ca-bundle.crt absolute symlink: /usr/share/nextcloud/config -> /etc/nextcloud	2024-04-22 23:51:15 +01:00
Sérgio M. Basto	4aa6f93c2d	Update nextcloud to 28.0.4	2024-04-22 23:51:10 +01:00
Sérgio M. Basto	3b08dc5805	(#2193123 ) Add requires php-bcmath php-intl php-sodiumm php-opcache	2024-04-22 23:51:01 +01:00
Sérgio M. Basto	b93c882af3	sort requires alphabetically	2024-04-22 23:50:55 +01:00
Iván Chavero	0d9a46624d	Update to 28.0.3	2024-04-09 18:47:04 -06:00
Iván Chavero	0cedefad92	Fix post install bugs - Fix CAN_INSTALL permissions - Restart php-fpm	2023-09-12 20:13:56 -06:00
Iván Chavero	569424e980	Update for 27.0.2 - Update configuration file - Fix missing CAN_INSTALL file for new installations - Fix upgrade patch	2023-09-11 19:49:46 -06:00
Iván Chavero	06b585a011	Merge branch 'rawhide' into f38	2023-05-18 23:38:14 -06:00
Iván Chavero	7f1de11f73	Update to 25.0.3	2023-02-21 10:54:18 -06:00