Compare commits
22 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fff5621987 | ||
|
|
7195744b5a | ||
|
|
84f60b813a | ||
|
|
4e68704a43 | ||
|
|
4916a3918f | ||
|
|
1079fc13e8 | ||
|
|
b5e9a4304b | ||
|
|
42d09bc127 | ||
|
|
a36102e399 | ||
|
|
e5be54f386 | ||
|
|
6bdd14519c | ||
|
|
7da23a2bee | ||
|
|
c993db4545 | ||
|
|
bf4374caee | ||
|
|
a02af34c50 | ||
|
|
5a97247bf2 | ||
|
|
957f683b70 | ||
|
|
2e6f991588 | ||
|
|
1ae20eb59d | ||
|
|
443340c906 | ||
|
|
8d34a98e62 | ||
|
|
ce6a6bf6e9 |
3 changed files with 18 additions and 17 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
%endif
|
||||
|
||||
Name: nextcloud
|
||||
Version: 34.0.3
|
||||
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.
|
||||
|
|
@ -47,7 +47,7 @@ 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
|
||||
BuildRequires: php(language) >= 8.1
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: sed
|
||||
|
||||
|
|
@ -94,9 +94,8 @@ 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
|
||||
|
||||
# jquery-ui-multiselect bundled via user_ldap app
|
||||
Provides: bundled(jquery-ui-multiselect) = 1.13
|
||||
|
|
@ -190,13 +189,8 @@ find . -name \*.orig -type f -delete -print
|
|||
find . -name .gitignore -type f -delete -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
|
||||
# fix CLI upgrade advise on splash screen
|
||||
sed -i -e 's#\./\(occ upgrade\)#sudo -u apache php /usr/share/nextcloud/\1#' core/templates/update.admin.php
|
||||
|
||||
# prepare package doc
|
||||
cp %{SOURCE300} README.%{distro}
|
||||
|
|
@ -291,7 +285,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
|
||||
|
|
|
|||
3
sources
3
sources
|
|
@ -1 +1,2 @@
|
|||
SHA512 (nextcloud-34.0.3.tar.bz2) = 3463dbbdeae5275a0791b115cf86aed41c5a138fdd19bb32ec12837a6698106b6f172e24fb1264a2d4e20b2b805bcf7841b2338e4e02f1fd5394fbed830cc695
|
||||
SHA512 (nextcloud-29.0.8.tar.bz2) = ec99d5efc6a573627cae9b42f7f34e3c8ee7ba9bc3bfe1bb032c9e8fcef2831ce32f7dcb72c3303582b205de390619bd7f892a7bc4415c0826e02f73496714b0
|
||||
SHA512 (nextcloud-31.0.4.tar.bz2) = 85535638556b9f727989cc1baceec8a89ef52a6f7dc132ad807326492ffc904bc3f462afea18dd0749bb8c194ef57932dcbfd494e8290a6f7b0f5d224e69429d
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue