bump version to v13.0.0beta1 and merge changes from community/nextcloud

5 files changed, 85 insertions, 134 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c09c38deb63a..b930a9d1125d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 # Generated by mksrcinfo v8
-# Mon Dec  5 16:15:59 UTC 2016
+# Mon Dec  4 08:56:47 UTC 2017
 pkgbase = nextcloud-testing
-	pkgdesc = Testing Release -- A safe home for all your data. Secure, under your control and developed in an open, transparent and trustworthy way
-	pkgver = 11.0.0beta2
+	pkgdesc = Testing Release -- A cloud server to store your files centrally on a hardware controlled by you
+	pkgver = 13.0.0beta1
 	pkgrel = 1
 	url = https://nextcloud.com
 	arch = any
 	license = AGPL
-	depends = php
 	depends = php-gd
 	optdepends = php-apache: to use the Apache web server
 	optdepends = php-sqlite: to use the SQLite database backend
@@ -15,25 +14,25 @@ pkgbase = nextcloud-testing
 	optdepends = php-ldap: LDAP authentication
 	optdepends = php-intl
 	optdepends = php-apcu
+	optdepends = php-xcache
 	optdepends = mariadb: to use the MySQL database backend
 	optdepends = smbclient: to mount SAMBA shares
 	optdepends = php-mcrypt
-	optdepends = imagemagick: file preview
 	optdepends = ffmpeg: file preview
 	optdepends = libreoffice: file preview
 	provides = nextcloud
-	conflicts = owncloud
 	conflicts = nextcloud
+	conflicts = owncloud
 	options = !strip
-	options = emptydirs
-	source = https://download.nextcloud.com/server/prereleases/nextcloud-11.0.0beta2.tar.bz2
-	source = https://download.nextcloud.com/server/prereleases/nextcloud-11.0.0beta2.tar.bz2.asc
+	backup = etc/webapps/nextcloud/apache.example.conf
+	source = https://download.nextcloud.com/server/prereleases/nextcloud-13.0.0beta1.tar.bz2
+	source = https://download.nextcloud.com/server/prereleases/nextcloud-13.0.0beta1.tar.bz2.asc
 	source = apache.example.conf
-	source = set-nc-perms.sh
-	md5sums = 0ca765c16b1d34e7e263f7226abbc96b
-	md5sums = SKIP
-	md5sums = bc2b02b0562b7a58e660e33acd4202bc
-	md5sums = d505daefdb3c0ef5c9ca6ea8973d7c17
+	source = nextcloud.hook
+	sha256sums = 158f7bc66f2ce5ef8f197d4e76053ecc94fd896e9f19fb91f996e8be304542af
+	sha256sums = SKIP
+	sha256sums = 55b892adb86a67c2fa12d79f0980c6aea75aed5c6f6f78f2c2b5e5575a012067
+	sha256sums = d084cd6423c03f98087884b3c7b81f9510d1bea6c518860b64787a7f976cf0d3
 
 pkgname = nextcloud-testing
 
diff --git a/PKGBUILD b/PKGBUILD
index 975d0932d247..69117c1b709e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,60 @@
-# Maintainer: Grey Christoforo <first name [at] last name [dot] net>
+# Submitter: Grey Christoforo <first name [at] last name [dot] net>
+# Maintainer: Colin Arnott <colin@urandom.co.uk>
 
-pkgname=nextcloud-testing
-pkgver=11.0.0beta2
+srcname=nextcloud
+pkgname=${srcname}-testing
+pkgver=13.0.0beta1
 pkgrel=1
-pkgdesc="Testing Release -- A safe home for all your data. Secure, under your control and developed in an open, transparent and trustworthy way"
-url="https://nextcloud.com"
+pkgdesc="Testing Release -- A cloud server to store your files centrally on a hardware controlled by you"
 arch=('any')
+url="https://nextcloud.com"
 provides=('nextcloud')
-conflicts=('owncloud' 'nextcloud')
+conflicts=('nextcloud' 'owncloud')
 license=('AGPL')
-depends=('php' 'php-gd')
+depends=('php-gd')
 optdepends=('php-apache: to use the Apache web server'
-      'php-sqlite: to use the SQLite database backend'
-      'php-pgsql: to use the PostgreSQL database backend'
-      'php-ldap: LDAP authentication'
-      'php-intl'
-      'php-apcu'
-      'mariadb: to use the MySQL database backend'
-      'smbclient: to mount SAMBA shares'
-      'php-mcrypt'
-      'imagemagick: file preview'
-      'ffmpeg: file preview'
-      'libreoffice: file preview')
+            'php-sqlite: to use the SQLite database backend'
+            'php-pgsql: to use the PostgreSQL database backend'
+            'php-ldap: LDAP authentication'
+            'php-intl'
+            'php-apcu'
+            'php-xcache'
+            'mariadb: to use the MySQL database backend'
+            'smbclient: to mount SAMBA shares'
+            'php-mcrypt'
+            'ffmpeg: file preview'
+            'libreoffice: file preview')
 options=('!strip')
+backup=('etc/webapps/nextcloud/apache.example.conf')
 validpgpkeys=('28806A878AE423A28372792ED75899B9A724937A')
 source=("https://download.nextcloud.com/server/prereleases/nextcloud-${pkgver}.tar.bz2"{,.asc}
-  "apache.example.conf"
-  "set-nc-perms.sh")
-
-md5sums=('0ca765c16b1d34e7e263f7226abbc96b'
-         'SKIP'
-         'bc2b02b0562b7a58e660e33acd4202bc'
-         'd505daefdb3c0ef5c9ca6ea8973d7c17')
-_fetchedMD5=$(curl -sS https://download.nextcloud.com/server/prereleases/nextcloud-${pkgver}.tar.bz2.md5)
-IFS=' '; _arrFetchedMD5=($_fetchedMD5); unset IFS;
-_fetchedMD5=${_arrFetchedMD5[0]}
-md5sums[0]=$_fetchedMD5
+        'apache.example.conf'
+        'nextcloud.hook')
+sha256sums=('158f7bc66f2ce5ef8f197d4e76053ecc94fd896e9f19fb91f996e8be304542af'
+            'SKIP'
+            '55b892adb86a67c2fa12d79f0980c6aea75aed5c6f6f78f2c2b5e5575a012067'
+            'd084cd6423c03f98087884b3c7b81f9510d1bea6c518860b64787a7f976cf0d3')
 
-options=(!strip emptydirs)
+package() {
+    # install project
+    install -d "$pkgdir"/usr/share/webapps/
+    cp -R "$srcdir"/${srcname} "$pkgdir"/usr/share/webapps/.
 
-#prepare() {
-#  cd nextcloud-${pkgver}
-#}
+    # install apache config file
+    install -d  "$pkgdir"/etc/webapps/${srcname}
+    install -m 644 "$srcdir"/apache.example.conf  "$pkgdir"/etc/webapps/${srcname}
 
-package() {
-  #install -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  #cp "${srcdir}/nextcloud/COPYING-AGPL" "${pkgdir}/usr/share/licenses/${pkgname}"
+    # move config to /etc
+    install -d  "$pkgdir"/etc/webapps/${srcname}
+    mv "$pkgdir"/usr/share/webapps/${srcname}/config "$pkgdir"/etc/webapps/${srcname}/config
+    chown -R http:http "$pkgdir"/etc/webapps/${srcname}
+    ln -s /etc/webapps/${srcname}/config "$pkgdir"/usr/share/webapps/${srcname}/config
+    chown -R root:http "$pkgdir"/usr/share/webapps/${srcname}
 
-  install -d "${pkgdir}/usr/share/webapps"
-  cp -r nextcloud "${pkgdir}/usr/share/webapps/."
+    find "$pkgdir"/usr/share/webapps/${srcname} -type f -exec chmod 0644 {} \;
+    find "$pkgdir"/usr/share/webapps/${srcname} -type d -exec chmod 0755 {} \;
 
-  # set the proper permissions
-  "${srcdir}/set-nc-perms.sh" runtime "${pkgdir}/usr/share/webapps/nextcloud"
+    chmod a+x "$pkgdir"/usr/share/webapps/${srcname}/occ
 
-  install -D -m755 "${srcdir}/set-nc-perms.sh" "${pkgdir}/usr/bin/set-nc-perms"
-  install -m644 -D "${srcdir}/apache.example.conf" -t "${pkgdir}/etc/webapps/nextcloud"
-  ln -s /usr/share/webapps/nextcloud/occ "${pkgdir}/usr/bin/occ"
+#    install -Dm0644 "$srcdir"/nextcloud.hook "$pkgdir"/usr/share/libalpm/hooks/nextcloud.hook
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/apache.example.conf b/apache.example.conf
index 84f452ac274c..306dd5c6f949 100644
--- a/apache.example.conf
+++ b/apache.example.conf
@@ -1,15 +1,18 @@
-Alias /nextcloud "/usr/share/webapps/nextcloud"
+<IfModule mod_alias.c>
+    Alias /nextcloud /usr/share/webapps/nextcloud/
+</IfModule>
 
 <Directory /usr/share/webapps/nextcloud/>
-  Options +FollowSymlinks
-  AllowOverride All
-  Require all granted
-
- <IfModule mod_dav.c>
-  Dav off
- </IfModule>
-
- SetEnv HOME /usr/share/webapps/nextcloud
- SetEnv HTTP_HOME /usr/share/webapps/nextcloud
-
+    Options FollowSymlinks
+    AllowOverride all
+    Require all granted
+    php_admin_value open_basedir "/srv/http/:/dev/urandom:/tmp/:/usr/share/pear/:/usr/share/webapps/nextcloud/:/etc/webapps/nextcloud"
 </Directory>
+
+<VirtualHost *:80>
+    ServerAdmin foo@foofarm.com
+    DocumentRoot /usr/share/webapps/nextcloud
+    ServerName nextcloud.foo.com
+    ErrorLog /var/log/httpd/nextcloud.foo.info-error_log
+    CustomLog /var/log/httpd/nextcloud.foo.info-access_log common
+</VirtualHost>
diff --git a/nextcloud.hook b/nextcloud.hook
new file mode 100644
index 000000000000..0d02056688bb
--- /dev/null
+++ b/nextcloud.hook
@@ -0,0 +1,13 @@
+# Update Nextcloud when core or -apps are touched
+
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Type = Package
+Target = nextcloud
+Target = nextcloud-app-*
+
+[Action]
+Description = Updating Nextcloud installation
+When = PostTransaction
+Exec = /usr/bin/runuser -u http -- /usr/bin/php /usr/share/webapps/nextcloud/occ upgrade
diff --git a/set-nc-perms.sh b/set-nc-perms.sh
deleted file mode 100755
index 6985d116f8dd..000000000000
--- a/set-nc-perms.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-# from https://docs.nextcloud.org/server/9/admin_manual/installation/installation_wizard.html#strong-perms-label
-# run with the argument "runtime" to set the proper runtime permissions
-# run with the argument "upgrade" to set the proper upgrade permissions
-
-if [ -z "$2" ]
- then
-  ncpath='/usr/share/webapps/nextcloud'
- else
-  ncpath="$2"
-fi
-
-htuser='http'
-htgroup='http'
-rootuser='root'
-
-runtime() {
-  printf "Creating possible missing Directories\n"
-  mkdir -p $ncpath/data
-  mkdir -p $ncpath/assets
-  mkdir -p $ncpath/updater
-
-  printf "chmod Files and Directories\n"
-  find ${ncpath}/ -type f -print0 | xargs -0 chmod 0640
-  find ${ncpath}/ -type d -print0 | xargs -0 chmod 0750
-
-  printf "chown Directories\n"
-  chown -R ${rootuser}:${htgroup} ${ncpath}/
-  chown -R ${htuser}:${htgroup} ${ncpath}/apps/
-  chown -R ${htuser}:${htgroup} ${ncpath}/assets/
-  chown -R ${htuser}:${htgroup} ${ncpath}/config/
-  chown -R ${htuser}:${htgroup} ${ncpath}/data/
-  chown -R ${htuser}:${htgroup} ${ncpath}/themes/
-  chown -R ${htuser}:${htgroup} ${ncpath}/updater/
-
-  chmod +x ${ncpath}/occ
-
-  printf "chmod/chown .htaccess\n"
-  if [ -f ${ncpath}/.htaccess ]
-   then
-    chmod 0664 ${ncpath}/.htaccess
-    chown ${rootuser}:${htgroup} ${ncpath}/.htaccess
-  fi
-  if [ -f ${ncpath}/data/.htaccess ]
-   then
-    chmod 0664 ${ncpath}/data/.htaccess
-    chown ${rootuser}:${htgroup} ${ncpath}/data/.htaccess
-  fi
-
-  printf "chmod/chown .user.ini\n"
-  if [ -f ${ncpath}/.user.ini ]
-   then
-    chmod 0664 ${ncpath}/.user.ini
-    chown ${rootuser}:${htgroup} ${ncpath}/.htaccess
-  fi
-}
-
-upgrade() {
-  printf "Setting upgrade permissions\n"
-  chown -R ${htuser}:${htgroup} ${ncpath}
-}
-
-$1