--- rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec 2020/11/09 02:47:33 1.3 +++ rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec 2023/01/11 05:05:37 1.31 @@ -1,4 +1,4 @@ -%define release 2 +%define release 22 %define version 1.2.0 Summary: Koozali SME Server Nextcloud configuration @@ -7,19 +7,45 @@ Version: %{version} Release: %{release}%{?dist} License: GPL Source: %{name}-%{version}.tar.gz +Patch0: smeserver-nextcloud-1.2.0-bz10876-username-for-ldap.patch +Patch1: smeserver-nextcloud-1.2.0.bz11086-db-phpver-typo.patch +Patch2: smeserver-nextcloud-1.2.0.bz11086-add-missing-conf-details.patch +Patch3: smeserver-nextcloud-1.2.0.bz11171-template-min-max-start-servers.patch +Patch4: smeserver-nextcloud-1.2.0.bz11171-check-min-max-start-servers.patch +Patch5: smeserver-nextcloud-1.2.0.bz11268-fix-typo-php-pool-template.patch +Patch6: smeserver-nextcloud-1.2.0-bz11086.patch +Patch7: smeserver-nextcloud-1.2.0-bz11086-dav-externalfs.patch +Patch8: smeserver-nextcloud-1.2.0-bz11172-logrotate.patch +Patch9: smeserver-nextcloud-1.2.0-bz11920-bz11854-bz11973.patch +Patch10: smeserver-nextcloud-1.2.0-bz11855-gencache.patch +Patch11: smeserver-nextcloud-1.2.0-bz11854.patch +Patch12: smeserver-nextcloud-1.2.0-bz11918-migrateloudDomain2VirtualHost.patch +Patch13: smeserver-nextcloud-1.2.0-bz11343-mariadb105.patch +Patch14: smeserver-nextcloud-1.2.0-bz11972-rewriterules.patch +Patch15: smeserver-nextcloud-1.2.0-bz12094-use-src.patch +Patch16: smeserver-nextcloud-1.2.0-bz12016-backup.patch +Patch17: smeserver-nextcloud-1.2.0-bz12096-bz12095.patch +Patch18: smeserver-nextcloud-1.2.0-bz12053-httpd24.patch +Patch19: smeserver-nextcloud-1.2.0-bz12208-bz12187-bz12241.patch +Patch20: smeserver-nextcloud-1.2.0-bz12277-disablefunctions-systempdir.patch +Patch21: smeserver-nextcloud-1.2.0-bz12299-opcache.patch +Patch22: smeserver-nextcloud-1.2.0-eventsactionsfixes.patch +Patch23: smeserver-nextcloud-1.2.0-bz11890-runuser.patch BuildArch: noarch URL: https://www.nextcloud.com BuildRequires: e-smith-devtools -Requires: nextcloud >= 20.0.1 +Requires: nextcloud-src >= 24.0.1 Requires: e-smith-apache Requires: e-smith-mysql Requires: smeserver-webapps-common Requires: smeserver-php >= 3.0.0-15 Requires: samba-client Requires: perl-JSON +Requires: perl-Exporter-Tiny +Requires: perl-Sub-Quote Requires: php74-php-smbclient Requires: php74-php-opcache Requires: php74-php-pecl-apcu @@ -27,7 +53,10 @@ Requires: php74-php-pecl-inotify Requires: php74-php-pecl-zip Requires: php74-php-pecl-imagick Requires: php74-php-gmp - +Requires: jq +Requires: smeserver-mariadb105 +Requires: e-smith-apache >= 2.6.0-19 +Requires: smeserver-php >= 3.0.0-43 %description Koozali SME Server Nextcloud files and configuration. @@ -35,6 +64,30 @@ Koozali SME Server Nextcloud files and c %prep %setup +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 %build perl createlinks @@ -51,7 +104,10 @@ mkdir -p root/var/log/php/nextcloud --dir /var/lib/php/nextcloud/session 'attr(0755,www,www)' \ --dir /home/e-smith/files/nextcloud 'attr(0755,www,www)' \ --dir /home/e-smith/files/nextcloud/data 'attr(0755,www,www)' \ - --file /usr/bin/OCC 'attr(0755,root,root)'\ + --ignoredir "/etc/sudoers.d" \ + --file "/etc/sudoers.d/90_nextcloud" "attr(0440,root,root)" \ + --file /usr/bin/occ 'attr(0755,root,root)'\ + --file /usr/bin/nc_dbupdate 'attr(0755,root,root)'\ > %{name}-%{version}-filelist cat %{name}-%{version}-filelist @@ -61,8 +117,88 @@ cat %{name}-%{version}-filelist %changelog +* Wed Jan 11 2023 Jean-Philippe Pialasse 1.2.0-22.sme +- use of runuser in place of sudo -u [SME: 11890] + usage of /usr/bin/occ where possible + removal of /usr/bin/OCC + +* Mon Jan 09 2023 Jean-Philippe Pialasse 1.2.0-21.sme +- update disabled_fucntions list [SME: 12277] +- allow customization of opcache for Nextcloud see wiki [SME: 12299] +- actions scripts update + +* Wed Nov 23 2022 Jean-Philippe Pialasse 1.2.0-20.sme +- set overwrite.cli.url [SME: 12208] +- allow shell_exec [SME: 12187] +- fix username conflict with group name [SME: 12241] + +* Sat Jul 30 2022 Brian Read 1.2.0-19.sme +- Re-build and link to latest devtools [SME: 11997] + +* Fri Jul 08 2022 Jean-Philippe Pialasse 1.2.0-18.sme +- update httpd fragment for httpd2.4 syntax [SME: 12053] + +* Fri Jul 08 2022 Jean-Philippe Pialasse 1.2.0-17.sme +- Re-build and link to latest devtools gencache again [SME: 12096] +- Re-build and link to latest devtools ldap users/groups not availables on first run [SME: 12095] + +* Thu Jul 07 2022 Jean-Philippe Pialasse 1.2.0-16.sme +- migrate property CloudDomain to VirtualHost [SME: 11918] +- use mariadb105 on new installs [SME: 11343] +- update rewriterules [SME: 11972] +- update to NC24 [SME: 12094] + use a nextcloud-src rpm and avoid conflicts between web and rpm updates +- add to backup [SME: 12016] + +* Fri May 20 2022 Terry Fage 1.2.0-15.sme +- Re-build and link to latest devtools cron syntax error [SME: 11854] + +* Wed May 18 2022 Jean-Philippe Pialasse 1.2.0-14.sme +- Re-build and link to latest devtools gencache_init failed [SME: 11855] + fix missing nextcloud-conf action in update event + +* Wed May 18 2022 Jean-Philippe Pialasse 1.2.0-12.sme +- use php_pecl-apcu for cli [SME: 11920] +- db update of keys and indexes [SME: 11854] +- few nextcloud-occ-conf fixes [SME: 11973] + make occ used in scripts rather than OCC + +* Sun Jun 06 2021 Jean-Philippe Pialasse 1.2.0-11.sme +- Re-build and link to latest devtools logrotate error [SME: 11172] +- Re-build and link to latest devtools noise in error log + +* Sun Jun 06 2021 Jean-Philippe Pialasse 1.2.0-9.sme +- Re-build and link to latest devtools dav redirections for domain use and subdir [SME: 11086] +- refresh externalfs on loading, best for ibays +- tidying + +* Sun Jun 06 2021 Jean-Philippe Pialasse 1.2.0-8.sme +- add update event [SME: 11086] +- add occ as hard link of OCC + +* Fri Dec 18 2020 John Crisp 1.2.0-7.sme +- Fix typo in php pool template [SME: 11268] + +* Tue Dec 01 2020 John Crisp 1.2.0-6.sme +- Add a check for the Min/Max/Start servers [SME: 11171] +- https://bugs.contribs.org/show_bug.cgi?id=11171#c4 + +* Mon Nov 16 2020 John Crisp 1.2.0-5.sme +- Template missing Min/Start/Max Servers and Children [SME: 11171] + +* Thu Nov 12 2020 John Crisp 1.2.0-4.sme +- Add missing SMB configuration details including domain/workgroup + +* Mon Nov 09 2020 John Crisp 1.2.0-3.sme +- Fix sudoer file permissions in file list +- Fix some install bugs +- typo in httpd.conf +- switch db from mysql to maria db +- update php version +- add Requires + * Sun Nov 08 2020 Jean-Philipe Pialasse 1.2.0-2.sme -- fix [SME: ] +- use username as id in place of ldap uuid [SME: 10876] * Sun Nov 08 2020 Jean-Philipe Pialasse 1.2.0-1.sme - initial SME10 import [SME: 11086] @@ -76,17 +212,17 @@ cat %{name}-%{version}-filelist - ease use of a dedicated domaine with https [SME: 10885] * Mon Jan 27 2020 Jean-Philipe Pialasse 1.1.0-16.sme -- fix missing Requirement and template-begins [SME: 10852] +- Re-build and link to latest devtools missing Requirement and template-begins [SME: 10852] * Mon Dec 16 2019 Jean-Philipe Pialasse 1.1.0-15.sme - use php72-fpm instead of php71-fpm [SME: 10852] * Sun Feb 17 2019 Jean-Philipe Pialasse 1.1.0-14.sme -- fix 512MB error on events [SME: 10728] +- Re-build and link to latest devtools 512MB error on events [SME: 10728] - add requirement for inotify support [SME: 10733] * Wed Jan 16 2019 Jean-Philipe Pialasse 1.1.0-13.sme -- fix /.well-known check [SME: 10709] +- Re-build and link to latest devtools /.well-known check [SME: 10709] - created a OCC command you can call as root as if you were the right user. [SME: 10711] - night cron to fix db [SME: 10710 ] @@ -95,36 +231,36 @@ cat %{name}-%{version}-filelist add property to nextcloud db key MemoryLimit to set to local value if needed. * Thu Dec 20 2018 Jean-Philipe Pialasse 1.1.0-10.sme -- fix /var/log/php/nextcloud/ is missing [SME: 10601] +- Re-build and link to latest devtools /var/log/php/nextcloud/ is missing [SME: 10601] * Wed Dec 19 2018 Jean-Philipe Pialasse 1.1.0-9.sme -- fix timeout on update [SME: 10596] +- Re-build and link to latest devtools timeout on update [SME: 10596] * Wed Jul 04 2018 Jean-Philipe Pialasse 1.1.0-8.sme -- fix wrong filter name for fail2ban jail.conf [SME: 10608] +- Re-build and link to latest devtools wrong filter name for fail2ban jail.conf [SME: 10608] * Wed Apr 11 2018 Jean-Philipe Pialasse 1.1.0-7.sme -- fix long update [SME: 10564] -- fix IncludeIbay not working. +- Re-build and link to latest devtools long update [SME: 10564] +- Re-build and link to latest devtools IncludeIbay not working. * Wed Apr 11 2018 Jean-Philipe Pialasse 1.1.0-6.sme -- fix shares not correctly handled [SME: 10564] +- Re-build and link to latest devtools shares not correctly handled [SME: 10564] - improve shares support - reload file cache after creation of ibays folder, so it displays to users. - improve output to message log * Mon Apr 09 2018 Jean-Philipe Pialasse 1.1.0-5.sme -- fix signal-event nextcloud-update hang [SME: 10560] +- Re-build and link to latest devtools signal-event nextcloud-update hang [SME: 10560] * Sun Apr 08 2018 Jean-Philipe Pialasse 1.1.0-4.sme -- fix wrong logrotate option [SME: 10560] +- Re-build and link to latest devtools wrong logrotate option [SME: 10560] - change password storage mode for smb share to allow access from portable devices [SME: 10558] - create the "ibays" main folder to mount all ibays in every user nextcloud space [SME: 10557] - add Shared folders in nextcloud under the ibays folder [SME: 10559] * Sat Apr 07 2018 Jean-Philipe Pialasse 1.1.0-3.sme - tidying templates, set cron update -- fix bad folder name for ibays [SME: 10556] +- Re-build and link to latest devtools bad folder name for ibays [SME: 10556] * Fri Mar 30 2018 Jean-Philipe Pialasse 1.1.0-1.sme - initial release