diff --git a/Dockerfile b/Dockerfile index e1612af..dcad0d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG UPSTREAM=2.2.27 +ARG UPSTREAM=2.2.31 FROM analogic/poste.io:$UPSTREAM RUN apt-get update && apt-get install less # 'less' is Useful for debugging diff --git a/files/patches b/files/patches index af5b1d9..36020f8 100755 --- a/files/patches +++ b/files/patches @@ -29,11 +29,11 @@ __sedline() { sed+="${*/#/\\$'\n'}"; } shopt -q expand_aliases||{ unalias -a;shopt -s expand_aliases;};builtin alias +='{ ::__;::(){ ((!$#))||{ shift;"${__dsl__[@]-::no-dsl}" ' ~='{ ::__;::(){ ((!$#))||{ shift; ' -='"${__dsl__[@]-::no-dsl}" ' '{{=return;return;};__blk__=;set -- "${__blarg__[@]:1}"; ' '}}=};__:: 0 "$@";}';::block(){ ((!$#))||local __dsl__=("$@");${__blk__:+::};};__bsp__=0;::__(){ __bstk__[__bsp__++]="${__blk__:+__blk__=1;$(declare -f ::)}";};__::(){ local __blarg__=("$@");__blk__=1;:: "$@"||set -- $?;__blk__=;local REPLY;${__bstk__[--__bsp__]:+eval "${__bstk__[__bsp__]}"}||:;return $1;} -# === Log rotation bug fix === +# === Upstream bug fixes === -~ edit /etc/logrotate.d/roundcube; {{ - # Don't recursively rotate the rotated logs - - sub "/opt/www/webmail/logs/\\* " "/opt/www/webmail/logs/*.log " +~ edit opt/admin/src/AppBundle/Resources/views/Box/edit.html.twig; {{ + # Fix typo + - sub "refereneId" "referenceId" }}