From 47bd77c5ca01255b3cdb3700a4d5211e8937e483 Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Mon, 25 Jul 2016 11:36:10 +0000 Subject: main/nextcloud: move to main --- main/nextcloud/APKBUILD | 176 ++++++++++++++++++++++ main/nextcloud/nextcloud-9-disable-chmod.patch | 12 ++ main/nextcloud/nextcloud-config.php | 4 + testing/nextcloud/APKBUILD | 176 ---------------------- testing/nextcloud/nextcloud-9-disable-chmod.patch | 12 -- testing/nextcloud/nextcloud-config.php | 4 - 6 files changed, 192 insertions(+), 192 deletions(-) create mode 100644 main/nextcloud/APKBUILD create mode 100644 main/nextcloud/nextcloud-9-disable-chmod.patch create mode 100644 main/nextcloud/nextcloud-config.php delete mode 100644 testing/nextcloud/APKBUILD delete mode 100644 testing/nextcloud/nextcloud-9-disable-chmod.patch delete mode 100644 testing/nextcloud/nextcloud-config.php diff --git a/main/nextcloud/APKBUILD b/main/nextcloud/APKBUILD new file mode 100644 index 0000000000..74319915c3 --- /dev/null +++ b/main/nextcloud/APKBUILD @@ -0,0 +1,176 @@ +# Maintainer: Leonardo Arena +pkgname=nextcloud +pkgver="9.0.52" +pkgrel=0 +pkgdesc="A safe home for all your data" +url="http://nextcloud.com" +arch="noarch" +license="AGPL" +_php=php5 +depends="$_php ${_php}-ctype ${_php}-curl ${_php}-dom ${_php}-gd ${_php}-iconv + ${_php}-json ${_php}-openssl ${_php}-xml ${_php}-xmlreader + ${_php}-zlib ${_php}-zip + " +depends_dev= +makedepends="$depends_dev" +install= +subpackages="$pkgname-doc $pkgname-activity $pkgname-firstrunwizard $pkgname-gallery + $pkgname-mysql $pkgname-notifications $pkgname-pdfviewer $pkgname-pgsql + $pkgname-sqlite $pkgname-templateeditor $pkgname-texteditor + $pkgname-videoplayer" + +source="https://download.nextcloud.com/server/releases/$pkgname-$pkgver.zip + + nextcloud-9-disable-chmod.patch + " +pkggroups="www-data" + +#_builddir="$srcdir"/core-$pkgver +_builddir="$srcdir"/$pkgname + +_ncbasedir="/var/lib/$pkgname" +_ncdatadir="$_ncbasedir/data" +_ncwwwdir="/usr/share/webapps/$pkgname" +_ncappsdir="$_ncbasedir/apps" +_ncconfdir="/etc/$pkgname" + + +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg "Applying patch $i"; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + return 0 +} + +package() { + cd "$_builddir" + for dir in ${_ncconfdir} ${_ncdatadir} ${_ncwwwdir}; do + mkdir -p "$pkgdir"$dir || return 1 + done + rm -rf config data + mv * "$pkgdir"${_ncwwwdir} || return 1 + chmod +x "$pkgdir"${_ncwwwdir}/occ || return 1 + ln -s $_ncconfdir "$pkgdir"${_ncwwwdir}/config || return 1 + install -m664 .htaccess "$pkgdir"${_ncwwwdir}/.htaccess || return 1 + install -m664 ../../${pkgname}-config.php "$pkgdir"/etc/$pkgname/config.php || return 1 + mv "$pkgdir"$_ncwwwdir/apps "$pkgdir"$_ncbasedir || return 1 + ln -s $_ncappsdir "$pkgdir"$_ncwwwdir/apps || return 1 + for dir in ${_ncconfdir} ${_ncdatadir} ${_ncappsdir}; do + chown -R :www-data "$pkgdir"$dir || return 1 + chmod -R 770 "$pkgdir"$dir || return 1 + done +} + +doc() { + arch="noarch" + pkgdesc="Nextcloud documentation" + depends="nextcloud" + mkdir -p "$subpkgdir"/usr/share/doc/nextcloud/core + mv "$pkgdir"/usr/share/webapps/nextcloud/core/doc \ + "$subpkgdir"/usr/share/doc/nextcloud/core +} + +pgsql() { + arch="noarch" + pkgdesc="Nextcloud PostgreSQL support" + depends="nextcloud ${_php}-pgsql ${_php}-pdo_pgsql ${_php}-pear-mdb2-driver-pgsql" + mkdir -p "$subpkgdir"${_ncwwwdir} +} + +sqlite() { + arch="noarch" + pkgdesc="Nextcloud SQLite support" + depends="nextcloud ${_php}-sqlite3 ${_php}-pdo_sqlite" + mkdir -p "$subpkgdir"${_ncwwwdir} +} + +mysql() { + arch="noarch" + pkgdesc="Nextcloud MySQL support" + depends="nextcloud ${_php}-mysql ${_php}-pdo_mysql ${_php}-pear-mdb2-driver-mysql" + mkdir -p "$subpkgdir"${_ncwwwdir} +} + +_mv_app() { + mkdir -p "$subpkgdir"${_ncappsdir} || return 1 + if [ "$1" = "pkg" ]; then + mv "$pkgdir"${_ncappsdir}/$2 "$subpkgdir"${_ncappsdir} || return 1 + elif [ "$1" = "src" ]; then + local appname="${subpkgname#$pkgname-}" + mv "$srcdir"/$2 "$subpkgdir"${_ncappsdir}/$appname || return 1 + fi + chown -R :www-data "$subpkgdir"${_ncappsdir} || return 1 + chmod 770 "$subpkgdir"${_ncappsdir} || return 1 +} + +activity() { + arch="noarch" + pkgdesc="Nextcloud Activity app" + depends="$pkgname" + _mv_app pkg activity +} + +firstrunwizard() { + arch="noarch" + pkgdesc="Nextcloud Firstrunwizard app" + depends="$pkgname" + _mv_app pkg firstrunwizard +} + +gallery() { + arch="noarch" + pkgdesc="Nextcloud integrated gallery application" + depends="nextcloud" + _mv_app pkg gallery +} + +notifications() { + arch="noarch" + pkgdesc="Nextcloud Email notification support" + depends="$pkgname" + _mv_app pkg notifications +} + + +templateeditor() { + arch="noarch" + pkgdesc="Nextcloud Email template editor app" + depends="$pkgname" + _mv_app pkg templateeditor +} + +pdfviewer() { + arch="noarch" + pkgdesc="Nextcloud integrated PDF viewer" + depends="nextcloud" + _mv_app pkg files_pdfviewer +} + +texteditor() { + arch="noarch" + pkgdesc="Nextcloud integrated text editor" + depends="nextcloud" + _mv_app pkg files_texteditor +} + +videoplayer() { + arch="noarch" + pkgdesc="Nextcloud integrated video viewer" + depends="nextcloud" + provides="$pkgname-videoviewer" + _mv_app pkg files_videoplayer +} + +md5sums="cbc7b9ea9236f13f6f053fdb957ceec0 nextcloud-9.0.52.zip +5e393c5cbfa0dc9f5d4d35dbdef3b839 nextcloud-9-disable-chmod.patch" +sha256sums="90b55a8dd1462b1c2f0fd0898e743790ae577a442e5b725d3d7c538afbdb1be6 nextcloud-9.0.52.zip +9739810a5f040ff1488559fb17360b65aec94a4024b2f74437785420336d4d72 nextcloud-9-disable-chmod.patch" +sha512sums="ff3033f24df582dec0eff18fbc638a46e33d13bb33613aac103c877bbdf1e7538163715b732b1ac8393777877311f0b784001338b9f936468a6627372b2ef4c4 nextcloud-9.0.52.zip +62f4c4e5f0c23aea98a3cefdd5f08773fc34039ef444d167063f7b1f4640aee48bd108776e6f28f12acec3833f7bcf6b76aaa300c41f5f3fc8fc536c9f6b7586 nextcloud-9-disable-chmod.patch" diff --git a/main/nextcloud/nextcloud-9-disable-chmod.patch b/main/nextcloud/nextcloud-9-disable-chmod.patch new file mode 100644 index 0000000000..bd70391c81 --- /dev/null +++ b/main/nextcloud/nextcloud-9-disable-chmod.patch @@ -0,0 +1,12 @@ +--- a/lib/private/config.php ++++ b/lib/private/config.php +@@ -229,7 +229,8 @@ + $filePointer = fopen($this->configFilePath, 'r+'); + + // Prevent others not to read the config +- chmod($this->configFilePath, 0640); ++ // Alpine Linux Development - don't do package's job ++ // chmod($this->configFilePath, 0640); + + // File does not exist, this can happen when doing a fresh install + if(!is_resource ($filePointer)) { diff --git a/main/nextcloud/nextcloud-config.php b/main/nextcloud/nextcloud-config.php new file mode 100644 index 0000000000..e99829a7cc --- /dev/null +++ b/main/nextcloud/nextcloud-config.php @@ -0,0 +1,4 @@ + '/var/lib/nextcloud/data', +); diff --git a/testing/nextcloud/APKBUILD b/testing/nextcloud/APKBUILD deleted file mode 100644 index 74319915c3..0000000000 --- a/testing/nextcloud/APKBUILD +++ /dev/null @@ -1,176 +0,0 @@ -# Maintainer: Leonardo Arena -pkgname=nextcloud -pkgver="9.0.52" -pkgrel=0 -pkgdesc="A safe home for all your data" -url="http://nextcloud.com" -arch="noarch" -license="AGPL" -_php=php5 -depends="$_php ${_php}-ctype ${_php}-curl ${_php}-dom ${_php}-gd ${_php}-iconv - ${_php}-json ${_php}-openssl ${_php}-xml ${_php}-xmlreader - ${_php}-zlib ${_php}-zip - " -depends_dev= -makedepends="$depends_dev" -install= -subpackages="$pkgname-doc $pkgname-activity $pkgname-firstrunwizard $pkgname-gallery - $pkgname-mysql $pkgname-notifications $pkgname-pdfviewer $pkgname-pgsql - $pkgname-sqlite $pkgname-templateeditor $pkgname-texteditor - $pkgname-videoplayer" - -source="https://download.nextcloud.com/server/releases/$pkgname-$pkgver.zip - - nextcloud-9-disable-chmod.patch - " -pkggroups="www-data" - -#_builddir="$srcdir"/core-$pkgver -_builddir="$srcdir"/$pkgname - -_ncbasedir="/var/lib/$pkgname" -_ncdatadir="$_ncbasedir/data" -_ncwwwdir="/usr/share/webapps/$pkgname" -_ncappsdir="$_ncbasedir/apps" -_ncconfdir="/etc/$pkgname" - - -prepare() { - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg "Applying patch $i"; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - -build() { - cd "$_builddir" - return 0 -} - -package() { - cd "$_builddir" - for dir in ${_ncconfdir} ${_ncdatadir} ${_ncwwwdir}; do - mkdir -p "$pkgdir"$dir || return 1 - done - rm -rf config data - mv * "$pkgdir"${_ncwwwdir} || return 1 - chmod +x "$pkgdir"${_ncwwwdir}/occ || return 1 - ln -s $_ncconfdir "$pkgdir"${_ncwwwdir}/config || return 1 - install -m664 .htaccess "$pkgdir"${_ncwwwdir}/.htaccess || return 1 - install -m664 ../../${pkgname}-config.php "$pkgdir"/etc/$pkgname/config.php || return 1 - mv "$pkgdir"$_ncwwwdir/apps "$pkgdir"$_ncbasedir || return 1 - ln -s $_ncappsdir "$pkgdir"$_ncwwwdir/apps || return 1 - for dir in ${_ncconfdir} ${_ncdatadir} ${_ncappsdir}; do - chown -R :www-data "$pkgdir"$dir || return 1 - chmod -R 770 "$pkgdir"$dir || return 1 - done -} - -doc() { - arch="noarch" - pkgdesc="Nextcloud documentation" - depends="nextcloud" - mkdir -p "$subpkgdir"/usr/share/doc/nextcloud/core - mv "$pkgdir"/usr/share/webapps/nextcloud/core/doc \ - "$subpkgdir"/usr/share/doc/nextcloud/core -} - -pgsql() { - arch="noarch" - pkgdesc="Nextcloud PostgreSQL support" - depends="nextcloud ${_php}-pgsql ${_php}-pdo_pgsql ${_php}-pear-mdb2-driver-pgsql" - mkdir -p "$subpkgdir"${_ncwwwdir} -} - -sqlite() { - arch="noarch" - pkgdesc="Nextcloud SQLite support" - depends="nextcloud ${_php}-sqlite3 ${_php}-pdo_sqlite" - mkdir -p "$subpkgdir"${_ncwwwdir} -} - -mysql() { - arch="noarch" - pkgdesc="Nextcloud MySQL support" - depends="nextcloud ${_php}-mysql ${_php}-pdo_mysql ${_php}-pear-mdb2-driver-mysql" - mkdir -p "$subpkgdir"${_ncwwwdir} -} - -_mv_app() { - mkdir -p "$subpkgdir"${_ncappsdir} || return 1 - if [ "$1" = "pkg" ]; then - mv "$pkgdir"${_ncappsdir}/$2 "$subpkgdir"${_ncappsdir} || return 1 - elif [ "$1" = "src" ]; then - local appname="${subpkgname#$pkgname-}" - mv "$srcdir"/$2 "$subpkgdir"${_ncappsdir}/$appname || return 1 - fi - chown -R :www-data "$subpkgdir"${_ncappsdir} || return 1 - chmod 770 "$subpkgdir"${_ncappsdir} || return 1 -} - -activity() { - arch="noarch" - pkgdesc="Nextcloud Activity app" - depends="$pkgname" - _mv_app pkg activity -} - -firstrunwizard() { - arch="noarch" - pkgdesc="Nextcloud Firstrunwizard app" - depends="$pkgname" - _mv_app pkg firstrunwizard -} - -gallery() { - arch="noarch" - pkgdesc="Nextcloud integrated gallery application" - depends="nextcloud" - _mv_app pkg gallery -} - -notifications() { - arch="noarch" - pkgdesc="Nextcloud Email notification support" - depends="$pkgname" - _mv_app pkg notifications -} - - -templateeditor() { - arch="noarch" - pkgdesc="Nextcloud Email template editor app" - depends="$pkgname" - _mv_app pkg templateeditor -} - -pdfviewer() { - arch="noarch" - pkgdesc="Nextcloud integrated PDF viewer" - depends="nextcloud" - _mv_app pkg files_pdfviewer -} - -texteditor() { - arch="noarch" - pkgdesc="Nextcloud integrated text editor" - depends="nextcloud" - _mv_app pkg files_texteditor -} - -videoplayer() { - arch="noarch" - pkgdesc="Nextcloud integrated video viewer" - depends="nextcloud" - provides="$pkgname-videoviewer" - _mv_app pkg files_videoplayer -} - -md5sums="cbc7b9ea9236f13f6f053fdb957ceec0 nextcloud-9.0.52.zip -5e393c5cbfa0dc9f5d4d35dbdef3b839 nextcloud-9-disable-chmod.patch" -sha256sums="90b55a8dd1462b1c2f0fd0898e743790ae577a442e5b725d3d7c538afbdb1be6 nextcloud-9.0.52.zip -9739810a5f040ff1488559fb17360b65aec94a4024b2f74437785420336d4d72 nextcloud-9-disable-chmod.patch" -sha512sums="ff3033f24df582dec0eff18fbc638a46e33d13bb33613aac103c877bbdf1e7538163715b732b1ac8393777877311f0b784001338b9f936468a6627372b2ef4c4 nextcloud-9.0.52.zip -62f4c4e5f0c23aea98a3cefdd5f08773fc34039ef444d167063f7b1f4640aee48bd108776e6f28f12acec3833f7bcf6b76aaa300c41f5f3fc8fc536c9f6b7586 nextcloud-9-disable-chmod.patch" diff --git a/testing/nextcloud/nextcloud-9-disable-chmod.patch b/testing/nextcloud/nextcloud-9-disable-chmod.patch deleted file mode 100644 index bd70391c81..0000000000 --- a/testing/nextcloud/nextcloud-9-disable-chmod.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/lib/private/config.php -+++ b/lib/private/config.php -@@ -229,7 +229,8 @@ - $filePointer = fopen($this->configFilePath, 'r+'); - - // Prevent others not to read the config -- chmod($this->configFilePath, 0640); -+ // Alpine Linux Development - don't do package's job -+ // chmod($this->configFilePath, 0640); - - // File does not exist, this can happen when doing a fresh install - if(!is_resource ($filePointer)) { diff --git a/testing/nextcloud/nextcloud-config.php b/testing/nextcloud/nextcloud-config.php deleted file mode 100644 index e99829a7cc..0000000000 --- a/testing/nextcloud/nextcloud-config.php +++ /dev/null @@ -1,4 +0,0 @@ - '/var/lib/nextcloud/data', -); -- cgit v1.2.3