We moved nextcloud to php 7.0 requested by many, thanks sthen@ for moving

MODPHP_FLAVOR from pecl.port.mk to php.port.mk (fixing databases/pecl-redis).
Improved the httpd.conf (from Eric Elena, thanks!), also deleted the patch for
our version to avoid the alert on the new integrity check (requested by stsp@
and kirby@)

OK sthen@
This commit is contained in:
gonzalo 2018-05-17 08:57:47 +00:00
parent f8c62a01d7
commit 12ba5869ec
4 changed files with 70 additions and 68 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2018/04/27 09:15:07 gonzalo Exp $
# $OpenBSD: Makefile,v 1.13 2018/05/17 08:57:47 gonzalo Exp $
COMMENT= easy and universal access to shared and/or personal files
V= 13.0.2
REVISION= 0
DISTNAME= nextcloud-${V}
EXTRACT_SUFX= .tar.bz2
@ -36,6 +37,7 @@ INSTDIR= ${PREFIX}/nextcloud
TINSTDIR= ${TRUEPREFIX}/nextcloud
VR= ${V:R}
MAJOR= ${VR:R}
MODPHP_VERSION= 7.0
SUBST_VARS= INSTDIR TINSTDIR MODPHP_BIN VR MAJOR
RUN_DEPENDS= lang/php/${MODPHP_VERSION},-gd \
@ -54,7 +56,7 @@ RUN_DEPENDS += lang/php/${MODPHP_VERSION},-intl
RUN_DEPENDS += lang/php/${MODPHP_VERSION},-mcrypt
# distributed caching and Transactional File Locking
RUN_DEPENDS += databases/pecl-redis
RUN_DEPENDS += databases/pecl-redis${MODPHP_FLAVOR}
do-install:
cp -Rp ${WRKSRC} ${INSTDIR}

View File

@ -9,20 +9,34 @@ server "nextcloud.example.com" {
# Set max upload size to 513M (in bytes)
connection max request body 537919488
# First deny access to the specified files
location "/db_structure.xml" { block }
location "/.ht*" { block }
location "/README" { block }
location "/data*" { block }
location "/config*" { block }
# 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 }
}
}

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-version_php,v 1.9 2018/04/27 06:24:02 gonzalo Exp $
Index: version.php
--- version.php.orig
+++ version.php
@@ -2,7 +2,7 @@
$OC_Version = array(13,0,2,1);
$OC_VersionString = '13.0.2';
$OC_Edition = '';
-$OC_Channel = 'stable';
+$OC_Channel = 'OpenBSD ports';
$OC_VersionCanBeUpgradedFrom = array (
'nextcloud' =>
array (

View File

@ -1,11 +1,10 @@
@comment $OpenBSD: PLIST,v 1.11 2018/04/27 06:24:02 gonzalo Exp $
@unexec-delete rm -f /var/www/conf/modules/httpd-nextcloud.conf
@unexec-delete rm -f /var/www/conf/modules/apache-nextcloud.conf
@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/apache-nextcloud.conf.dist
@sample /var/www/conf/modules.sample/
@sample /var/www/conf/modules.sample/apache-nextcloud.conf
@sample ${PREFIX}/conf/modules.sample/apache-nextcloud.conf
conf/modules.sample/httpd-nextcloud.conf.dist
@sample /var/www/conf/modules.sample/httpd-nextcloud.conf
@sample ${PREFIX}/conf/modules.sample/httpd-nextcloud.conf
nextcloud/
nextcloud/.htaccess.dist
@sample nextcloud/.htaccess
@ -681,16 +680,16 @@ nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudhsmv2/2017-04-28/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudhsmv2/2017-04-28/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudhsmv2/2017-04-28/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudsearch/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudsearch/20${MAJOR}-01-01/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudsearch/20${MAJOR}-01-01/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudsearch/20${MAJOR}-01-01/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudsearch/2013-01-01/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudsearch/2013-01-01/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudsearch/2013-01-01/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudsearchdomain/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudsearchdomain/20${MAJOR}-01-01/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudsearchdomain/20${MAJOR}-01-01/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudsearchdomain/2013-01-01/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudsearchdomain/2013-01-01/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudtrail/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudtrail/20${MAJOR}-11-01/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudtrail/20${MAJOR}-11-01/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudtrail/20${MAJOR}-11-01/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudtrail/2013-11-01/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudtrail/2013-11-01/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/cloudtrail/2013-11-01/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/codebuild/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/codebuild/2016-10-06/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/codebuild/2016-10-06/api-2.json.php
@ -899,10 +898,10 @@ nextcloud/3rdparty/aws/aws-sdk-php/src/data/iot/2015-05-28/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/iot/2015-05-28/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/iot/2015-05-28/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/kinesis/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/kinesis/20${MAJOR}-12-02/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/kinesis/20${MAJOR}-12-02/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/kinesis/20${MAJOR}-12-02/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/kinesis/20${MAJOR}-12-02/waiters-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/kinesis/2013-12-02/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/kinesis/2013-12-02/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/kinesis/2013-12-02/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/kinesis/2013-12-02/waiters-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/kinesisanalytics/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/kinesisanalytics/2015-08-14/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/kinesisanalytics/2015-08-14/api-2.json.php
@ -954,10 +953,10 @@ nextcloud/3rdparty/aws/aws-sdk-php/src/data/mturk-requester/2017-01-17/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/mturk-requester/2017-01-17/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/mturk-requester/2017-01-17/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/opsworks/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/opsworks/20${MAJOR}-02-18/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/opsworks/20${MAJOR}-02-18/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/opsworks/20${MAJOR}-02-18/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/opsworks/20${MAJOR}-02-18/waiters-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/opsworks/2013-02-18/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/opsworks/2013-02-18/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/opsworks/2013-02-18/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/opsworks/2013-02-18/waiters-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/opsworkscm/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/opsworkscm/2016-11-01/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/opsworkscm/2016-11-01/api-2.json.php
@ -997,10 +996,10 @@ nextcloud/3rdparty/aws/aws-sdk-php/src/data/resourcegroupstaggingapi/2017-01-26/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/resourcegroupstaggingapi/2017-01-26/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/resourcegroupstaggingapi/2017-01-26/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/route53/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/route53/20${MAJOR}-04-01/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/route53/20${MAJOR}-04-01/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/route53/20${MAJOR}-04-01/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/route53/20${MAJOR}-04-01/waiters-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/route53/2013-04-01/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/route53/2013-04-01/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/route53/2013-04-01/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/route53/2013-04-01/waiters-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/route53domains/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/route53domains/2014-05-15/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/route53domains/2014-05-15/api-2.json.php
@ -1048,9 +1047,9 @@ nextcloud/3rdparty/aws/aws-sdk-php/src/data/states/2016-11-23/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/states/2016-11-23/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/states/2016-11-23/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/storagegateway/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/storagegateway/20${MAJOR}-06-30/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/storagegateway/20${MAJOR}-06-30/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/storagegateway/20${MAJOR}-06-30/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/storagegateway/2013-06-30/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/storagegateway/2013-06-30/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/storagegateway/2013-06-30/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/streams.dynamodb/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/streams.dynamodb/2012-08-10/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/streams.dynamodb/2012-08-10/api-2.json.php
@ -1060,9 +1059,9 @@ nextcloud/3rdparty/aws/aws-sdk-php/src/data/sts/2011-06-15/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/sts/2011-06-15/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/sts/2011-06-15/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/support/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/support/20${MAJOR}-04-15/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/support/20${MAJOR}-04-15/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/support/20${MAJOR}-04-15/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/support/2013-04-15/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/support/2013-04-15/api-2.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/support/2013-04-15/paginators-1.json.php
nextcloud/3rdparty/aws/aws-sdk-php/src/data/swf/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/swf/2012-01-25/
nextcloud/3rdparty/aws/aws-sdk-php/src/data/swf/2012-01-25/api-2.json.php
@ -6006,7 +6005,7 @@ nextcloud/apps/dav/lib/Migration/BuildCalendarSearchIndex.php
nextcloud/apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php
nextcloud/apps/dav/lib/Migration/CalDAVRemoveEmptyValue.php
nextcloud/apps/dav/lib/Migration/FixBirthdayCalendarComponent.php
nextcloud/apps/dav/lib/Migration/Version1004Date20170825${MAJOR}4824.php
nextcloud/apps/dav/lib/Migration/Version1004Date20170825134824.php
nextcloud/apps/dav/lib/Migration/Version1004Date20170919104507.php
nextcloud/apps/dav/lib/Migration/Version1004Date20170924124212.php
nextcloud/apps/dav/lib/Migration/Version1004Date20170926103422.php
@ -7664,10 +7663,10 @@ nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniJIS2004-UTF8-V.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniJISPro-UCS2-HW-V.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniJISPro-UCS2-V.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniJISPro-UTF8-V.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniJISX02${MAJOR}-UTF32-H.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniJISX02${MAJOR}-UTF32-V.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniJISX02${MAJOR}2004-UTF32-H.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniJISX02${MAJOR}2004-UTF32-V.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniJISX0213-UTF32-H.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniJISX0213-UTF32-V.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniJISX02132004-UTF32-H.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniJISX02132004-UTF32-V.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniKS-UCS2-H.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniKS-UCS2-V.bcmap
nextcloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniKS-UTF16-H.bcmap
@ -11763,7 +11762,7 @@ nextcloud/apps/twofactor_backupcodes/lib/Db/BackupCode.php
nextcloud/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
nextcloud/apps/twofactor_backupcodes/lib/Migration/
nextcloud/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php
nextcloud/apps/twofactor_backupcodes/lib/Migration/Version1002Date201706071${MAJOR}030.php
nextcloud/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php
nextcloud/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php
nextcloud/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170926101419.php
nextcloud/apps/twofactor_backupcodes/lib/Provider/
@ -12688,11 +12687,11 @@ nextcloud/core/Controller/WalledGardenController.php
nextcloud/core/Middleware/
nextcloud/core/Middleware/TwoFactorMiddleware.php
nextcloud/core/Migrations/
nextcloud/core/Migrations/Version${MAJOR}000Date20170705121758.php
nextcloud/core/Migrations/Version${MAJOR}000Date20170718121200.php
nextcloud/core/Migrations/Version${MAJOR}000Date20170814074715.php
nextcloud/core/Migrations/Version${MAJOR}000Date20170919121250.php
nextcloud/core/Migrations/Version${MAJOR}000Date20170926101637.php
nextcloud/core/Migrations/Version13000Date20170705121758.php
nextcloud/core/Migrations/Version13000Date20170718121200.php
nextcloud/core/Migrations/Version13000Date20170814074715.php
nextcloud/core/Migrations/Version13000Date20170919121250.php
nextcloud/core/Migrations/Version13000Date20170926101637.php
nextcloud/core/ajax/
nextcloud/core/ajax/update.php
nextcloud/core/css/
@ -15521,8 +15520,8 @@ nextcloud/version.php
@owner www
@group www
@sample nextcloud/data/
@cwd ${LOCALBASE}/share/doc/pkg-readmes
@mode
@owner
@group
@cwd ${LOCALBASE}/share/doc/pkg-readmes
${FULLPKGNAME}