From 7e9e898fdac885cd57dd55d662b417db3dc58380e970ec67addf2fc5fa7db5ad Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Sat, 7 Oct 2023 10:26:58 +0000 Subject: [PATCH 1/2] Accepting request 1116195 from home:ecsos:server - Update to 27.1.2 - Chore: Update `@nextcloud/dialogs` to 4.2.1 (server#40557) - Let `occ trashbin:restore` restore also from groupfolders and add filters (server#40581) - Ocm services (server#40586) - Revert change that made `OC.Util.humanFileSize` return decimal sizes instead of binary (server#40605) - Store size in int|float for 32bit support (server#40623) - Fix(dav): expand recurrences when searching (server#40631) - Fix jsunit tests (server#40638) - Use proper app id in Version.vue (server#40640) - Fix: encode uri for trashbin delete (server#40642) - Fix ocm-provider rewrite rules (server#40778) - Fix(db): also chunk MariaDB deletes (activity#1312) - Re-enabled cypress tests (activity#1336) - Run npm audit fix (activity#1339) - Return if user is empty (firstrunwizard#953) - Chore(deps): Bump howler from 2.2.3 to 2.2.4 (notifications#1672) - Bump cypress to v13 (photos#2057) - Fix(security): Bump semver (suspicious_login#815) - Fix(deps): update nextcloud abandoned (text#4756) - Bugfix/duplicated load of yjs (text#4807) - Feat: hide workspace if no readme.md (text#4811) - Add nextcloud-temp-fix-ocm.patch to fix temporarily the ocm-provider failure message. (server#40803) OBS-URL: https://build.opensuse.org/request/show/1116195 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/nextcloud?expand=0&rev=214 --- apache_secure_data | 3 --- nextcloud-27.1.1.tar.bz2 | 3 --- nextcloud-27.1.2.tar.bz2 | 3 +++ nextcloud-temp-fix-ocm.patch | 12 ++++++++++++ nextcloud.changes | 26 ++++++++++++++++++++++++++ nextcloud.spec | 5 ++++- 6 files changed, 45 insertions(+), 7 deletions(-) delete mode 100644 nextcloud-27.1.1.tar.bz2 create mode 100644 nextcloud-27.1.2.tar.bz2 create mode 100644 nextcloud-temp-fix-ocm.patch diff --git a/apache_secure_data b/apache_secure_data index f11f679..a322b68 100644 --- a/apache_secure_data +++ b/apache_secure_data @@ -21,9 +21,6 @@ Alias /nextcloud "@DATAPATH@/" Require all denied -Redirect 301 /ocm-provider/ /nextcloud/ocm-provider/ -Redirect 301 /ocs-provider/ /nextcloud/ocs-provider/ - RewriteEngine on RewriteRule ^/\.well-known/host-meta /nextcloud/public.php?service=host-meta [QSA,L] diff --git a/nextcloud-27.1.1.tar.bz2 b/nextcloud-27.1.1.tar.bz2 deleted file mode 100644 index 43bf33f..0000000 --- a/nextcloud-27.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a91500566874675676fa3b5bfae2587a839cde41dfac5318043b162c1311fab -size 180000001 diff --git a/nextcloud-27.1.2.tar.bz2 b/nextcloud-27.1.2.tar.bz2 new file mode 100644 index 0000000..e9fd686 --- /dev/null +++ b/nextcloud-27.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0742b247aaee0b7044db0062f0a914aa77338c7a7d8fe7da0917147d76689721 +size 179892456 diff --git a/nextcloud-temp-fix-ocm.patch b/nextcloud-temp-fix-ocm.patch new file mode 100644 index 0000000..492e6d3 --- /dev/null +++ b/nextcloud-temp-fix-ocm.patch @@ -0,0 +1,12 @@ +diff -Pdpru nextcloud.orig/.htaccess nextcloud/.htaccess +--- nextcloud.orig/.htaccess 2023-10-05 12:47:41.000000000 +0200 ++++ nextcloud/.htaccess 2023-10-07 11:06:13.080370013 +0200 +@@ -90,7 +90,7 @@ + RewriteRule ^remote/(.*) remote.php [QSA,L] + RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L] + RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L] +- RewriteRule ^ocm-provider/?$ /index.php [QSA,L] ++ RewriteRule ^ocm-provider/?$ /nextcloud/index.php [QSA,L] + RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L] + + diff --git a/nextcloud.changes b/nextcloud.changes index c417799..2c8a3f1 100644 --- a/nextcloud.changes +++ b/nextcloud.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Thu Oct 5 14:13:03 UTC 2023 - ecsos + +- Update to 27.1.2 + - Chore: Update `@nextcloud/dialogs` to 4.2.1 (server#40557) + - Let `occ trashbin:restore` restore also from groupfolders and add filters (server#40581) + - Ocm services (server#40586) + - Revert change that made `OC.Util.humanFileSize` return decimal sizes instead of binary (server#40605) + - Store size in int|float for 32bit support (server#40623) + - Fix(dav): expand recurrences when searching (server#40631) + - Fix jsunit tests (server#40638) + - Use proper app id in Version.vue (server#40640) + - Fix: encode uri for trashbin delete (server#40642) + - Fix ocm-provider rewrite rules (server#40778) + - Fix(db): also chunk MariaDB deletes (activity#1312) + - Re-enabled cypress tests (activity#1336) + - Run npm audit fix (activity#1339) + - Return if user is empty (firstrunwizard#953) + - Chore(deps): Bump howler from 2.2.3 to 2.2.4 (notifications#1672) + - Bump cypress to v13 (photos#2057) + - Fix(security): Bump semver (suspicious_login#815) + - Fix(deps): update nextcloud abandoned (text#4756) + - Bugfix/duplicated load of yjs (text#4807) + - Feat: hide workspace if no readme.md (text#4811) +- Add nextcloud-temp-fix-ocm.patch to fix temporarily the ocm-provider failure message. (server#40803) + ------------------------------------------------------------------- Sun Sep 24 09:00:49 UTC 2023 - ecsos diff --git a/nextcloud.spec b/nextcloud.spec index 250c7b3..b18862f 100644 --- a/nextcloud.spec +++ b/nextcloud.spec @@ -47,7 +47,7 @@ %endif Name: nextcloud -Version: 27.1.1 +Version: 27.1.2 Release: 0 Summary: File hosting service License: AGPL-3.0-only @@ -63,6 +63,8 @@ Source10: %{name}-cron Source11: %{name}-cron.service Source12: %{name}-cron.timer Source99: %{name}-rpmlintrc +# PATCH-FIX-OPENSUSE - Temporarily fix ocm-provider message - https://github.com/nextcloud/server/issues/40803 +Patch1: %{name}-temp-fix-ocm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: apache-rpm-macros @@ -149,6 +151,7 @@ This subpackage contains the Apache configuration files %prep %setup -q -n %{name} +%patch1 -p1 cp %{SOURCE2} . cp %{SOURCE3} . cp %{SOURCE4} . From da1730039d45788860b434429fa39ab590f0685d1d952ad6b48c6dcc94c61dfb Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Sun, 8 Oct 2023 12:23:49 +0000 Subject: [PATCH 2/2] Accepting request 1116307 from home:ecsos:server - Update to 27.1.2 OBS-URL: https://build.opensuse.org/request/show/1116307 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/nextcloud?expand=0&rev=215 --- nextcloud-temp-fix-ocm.patch | 12 ------------ nextcloud.changes | 1 - nextcloud.spec | 3 --- 3 files changed, 16 deletions(-) delete mode 100644 nextcloud-temp-fix-ocm.patch diff --git a/nextcloud-temp-fix-ocm.patch b/nextcloud-temp-fix-ocm.patch deleted file mode 100644 index 492e6d3..0000000 --- a/nextcloud-temp-fix-ocm.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Pdpru nextcloud.orig/.htaccess nextcloud/.htaccess ---- nextcloud.orig/.htaccess 2023-10-05 12:47:41.000000000 +0200 -+++ nextcloud/.htaccess 2023-10-07 11:06:13.080370013 +0200 -@@ -90,7 +90,7 @@ - RewriteRule ^remote/(.*) remote.php [QSA,L] - RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L] - RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L] -- RewriteRule ^ocm-provider/?$ /index.php [QSA,L] -+ RewriteRule ^ocm-provider/?$ /nextcloud/index.php [QSA,L] - RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L] - - diff --git a/nextcloud.changes b/nextcloud.changes index 2c8a3f1..84dbff2 100644 --- a/nextcloud.changes +++ b/nextcloud.changes @@ -22,7 +22,6 @@ Thu Oct 5 14:13:03 UTC 2023 - ecsos - Fix(deps): update nextcloud abandoned (text#4756) - Bugfix/duplicated load of yjs (text#4807) - Feat: hide workspace if no readme.md (text#4811) -- Add nextcloud-temp-fix-ocm.patch to fix temporarily the ocm-provider failure message. (server#40803) ------------------------------------------------------------------- Sun Sep 24 09:00:49 UTC 2023 - ecsos diff --git a/nextcloud.spec b/nextcloud.spec index b18862f..1ebc741 100644 --- a/nextcloud.spec +++ b/nextcloud.spec @@ -63,8 +63,6 @@ Source10: %{name}-cron Source11: %{name}-cron.service Source12: %{name}-cron.timer Source99: %{name}-rpmlintrc -# PATCH-FIX-OPENSUSE - Temporarily fix ocm-provider message - https://github.com/nextcloud/server/issues/40803 -Patch1: %{name}-temp-fix-ocm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: apache-rpm-macros @@ -151,7 +149,6 @@ This subpackage contains the Apache configuration files %prep %setup -q -n %{name} -%patch1 -p1 cp %{SOURCE2} . cp %{SOURCE3} . cp %{SOURCE4} .