From 2a7b6885f21daafb4627cd38ccd80c35ab4c9c20 Mon Sep 17 00:00:00 2001
From: Wonderfall <wonderfall@schrodinger.io>
Date: Wed, 15 Feb 2017 17:59:45 +0100
Subject: [PATCH] nextcloud: update gnu libiconv
---
nextcloud/11.0/Dockerfile | 4 +---
nextcloud/daily/Dockerfile | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/nextcloud/11.0/Dockerfile b/nextcloud/11.0/Dockerfile
index d4ea475..9fe4817 100644
--- a/nextcloud/11.0/Dockerfile
+++ b/nextcloud/11.0/Dockerfile
@@ -1,7 +1,7 @@
FROM alpine:edge
ARG NEXTCLOUD_VERSION=11.0.1
-ARG GNU_LIBICONV_VERSION=1.14
+ARG GNU_LIBICONV_VERSION=1.15
ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A"
ENV UID=991 GID=991 \
@@ -70,8 +70,6 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk
&& cd /tmp && wget -q http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${GNU_LIBICONV_VERSION}.tar.gz \
&& tar xzf libiconv-${GNU_LIBICONV_VERSION}.tar.gz && cd libiconv-${GNU_LIBICONV_VERSION} \
&& ./configure --prefix=/usr/local \
- && wget -q https://raw.githubusercontent.com/mxe/mxe/7e231efd245996b886b501dad780761205ecf376/src/libiconv-1-fixes.patch \
- && patch -p1 -u < libiconv-1-fixes.patch \
&& make && make install && libtool --finish /usr/local/lib && cd /tmp \
&& wget -q http://is1.php.net/get/php-7.1.1.tar.gz/from/this/mirror -O php7.1.tar.gz \
&& tar xzf php7.1.tar.gz && cd /tmp/php-7.1.1/ext/iconv && phpize7.1 \
diff --git a/nextcloud/daily/Dockerfile b/nextcloud/daily/Dockerfile
index 4bc7b38..3d7c475 100644
--- a/nextcloud/daily/Dockerfile
+++ b/nextcloud/daily/Dockerfile
@@ -1,6 +1,6 @@
FROM alpine:edge
-ARG GNU_LIBICONV_VERSION=1.14
+ARG GNU_LIBICONV_VERSION=1.15
ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A"
ENV UID=991 GID=991 \
@@ -69,8 +69,6 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk
&& cd /tmp && wget -q http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${GNU_LIBICONV_VERSION}.tar.gz \
&& tar xzf libiconv-${GNU_LIBICONV_VERSION}.tar.gz && cd libiconv-${GNU_LIBICONV_VERSION} \
&& ./configure --prefix=/usr/local \
- && wget -q https://raw.githubusercontent.com/mxe/mxe/7e231efd245996b886b501dad780761205ecf376/src/libiconv-1-fixes.patch \
- && patch -p1 -u < libiconv-1-fixes.patch \
&& make && make install && libtool --finish /usr/local/lib && cd /tmp \
&& wget -q http://is1.php.net/get/php-7.1.1.tar.gz/from/this/mirror -O php7.1.tar.gz \
&& tar xzf php7.1.tar.gz && cd /tmp/php-7.1.1/ext/iconv && phpize7.1 \