summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Georgievski2018-12-11 14:48:22 +0100
committerDamjan Georgievski2018-12-11 14:48:22 +0100
commite72ac9d4abfcbf8e464e1d859836ab2a7aab245e (patch)
tree4f276f0728d2c87e22ec44cf34a71e8aa2de5771
parent3ed14d88e24eea234630f7a52244ebc7a72eb787 (diff)
downloadaur-e72ac9d4abfcbf8e464e1d859836ab2a7aab245e.tar.gz
bump to 2.0.3, nextcloud 15.0 support
added a patch to make it work on php-7.3
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD15
-rw-r--r--php-7.3.patch13
3 files changed, 30 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1909038ca8ea..7b83163ecc6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
pkgbase = nextcloud-app-u2f
pkgdesc = Two factor U2F provider for Nextcloud
- pkgver = 1.6.1
+ pkgver = 2.0.3
pkgrel = 1
url = https://github.com/nextcloud/twofactor_u2f
arch = any
license = AGPL
- depends = nextcloud
+ depends = nextcloud>=15.0
options = !strip
- source = twofactor_u2f-1.6.1.tar.gz::https://github.com/nextcloud/twofactor_u2f/releases/download/v1.6.1/twofactor_u2f.tar.gz
- sha256sums = e6a22a114d2413a179eadae9588bcfa378dffde8c845f2fb33ec200c1c482898
+ source = twofactor_u2f-2.0.3.tar.gz::https://github.com/nextcloud/twofactor_u2f/releases/download/v2.0.3/twofactor_u2f.tar.gz
+ source = php-7.3.patch
+ sha256sums = f689fef20d233b8154a2fb066dd164ec1420b047f37452339fd022088e9cfe9a
+ sha256sums = c436e94fff898040896d40e46abf5091d3f9e0b6e289c19fbb47c80418ba7d79
pkgname = nextcloud-app-u2f
diff --git a/PKGBUILD b/PKGBUILD
index 855098ffc336..296c80a33067 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,27 @@
pkgname=nextcloud-app-u2f
_releasename=twofactor_u2f
-pkgver=1.6.1
+pkgver=2.0.3
pkgrel=1
pkgdesc="Two factor U2F provider for Nextcloud"
arch=('any')
url="https://github.com/nextcloud/twofactor_u2f"
license=('AGPL')
-depends=('nextcloud')
+depends=('nextcloud>=15.0')
makedepends=()
options=('!strip')
-source=("${_releasename}-${pkgver}.tar.gz"::"${url}/releases/download/v${pkgver}/${_releasename}.tar.gz")
+source=("${_releasename}-${pkgver}.tar.gz"::"${url}/releases/download/v${pkgver}/${_releasename}.tar.gz"
+ 'php-7.3.patch')
+
+build() {
+ cd "$srcdir/${_releasename}"
+ patch -p1 -i "$srcdir/php-7.3.patch"
+}
package() {
install -d --owner=root --group=root $pkgdir/usr/share/webapps/nextcloud/apps/
cp -r --target-directory=$pkgdir/usr/share/webapps/nextcloud/apps/ $srcdir/$_releasename
}
-sha256sums=('e6a22a114d2413a179eadae9588bcfa378dffde8c845f2fb33ec200c1c482898')
+sha256sums=('f689fef20d233b8154a2fb066dd164ec1420b047f37452339fd022088e9cfe9a'
+ 'c436e94fff898040896d40e46abf5091d3f9e0b6e289c19fbb47c80418ba7d79')
diff --git a/php-7.3.patch b/php-7.3.patch
new file mode 100644
index 000000000000..1f925026950a
--- /dev/null
+++ b/php-7.3.patch
@@ -0,0 +1,13 @@
+diff --git a/appinfo/info.xml b/appinfo/info.xml
+index 00b6ffc..7dedede 100644
+--- a/appinfo/info.xml
++++ b/appinfo/info.xml
+@@ -17,7 +17,7 @@
+ <screenshot>https://raw.githubusercontent.com/nextcloud/twofactor_u2f/4e0542d888236b7f212bed0b536244d08803466f/screenshots/settings.png</screenshot>
+
+ <dependencies>
+- <php min-version="7.0" max-version="7.2"></php>
++ <php min-version="7.0" max-version="7.3"></php>
+ <nextcloud min-version="15" max-version="15" />
+ </dependencies>
+