On Fri, Jun 08, 2018 at 08:31:39AM +0200, Gonzalo L. Rodriguez wrote:
> Hello,
>
> Update for Nextcloud to 13.0.3:
>
> https://nextcloud.com/changelog/
>
> While here, I moved the httpd(8) to the README as we did on owncloud.
>
> OK? Comments?
Builds / installs / runs fine here. IMO we should avoid modifying the
signed files (info.xml and occ). Apologies if it's been discussed
before, but I am not sure the changes are worth the "compromised"
integrity.
Maybe a README entry regarding a "php" binary would work for the occ
script. Perhaps there is another way to disable auto updates (I will
poke around)?
I don't think the above should be an update stopper, so OK abieber@
>
> Cheers.-
>
> --
> Sending from my toaster.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/nextcloud/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 2 Jun 2018 20:58:30 -0000 1.16
> +++ Makefile 8 Jun 2018 06:29:00 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT= easy and universal access to shared and/or personal
> files
>
> -V= 13.0.2
> -REVISION= 2
> +V= 13.0.3
> DISTNAME= nextcloud-${V}
> EXTRACT_SUFX= .tar.bz2
>
> @@ -72,7 +71,5 @@ do-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/conf/modules.sample
> ${SUBST_CMD} -m 0644 -c ${FILESDIR}/apache-nextcloud.conf.dist.in \
> ${PREFIX}/conf/modules.sample/apache-nextcloud.conf.dist
> - ${SUBST_CMD} -m 0644 -c ${FILESDIR}/httpd-nextcloud.conf.dist.in \
> - ${PREFIX}/conf/modules.sample/httpd-nextcloud.conf.dist
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/www/nextcloud/distinfo,v
> retrieving revision 1.10
> diff -u -p -r1.10 distinfo
> --- distinfo 27 Apr 2018 06:24:02 -0000 1.10
> +++ distinfo 8 Jun 2018 06:29:00 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (nextcloud-13.0.2.tar.bz2) =
> c5b5ihpTqfSxRPVTYNh8ictu6Jn+7xz78ppzYhn5xH0=
> -SIZE (nextcloud-13.0.2.tar.bz2) = 44842305
> +SHA256 (nextcloud-13.0.3.tar.bz2) =
> GDZnVAgA3QRepXgB/t+MooDegrkVgkEqrQfULtcek+Q=
> +SIZE (nextcloud-13.0.3.tar.bz2) = 45128672
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v
> retrieving revision 1.12
> diff -u -p -r1.12 PLIST
> --- pkg/PLIST 17 May 2018 08:57:47 -0000 1.12
> +++ pkg/PLIST 8 Jun 2018 06:29:03 -0000
> @@ -1,10 +1,9 @@
> @comment $OpenBSD: PLIST,v 1.12 2018/05/17 08:57:47 gonzalo Exp $
> @unexec-delete rm -f ${PREFIX}/conf/modules/httpd-nextcloud.conf
> @unexec-delete rm -f ${PREFIX}/conf/modules/apache-nextcloud.conf
> +conf/modules.sample/
> conf/modules.sample/apache-nextcloud.conf.dist
> -@sample ${PREFIX}/conf/modules.sample/apache-nextcloud.conf
> -conf/modules.sample/httpd-nextcloud.conf.dist
> -@sample ${PREFIX}/conf/modules.sample/httpd-nextcloud.conf
> +@sample conf/modules.sample/apache-nextcloud.conf
> nextcloud/
> nextcloud/.htaccess.dist
> @sample nextcloud/.htaccess
> @@ -5929,6 +5928,7 @@ nextcloud/apps/dav/lib/CardDAV/Xml/Group
> nextcloud/apps/dav/lib/Command/
> nextcloud/apps/dav/lib/Command/CreateAddressBook.php
> nextcloud/apps/dav/lib/Command/CreateCalendar.php
> +nextcloud/apps/dav/lib/Command/RemoveInvalidShares.php
> nextcloud/apps/dav/lib/Command/SyncBirthdayCalendar.php
> nextcloud/apps/dav/lib/Command/SyncSystemAddressBook.php
> nextcloud/apps/dav/lib/Comments/
> @@ -9357,14 +9357,8 @@ nextcloud/apps/firstrunwizard/l10n/
> nextcloud/apps/firstrunwizard/l10n/.gitignore
> nextcloud/apps/firstrunwizard/l10n/.tx/
> nextcloud/apps/firstrunwizard/l10n/.tx/config
> -nextcloud/apps/firstrunwizard/l10n/ar.js
> -nextcloud/apps/firstrunwizard/l10n/ar.json
> nextcloud/apps/firstrunwizard/l10n/ast.js
> nextcloud/apps/firstrunwizard/l10n/ast.json
> -nextcloud/apps/firstrunwizard/l10n/az.js
> -nextcloud/apps/firstrunwizard/l10n/az.json
> -nextcloud/apps/firstrunwizard/l10n/bg.js
> -nextcloud/apps/firstrunwizard/l10n/bg.json
> nextcloud/apps/firstrunwizard/l10n/bn_IN.php
> nextcloud/apps/firstrunwizard/l10n/ca.js
> nextcloud/apps/firstrunwizard/l10n/ca.json
> @@ -9382,8 +9376,6 @@ nextcloud/apps/firstrunwizard/l10n/el.js
> nextcloud/apps/firstrunwizard/l10n/el.json
> nextcloud/apps/firstrunwizard/l10n/en_GB.js
> nextcloud/apps/firstrunwizard/l10n/en_GB.json
> -nextcloud/apps/firstrunwizard/l10n/eo.js
> -nextcloud/apps/firstrunwizard/l10n/eo.json
> nextcloud/apps/firstrunwizard/l10n/es.js
> nextcloud/apps/firstrunwizard/l10n/es.json
> nextcloud/apps/firstrunwizard/l10n/es_419.js
> @@ -9424,8 +9416,6 @@ nextcloud/apps/firstrunwizard/l10n/et_EE
> nextcloud/apps/firstrunwizard/l10n/et_EE.json
> nextcloud/apps/firstrunwizard/l10n/eu.js
> nextcloud/apps/firstrunwizard/l10n/eu.json
> -nextcloud/apps/firstrunwizard/l10n/fa.js
> -nextcloud/apps/firstrunwizard/l10n/fa.json
> nextcloud/apps/firstrunwizard/l10n/fi.js
> nextcloud/apps/firstrunwizard/l10n/fi.json
> nextcloud/apps/firstrunwizard/l10n/fr.js
> @@ -9436,8 +9426,6 @@ nextcloud/apps/firstrunwizard/l10n/hu.js
> nextcloud/apps/firstrunwizard/l10n/hu.json
> nextcloud/apps/firstrunwizard/l10n/ia.js
> nextcloud/apps/firstrunwizard/l10n/ia.json
> -nextcloud/apps/firstrunwizard/l10n/id.js
> -nextcloud/apps/firstrunwizard/l10n/id.json
> nextcloud/apps/firstrunwizard/l10n/is.js
> nextcloud/apps/firstrunwizard/l10n/is.json
> nextcloud/apps/firstrunwizard/l10n/it.js
> @@ -9452,30 +9440,22 @@ nextcloud/apps/firstrunwizard/l10n/ko.js
> nextcloud/apps/firstrunwizard/l10n/ku_IQ.php
> nextcloud/apps/firstrunwizard/l10n/lt_LT.js
> nextcloud/apps/firstrunwizard/l10n/lt_LT.json
> -nextcloud/apps/firstrunwizard/l10n/lv.js
> -nextcloud/apps/firstrunwizard/l10n/lv.json
> nextcloud/apps/firstrunwizard/l10n/ms_MY.php
> nextcloud/apps/firstrunwizard/l10n/nb.js
> nextcloud/apps/firstrunwizard/l10n/nb.json
> nextcloud/apps/firstrunwizard/l10n/nl.js
> nextcloud/apps/firstrunwizard/l10n/nl.json
> -nextcloud/apps/firstrunwizard/l10n/oc.js
> -nextcloud/apps/firstrunwizard/l10n/oc.json
> nextcloud/apps/firstrunwizard/l10n/pl.js
> nextcloud/apps/firstrunwizard/l10n/pl.json
> nextcloud/apps/firstrunwizard/l10n/pt_BR.js
> nextcloud/apps/firstrunwizard/l10n/pt_BR.json
> nextcloud/apps/firstrunwizard/l10n/pt_PT.js
> nextcloud/apps/firstrunwizard/l10n/pt_PT.json
> -nextcloud/apps/firstrunwizard/l10n/ro.js
> -nextcloud/apps/firstrunwizard/l10n/ro.json
> nextcloud/apps/firstrunwizard/l10n/ru.js
> nextcloud/apps/firstrunwizard/l10n/ru.json
> nextcloud/apps/firstrunwizard/l10n/si_LK.php
> nextcloud/apps/firstrunwizard/l10n/sk.js
> nextcloud/apps/firstrunwizard/l10n/sk.json
> -nextcloud/apps/firstrunwizard/l10n/sl.js
> -nextcloud/apps/firstrunwizard/l10n/sl.json
> nextcloud/apps/firstrunwizard/l10n/sq.js
> nextcloud/apps/firstrunwizard/l10n/sq.json
> nextcloud/apps/firstrunwizard/l10n/sr.js
> @@ -9484,13 +9464,9 @@ nextcloud/apps/firstrunwizard/l10n/sv.js
> nextcloud/apps/firstrunwizard/l10n/sv.json
> nextcloud/apps/firstrunwizard/l10n/ta_LK.php
> nextcloud/apps/firstrunwizard/l10n/te.php
> -nextcloud/apps/firstrunwizard/l10n/th.js
> -nextcloud/apps/firstrunwizard/l10n/th.json
> nextcloud/apps/firstrunwizard/l10n/tr.js
> nextcloud/apps/firstrunwizard/l10n/tr.json
> nextcloud/apps/firstrunwizard/l10n/ug.php
> -nextcloud/apps/firstrunwizard/l10n/uk.js
> -nextcloud/apps/firstrunwizard/l10n/uk.json
> nextcloud/apps/firstrunwizard/l10n/zh_CN.js
> nextcloud/apps/firstrunwizard/l10n/zh_CN.json
> nextcloud/apps/firstrunwizard/l10n/zh_HK.php
> @@ -10565,6 +10541,8 @@ nextcloud/apps/oauth2/lib/Db/ClientMappe
> nextcloud/apps/oauth2/lib/Exceptions/
> nextcloud/apps/oauth2/lib/Exceptions/AccessTokenNotFoundException.php
> nextcloud/apps/oauth2/lib/Exceptions/ClientNotFoundException.php
> +nextcloud/apps/oauth2/lib/Migration/
> +nextcloud/apps/oauth2/lib/Migration/SetTokenExpiration.php
> nextcloud/apps/oauth2/lib/Settings/
> nextcloud/apps/oauth2/lib/Settings/Admin.php
> nextcloud/apps/oauth2/templates/
> @@ -11108,8 +11086,6 @@ nextcloud/apps/survey_client/js/admin.js
> nextcloud/apps/survey_client/l10n/
> nextcloud/apps/survey_client/l10n/.tx/
> nextcloud/apps/survey_client/l10n/.tx/config
> -nextcloud/apps/survey_client/l10n/ast.js
> -nextcloud/apps/survey_client/l10n/ast.json
> nextcloud/apps/survey_client/l10n/ca.js
> nextcloud/apps/survey_client/l10n/ca.json
> nextcloud/apps/survey_client/l10n/cs.js
> @@ -11194,8 +11170,6 @@ nextcloud/apps/survey_client/l10n/pt_PT.
> nextcloud/apps/survey_client/l10n/pt_PT.json
> nextcloud/apps/survey_client/l10n/ru.js
> nextcloud/apps/survey_client/l10n/ru.json
> -nextcloud/apps/survey_client/l10n/sk.js
> -nextcloud/apps/survey_client/l10n/sk.json
> nextcloud/apps/survey_client/l10n/sq.js
> nextcloud/apps/survey_client/l10n/sq.json
> nextcloud/apps/survey_client/l10n/sr.js
> @@ -11552,6 +11526,8 @@ nextcloud/apps/theming/l10n/fr.js
> nextcloud/apps/theming/l10n/fr.json
> nextcloud/apps/theming/l10n/gl.js
> nextcloud/apps/theming/l10n/gl.json
> +nextcloud/apps/theming/l10n/he.js
> +nextcloud/apps/theming/l10n/he.json
> nextcloud/apps/theming/l10n/hu.js
> nextcloud/apps/theming/l10n/hu.json
> nextcloud/apps/theming/l10n/id.js
> @@ -12692,6 +12668,7 @@ nextcloud/core/Migrations/Version13000Da
> nextcloud/core/Migrations/Version13000Date20170814074715.php
> nextcloud/core/Migrations/Version13000Date20170919121250.php
> nextcloud/core/Migrations/Version13000Date20170926101637.php
> +nextcloud/core/Migrations/Version13000Date20180516101403.php
> nextcloud/core/ajax/
> nextcloud/core/ajax/update.php
> nextcloud/core/css/
> @@ -13253,6 +13230,7 @@ nextcloud/core/doc/user/_sources/pim/
> nextcloud/core/doc/user/_sources/pim/calendar.txt
> nextcloud/core/doc/user/_sources/pim/contacts.txt
> nextcloud/core/doc/user/_sources/pim/index.txt
> +nextcloud/core/doc/user/_sources/pim/sync_android.txt
> nextcloud/core/doc/user/_sources/pim/sync_ios.txt
> nextcloud/core/doc/user/_sources/pim/sync_kde.txt
> nextcloud/core/doc/user/_sources/pim/sync_osx.txt
> @@ -13383,6 +13361,7 @@ nextcloud/core/doc/user/pim/
> nextcloud/core/doc/user/pim/calendar.html
> nextcloud/core/doc/user/pim/contacts.html
> nextcloud/core/doc/user/pim/index.html
> +nextcloud/core/doc/user/pim/sync_android.html
> nextcloud/core/doc/user/pim/sync_ios.html
> nextcloud/core/doc/user/pim/sync_kde.html
> nextcloud/core/doc/user/pim/sync_osx.html
> @@ -13702,6 +13681,8 @@ nextcloud/core/l10n/el.js
> nextcloud/core/l10n/el.json
> nextcloud/core/l10n/en_GB.js
> nextcloud/core/l10n/en_GB.json
> +nextcloud/core/l10n/eo.js
> +nextcloud/core/l10n/eo.json
> nextcloud/core/l10n/es.js
> nextcloud/core/l10n/es.json
> nextcloud/core/l10n/es_419.js
> @@ -14255,6 +14236,7 @@ nextcloud/lib/private/Archive/TAR.php
> nextcloud/lib/private/Archive/ZIP.php
> nextcloud/lib/private/Authentication/
> nextcloud/lib/private/Authentication/Exceptions/
> +nextcloud/lib/private/Authentication/Exceptions/ExpiredTokenException.php
> nextcloud/lib/private/Authentication/Exceptions/InvalidTokenException.php
> nextcloud/lib/private/Authentication/Exceptions/LoginRequiredException.php
>
> nextcloud/lib/private/Authentication/Exceptions/PasswordLoginForbiddenException.php
> Index: pkg/README
> ===================================================================
> RCS file: /cvs/ports/www/nextcloud/pkg/README,v
> retrieving revision 1.3
> diff -u -p -r1.3 README
> --- pkg/README 9 Feb 2018 10:04:53 -0000 1.3
> +++ pkg/README 8 Jun 2018 06:29:03 -0000
> @@ -28,14 +28,49 @@ run the following as root:
>
> OpenBSD HTTP daemon
> -------------------
> -httpd(8) example configuration for nextcloud is stored under:
> - ${PREFIX}/conf/modules.sample/httpd-nextcloud.conf
> +httpd(8) example configuration for Nextcloud:
>
> -It needs to be enabled by (assuming you already have httpd and php working):
> +---8<---------------------------------------------------------------------------
> +server "domain.tld" {
> + listen on egress tls port 443
>
> -# cp ${PREFIX}/conf/modules.sample/httpd-nextcloud.conf /etc/
> -# echo 'include "/etc/httpd-nextcloud.conf"' >> /etc/httpd.conf
> -# rcctl restart httpd
> + tls {
> + certificate "/etc/ssl/domain.tld_fullchain.pem"
> + key "/etc/ssl/private/domain.tld_private.pem"
> + }
> +
> + # First deny access to the specified files
> + location "/db_structure.xml" { block }
> + location "/.ht*" { block }
> + location "/README" { block }
> + location "/data*" { block }
> + location "/config*" { block }
> + location "/build*" { block }
> + location "/tests*" { block }
> + location "/config*" { block }
> + location "/lib*" { block }
> + location "/3rdparty*" { block }
> + location "/templates*" { block }
> + location "/data*" { block }
> + location "/.ht*" { block }
> + location "/.user*" { block }
> + location "/autotest*" { block }
> + location "/occ*" { block }
> + location "/issue*" { block }
> + location "/indie*" { block }
> + location "/db_*" { block }
> + location "/console*" { block }
> +
> + location "/*.php*" {
> + root { "/nextcloud", strip 1 }
> + fastcgi socket "/run/php-fpm.sock"
> + }
> +
> + location "/*" {
> + root { "/nextcloud", strip 1 }
> + }
> +}
> +---8<---------------------------------------------------------------------------
>
> nginx
> -----
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
