restic-rest-server: update to 0.12.1

cross/restic-rest-server/Makefile

@@ -1,6 +1,6 @@
 PKG_NAME = restic-rest-server
 PKG_REAL_NAME = rest-server
-PKG_VERS = 0.12.0
+PKG_VERS = 0.12.1
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_REAL_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/restic/rest-server/releases/download/v$(PKG_VERS)

cross/restic-rest-server/digests

@@ -1,3 +1,3 @@
-rest-server-0.12.0.tar.gz SHA1 6df82da0ab99eac9c449d23e60e3c6346e562746
-rest-server-0.12.0.tar.gz SHA256 a808460371c9d2bcf53501432fbf65c5b7e94d43e4c13f31042425c1648bbc8a
-rest-server-0.12.0.tar.gz MD5 21d10c3cb49adc44a914c34d173de921
+rest-server-0.12.1.tar.gz SHA1 50a68154ffebc228bffae7cd06744a9224fdb9b9
+rest-server-0.12.1.tar.gz SHA256 f1b4e4ce581d698847c8a4a354a7fe201b073ebca223abf01898c53d87ccbf31
+rest-server-0.12.1.tar.gz MD5 970aa609b3a2793b82480cc4344881ef

mk/spksrc.service.installer.functions

@@ -119,7 +119,6 @@ install_python_wheels ()
 # already defined variables are not taken from the file (e.g. variables from wizard)
 load_variables_from_file ()
 {
-<<<<<<< HEAD
    if [ -n "$1" -a -r "$1" ]; then
       while read -r _line; do
         if [ "$(echo ${_line} | grep -v ^[/s]*#)" != "" ]; then
@@ -132,17 +131,6 @@ load_variables_from_file ()
         fi
       done < "$1"
    fi
-=======
-    # Reload wizard variables stored by postinst
-    if [ -r "${INST_VARIABLES}" ]; then
-        # we cannot source the file to reload the variables, when values have special characters like <, >, ...
-        for _line in $(cat "${INST_VARIABLES}"); do
-            _key="$(echo ${_line} | awk -F'=' '{print $1}')"
-            _value="$(echo ${_line} | awk -F'=' '{print $2}')"
-            declare -g "${_key}=${_value}"
-        done
-    fi
->>>>>>> 65187ff2 (restic-rest-server: use existing function to load wizard vars)
 }
 
 

spk/restic-rest-server/Makefile

@@ -1,5 +1,5 @@
 SPK_NAME = restic-rest-server
-SPK_VERS = 0.12.0
+SPK_VERS = 0.12.1
 SPK_REV = 1
 SPK_ICON = src/logo.png
 DSM_UI_DIR = app