aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2018-05-02 12:31:49 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2018-05-02 12:32:51 +0000
commitb65383182b087d278de4850917e1037abef8acb1 (patch)
tree7ab81e49f1fdb05e78db149815c6861943c7dd4e
parent952b59f9e08c6ee9af241bf1eae831d612930459 (diff)
downloadaports-b65383182b087d278de4850917e1037abef8acb1.tar.bz2
aports-b65383182b087d278de4850917e1037abef8acb1.tar.xz
community/nextcloud: remove local _pkgver which was used in source for RC releases
-rw-r--r--community/nextcloud/APKBUILD10
-rw-r--r--community/nextcloud/iconv-ascii-translit-not-supported.patch18
-rw-r--r--main/ulogd/musl-fixes.patch10
3 files changed, 12 insertions, 26 deletions
diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD
index 3ed741b3bd..788a91a68f 100644
--- a/community/nextcloud/APKBUILD
+++ b/community/nextcloud/APKBUILD
@@ -1,9 +1,8 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=nextcloud
-_pkgver="13.0.0"
pkgver=13.0.2
-pkgrel=0
+pkgrel=1
pkgdesc="A safe home for all your data"
url="http://nextcloud.com"
arch="noarch"
@@ -21,8 +20,7 @@ install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade
$pkgname-initscript.post-install"
subpackages="$pkgname-doc $pkgname-initscript $pkgname-mysql $pkgname-pgsql $pkgname-sqlite
$pkgname-default-apps:_default_apps"
-# source="https://download.nextcloud.com/server/releases/$pkgname-$pkgver.zip
-source="https://download.nextcloud.com/server/prereleases/nextcloud-$_pkgver.zip
+source="https://download.nextcloud.com/server/releases/$pkgname-$pkgver.zip
nextcloud10-dont-chmod.patch
dont-update-htaccess.patch
disable-integrity-check-as-default.patch
@@ -225,12 +223,12 @@ _package_app() {
mv "$pkgdir"/$_appsdir/$appname "$subpkgdir"/$_appsdir/
}
-sha512sums="b1ce432ecbfe6418fcb91554839d04346d83473a905fe776cffd397ecea657555313c6ab7022ba869178a0fd4f0ef1d8928c17ab6adc487dc03032b9cfc9860a nextcloud-13.0.0.zip
+sha512sums="1a06223feca4c2bd35a875eeba29d9a0b3005a8a80543e3488addfe7561136e149cfd087d2e21bbb0017cc669439933623d661c1bad24429b9f488a65bcd8fb6 nextcloud-13.0.2.zip
9c20237c4952ff543171768160c17c3608cc43ad9592fecccaeb337787d566f039f27f30f118359dfff7db58cd12d811c05be15e5994efee57a9ed75787d71f5 nextcloud10-dont-chmod.patch
aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731 dont-update-htaccess.patch
04783385ca35be9e8b895e91294b082cd2a1f50c4e17dc195901885ecd421db9a6fe45360d7eac623873ae4efad80b92f31ebde59f4ed76d832c8cac450dac85 disable-integrity-check-as-default.patch
d6f951cbcb7ca48beb88d77e02a8669677e87bc32189b1eb7e63edc29c293bd6e1ee471c37b622e6b38fd2baf6cf198c872f92b256ffab17c92c31a3a05b5aa0 app-encryption-info-add-mcrypt.patch
-9bd1cdb73928d8e746286a8ededf79262835caee8fdb4a18e117535ed95784b5a0b04fad55c720084dd8ae1ed4fe123be55b41d3100c9bb0333af485084bc4b1 iconv-ascii-translit-not-supported.patch
+7d60ba2f1c012b0a1cded30f757b7ec0efe7fc4bfa7b5c6879f35eb80711ac1d5e6c894356346222a0de68b0808c99bac358aaae1c69124a855da2a98cdff6ec iconv-ascii-translit-not-supported.patch
478f5cd7c5d30380ea619d3e8ec623217a06a09b27534266f00297545c7d276b068c5d984673eebc5676e8bac7f45112549498944ce3fa678ac8a69541d7c430 use-external-docs-if-local-not-avail.patch
89c941e2719629ee633421c4c75b55026c1a0a6b255e7f1f2c14612c10325045051b16dc5f17975af4a2a34ec187008de2eb15a53ac4cd06d26a5cbbd79fb73a nextcloud-config.php
f224d72799ee5819979089eb58978225454223bee597c938681a4f6279eb49297fe9250ac54ccf8bcb33ae262bce43d085affb77723492ee662263710d4008c9 nextcloud.logrotate
diff --git a/community/nextcloud/iconv-ascii-translit-not-supported.patch b/community/nextcloud/iconv-ascii-translit-not-supported.patch
index 8c0825d4fe..f599a1b020 100644
--- a/community/nextcloud/iconv-ascii-translit-not-supported.patch
+++ b/community/nextcloud/iconv-ascii-translit-not-supported.patch
@@ -1,13 +1,11 @@
-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 @@
+@@ -1318,7 +1318,7 @@
+ }
- // Transliteration
- // latin characters to ASCII
-- $name = iconv('UTF-8', 'ASCII//TRANSLIT', $name);
-+ $name = iconv('UTF-8', 'ASCII', $name);
-
- // Replacements
- $name = str_replace(' ', '_', $name);
+ // Transliteration to ASCII
+- $transliterated = @iconv('UTF-8', 'ASCII//TRANSLIT', $name);
++ $transliterated = @iconv('UTF-8', 'ASCII', $name);
+ if($transliterated !== false) {
+ // depending on system config iconv can work or not
+ $name = $transliterated;
diff --git a/main/ulogd/musl-fixes.patch b/main/ulogd/musl-fixes.patch
index 1b23de7dfe..70b4ada97f 100644
--- a/main/ulogd/musl-fixes.patch
+++ b/main/ulogd/musl-fixes.patch
@@ -1,13 +1,3 @@
---- ulogd-2.0.3.orig/filter/raw2packet/ulogd_raw2packet_BASE.c
-+++ ulogd-2.0.3/filter/raw2packet/ulogd_raw2packet_BASE.c
-@@ -43,6 +43,7 @@
- #include <ulogd/ipfix_protocol.h>
- #include <netinet/if_ether.h>
- #include <string.h>
-+#include <linux/types.h>
-
- enum input_keys {
- INKEY_RAW_PCKT,
--- ulogd-2.0.3.orig/src/ulogd.c
+++ ulogd-2.0.3/src/ulogd.c
@@ -78,12 +78,12 @@