From 0598867b5915694236cce7e8b95a3db88963bbf8 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Wed, 27 Dec 2017 11:38:43 +0100 Subject: [PATCH] Upgrade to upstream version 2.3.1 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 6 ------ sources/patches/app-01-logout-success-handler.patch | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index b11ac3c..51c3590 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This is a Wallabag v2 package for YunoHost. **NB: Since @jeromelebleu is no longer maintaining this package, I (@lapineige) take over this repository. But I have limited time and experience, so feel free to help !** -**Shipped version:** 2.3.0 +**Shipped version:** 2.3.1 [Wallabag](https://www.wallabag.org/) is a self hostable Read-It-Later application allowing you to not miss any content anymore. Click, save, read it when you can. diff --git a/conf/app.src b/conf/app.src index ed74b9c..336db3b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,3 +1,3 @@ -SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.3.0.tar.gz -SOURCE_SUM=9726b17a3cff73a0f2d7acfa08cb5d4abe8b2b07992f9a763f62868225108c20 +SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.3.1.tar.gz +SOURCE_SUM=c459de5b6752e94ccd4165c75ec11ad3ce7f1cb73c2f2f2f53e89568599467e2 SOURCE_FORMAT=tar.gz diff --git a/manifest.json b/manifest.json index 5cc6858..82e6f46 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "url": "https://www.wallabag.org", "license": "MIT", - "version": "2.3.0", + "version": "2.3.1-1", "maintainer": { "name": "lapineige", "email": "" diff --git a/scripts/_common.sh b/scripts/_common.sh index 2a1cd6e..aa74003 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -36,12 +36,6 @@ QUIET () { # redirect standard output to /dev/null $@ > /dev/null } - -HUMAN_SIZE () { # Transforms a Kb-based size to a human-readable size - human=$(numfmt --to=iec --from-unit=1K $1) - echo $human -} - CHECK_SIZE () { # Check if enough disk space available on backup storage file_to_analyse=$1 backup_size=$(du --summarize "$file_to_analyse" | cut -f1) diff --git a/sources/patches/app-01-logout-success-handler.patch b/sources/patches/app-01-logout-success-handler.patch index 0074cad..166643d 100644 --- a/sources/patches/app-01-logout-success-handler.patch +++ b/sources/patches/app-01-logout-success-handler.patch @@ -15,7 +15,7 @@ diff --git a/app/config/services.yml b/app/config/services.yml index 8a09fde..ee63e06 100644 --- a/app/config/services.yml +++ b/app/config/services.yml -@@ -43,6 +43,9 @@ +@@ -43,6 +43,10 @@ tags: - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }