summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrey Christoforo2016-05-01 17:02:38 +0100
committerGrey Christoforo2016-05-01 17:02:38 +0100
commit3f2ca2132482ee46a69e48951f879edf015b8d4b (patch)
tree6757946454ff18deb3caaa6474cb5652218866ec
parent1a7066cbc2aa3006faa5eb064495aee72354cf1e (diff)
downloadaur-3f2ca2132482ee46a69e48951f879edf015b8d4b.tar.gz
quickfix for https://github.com/owncloud/core/issues/24364
-rw-r--r--.SRCINFO6
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD24
3 files changed, 21 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f8942a858e0c..a02d094730ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun May 1 14:29:53 UTC 2016
+# Sun May 1 16:01:57 UTC 2016
pkgbase = owncloud-archive
pkgdesc = ownCloud server release, installed from the official .tar.bz2 archive
pkgver = 9.0.1
- pkgrel = 2
+ pkgrel = 3
url = https://owncloud.org
install = owncloud-archive.install
arch = any
@@ -29,10 +29,12 @@ pkgbase = owncloud-archive
backup = etc/webapps/owncloud/apache.example.conf
source = https://download.owncloud.org/community/owncloud-9.0.1.tar.bz2
source = https://download.owncloud.org/community/owncloud-9.0.1.tar.bz2.asc
+ source = https://github.com/owncloud/core/commit/238dbe9252e50ce38449045a8c2e8115a082bd1a.patch
source = apache.example.conf
source = set-oc-perms.sh
md5sums = 1ce7ad9f4970b0cd64a23af0bbe280d9
md5sums = SKIP
+ md5sums = 5df895f9b5771f623a0033c28a5dc446
md5sums = bf523e475fd8cf1e2048018952da5c34
md5sums = 30333bf6beb39b5048fcb85c74e690c0
diff --git a/.gitignore b/.gitignore
index a144999fcb82..dae0ea37f7bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*.tar.bz2
*.asc
*.pkg.tar.xz
+*.patch
pkg/
src/
diff --git a/PKGBUILD b/PKGBUILD
index 11a6d35db346..59314c902e7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=owncloud-archive
pkgver=9.0.1
-pkgrel=2
+pkgrel=3
pkgdesc="ownCloud server release, installed from the official .tar.bz2 archive"
url="https://owncloud.org"
arch=('any')
@@ -26,25 +26,33 @@ options=('!strip')
backup=('etc/webapps/owncloud/apache.example.conf')
install=${pkgname}.install
validpgpkeys=('E3036906AD9F30807351FAC32D5D5E97F6978A26')
-source=("https://download.owncloud.org/community/owncloud-${pkgver}.tar.bz2"{,.asc} "apache.example.conf" "set-oc-perms.sh")
+source=("https://download.owncloud.org/community/owncloud-${pkgver}.tar.bz2"{,.asc}
+ "https://github.com/owncloud/core/commit/238dbe9252e50ce38449045a8c2e8115a082bd1a.patch"
+ "apache.example.conf"
+ "set-oc-perms.sh")
md5sums=('1ce7ad9f4970b0cd64a23af0bbe280d9'
'SKIP'
+ '5df895f9b5771f623a0033c28a5dc446'
'bf523e475fd8cf1e2048018952da5c34'
'30333bf6beb39b5048fcb85c74e690c0')
options=(!strip emptydirs)
+prepare() {
+ cd "${srcdir}/owncloud"
+ patch -p5 lib/private/appframework/http/request.php < "$srcdir/238dbe9252e50ce38449045a8c2e8115a082bd1a.patch"
+}
+
package() {
- install -d ${pkgdir}/usr/share/licenses/${pkgname}
- cp ${srcdir}/owncloud/COPYING-* ${pkgdir}/usr/share/licenses/${pkgname}
+ install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ cp "${srcdir}"/owncloud/COPYING-* "${pkgdir}/usr/share/licenses/${pkgname}"
mkdir -p "${pkgdir}/usr/share/webapps"
cp -a owncloud "${pkgdir}/usr/share/webapps/."
- install -D -m755 ${srcdir}/set-oc-perms.sh "${pkgdir}/usr/bin/set-oc-perms"
- install -m644 -D ${srcdir}/apache.example.conf -t ${pkgdir}/etc/webapps/owncloud
- mkdir -p ${pkgdir}/usr/bin
- ln -s /usr/share/webapps/owncloud/occ ${pkgdir}/usr/bin/occ
+ install -D -m755 "${srcdir}/set-oc-perms.sh" "${pkgdir}/usr/bin/set-oc-perms"
+ install -m644 -D "${srcdir}/apache.example.conf" -t "${pkgdir}/etc/webapps/owncloud"
+ ln -s /usr/share/webapps/owncloud/occ "${pkgdir}/usr/bin/occ"
}
# vim:set ts=2 sw=2 et: