aboutsummaryrefslogtreecommitdiffstats
path: root/community/nextcloud
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-06-26 19:41:04 +0200
committerJakub Jirutka <jakub@jirutka.cz>2017-06-26 19:42:08 +0200
commita97de659129807997c8e6a918001287dd4ce6530 (patch)
tree4d47ad3e0723251cfe40df872228660215ea5067 /community/nextcloud
parentf3fd1ae27b69781108de74dea9311ca7bbe46584 (diff)
downloadaports-a97de659129807997c8e6a918001287dd4ce6530.tar.bz2
aports-a97de659129807997c8e6a918001287dd4ce6530.tar.xz
community/nextcloud: fix error in user_ldap w/ iconv ASCII//TRANSLIT
Diffstat (limited to 'community/nextcloud')
-rw-r--r--community/nextcloud/APKBUILD4
-rw-r--r--community/nextcloud/iconv-ascii-translit-not-supported.patch13
2 files changed, 16 insertions, 1 deletions
diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD
index ee1f3a9c4d..303745a093 100644
--- a/community/nextcloud/APKBUILD
+++ b/community/nextcloud/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=nextcloud
pkgver=12.0.0
-pkgrel=4
+pkgrel=5
pkgdesc="A safe home for all your data"
url="http://nextcloud.com"
arch="noarch"
@@ -20,6 +20,7 @@ source="https://download.nextcloud.com/server/releases/$pkgname-$pkgver.zip
dont-update-htaccess.patch
disable-integrity-check-as-default.patch
app-encryption-info-add-mcrypt.patch
+ iconv-ascii-translit-not-supported.patch
$pkgname-config.php
$pkgname.logrotate
$pkgname.confd
@@ -199,6 +200,7 @@ a12a73a38bc009d3307ce97bb32fc62ac93e125a77a3d36b31c9d2212953fa17bd5c31f819e0759a
ec3921d4d463ed82be0be073af8064048a20f638424d1d39ab46db4252036e87ef2614570be91a5cef0c25c6bcaaf1a2725d2468bdb4a0fbee2b504a4dd0fbc8 dont-update-htaccess.patch
04783385ca35be9e8b895e91294b082cd2a1f50c4e17dc195901885ecd421db9a6fe45360d7eac623873ae4efad80b92f31ebde59f4ed76d832c8cac450dac85 disable-integrity-check-as-default.patch
8d3cb1436aa79f1ac0a7b4b3370fcfb5c50dbe811e631cabcb8170fb80da5967a88a15bc39cd04eaccffb3177bdf90fcba2a512e28e034e16d6bc9b445d2d137 app-encryption-info-add-mcrypt.patch
+9bd1cdb73928d8e746286a8ededf79262835caee8fdb4a18e117535ed95784b5a0b04fad55c720084dd8ae1ed4fe123be55b41d3100c9bb0333af485084bc4b1 iconv-ascii-translit-not-supported.patch
89c941e2719629ee633421c4c75b55026c1a0a6b255e7f1f2c14612c10325045051b16dc5f17975af4a2a34ec187008de2eb15a53ac4cd06d26a5cbbd79fb73a nextcloud-config.php
f224d72799ee5819979089eb58978225454223bee597c938681a4f6279eb49297fe9250ac54ccf8bcb33ae262bce43d085affb77723492ee662263710d4008c9 nextcloud.logrotate
35cf156839215113b5d8fb8842b4c1e19a50be3c16be7048879fdd808674e4875dbacf3e2dd884fd182258595b7a137d7d3c2dc602a7ff5613c8b65fae0abe67 nextcloud.confd
diff --git a/community/nextcloud/iconv-ascii-translit-not-supported.patch b/community/nextcloud/iconv-ascii-translit-not-supported.patch
new file mode 100644
index 0000000000..8c0825d4fe
--- /dev/null
+++ b/community/nextcloud/iconv-ascii-translit-not-supported.patch
@@ -0,0 +1,13 @@
+iconv on Alpine does not support conversion to ASCII//TRANSLIT
+
+--- a/apps/user_ldap/lib/Access.php
++++ b/apps/user_ldap/lib/Access.php
+@@ -1200,7 +1200,7 @@
+
+ // Transliteration
+ // latin characters to ASCII
+- $name = iconv('UTF-8', 'ASCII//TRANSLIT', $name);
++ $name = iconv('UTF-8', 'ASCII', $name);
+
+ // Replacements
+ $name = str_replace(' ', '_', $name);