From d9507c5d1ae8647538303c129d9f4669a9e5071b Mon Sep 17 00:00:00 2001
From: awiouy <awiouy@gmail.com>
Date: Fri, 1 May 2020 13:43:18 +0200
Subject: [PATCH] syncthing: update to 1.4.2

---
 .../addons/service/syncthing/changelog.txt    |  3 ++
 packages/addons/service/syncthing/package.mk  | 34 +++++++------------
 .../syncthing/source/bin/syncthing-service    |  2 --
 .../service/syncthing/source/default.py       | 14 ++++----
 4 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/packages/addons/service/syncthing/changelog.txt b/packages/addons/service/syncthing/changelog.txt
index 0e23b0f4b6..380955e10c 100644
--- a/packages/addons/service/syncthing/changelog.txt
+++ b/packages/addons/service/syncthing/changelog.txt
@@ -1,3 +1,6 @@
+109
+- Update to 1.4.2
+
 108
 - Update to 1.2.0
 
diff --git a/packages/addons/service/syncthing/package.mk b/packages/addons/service/syncthing/package.mk
index 01226e1ab9..fd01aa84d8 100644
--- a/packages/addons/service/syncthing/package.mk
+++ b/packages/addons/service/syncthing/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="syncthing"
-PKG_VERSION="1.2.0"
-PKG_SHA256="0339877effdcf3bf8aa7d4d1e50b878992792e4752ff778f27788bf71eccecd0"
-PKG_REV="108"
+PKG_VERSION="1.4.2"
+PKG_SHA256="061af43c1bbfcdf949499cdc50a325fff7cd67fb48f9d270adb52b4decbab899"
+PKG_REV="109"
 PKG_ARCH="any"
 PKG_LICENSE="MPLv2"
 PKG_SITE="https://syncthing.net/"
@@ -21,19 +21,15 @@ PKG_ADDON_TYPE="xbmc.service"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 configure_target() {
-  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
-
-  cd $PKG_BUILD
-  $GOLANG generate -v ./lib/auto ./cmd/strelaypoolsrv/auto
-
-  export GOOS=linux
+  export CGO_CFLAGS=${CFLAGS}
   export CGO_ENABLED=1
   export CGO_NO_EMULATION=1
-  export CGO_CFLAGS=$CFLAGS
-  export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC -X main.Version=v$PKG_VERSION"
-  export GOPATH=$PKG_BUILD:$PKG_BUILD/Godeps/_workspace
-  export GOROOT=$TOOLCHAIN/lib/golang
-  export PATH=$PATH:$GOROOT/bin
+  export GOLANG=${TOOLCHAIN}/lib/golang/bin/go
+  export GOOS=linux
+  export GOROOT=${TOOLCHAIN}/lib/golang
+  export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld ${CC} \
+                  -X github.com/syncthing/syncthing/lib/build.Version=v${PKG_VERSION}"
+  export PATH=${PATH}:${GOROOT}/bin
 
   case $TARGET_ARCH in
     x86_64)
@@ -57,14 +53,10 @@ configure_target() {
 }
 
 make_target() {
-  mkdir -p $PKG_BUILD/src/github.com/syncthing
-  ln -sf $PKG_BUILD $PKG_BUILD/src/github.com/syncthing/syncthing
-  cd $PKG_BUILD/src/github.com/syncthing/syncthing
-  mkdir bin
-  $GOLANG build -v -o bin/syncthing -a -ldflags "$LDFLAGS" ./cmd/syncthing
+  ${GOLANG} build -v -o bin/syncthing -a -ldflags "${LDFLAGS}" ./cmd/syncthing
 }
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/bin/syncthing $ADDON_BUILD/$PKG_ADDON_ID/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  cp -P ${PKG_BUILD}/bin/syncthing ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 }
diff --git a/packages/addons/service/syncthing/source/bin/syncthing-service b/packages/addons/service/syncthing/source/bin/syncthing-service
index af319d13c2..a65763eac4 100644
--- a/packages/addons/service/syncthing/source/bin/syncthing-service
+++ b/packages/addons/service/syncthing/source/bin/syncthing-service
@@ -6,8 +6,6 @@
 . /etc/profile
 oe_setup_addon service.system.syncthing
 
-chmod +x $ADDON_DIR/bin/*
-
 STNODEFAULTFOLDER="y" syncthing -home=$ADDON_HOME           \
                                 -gui-address="$gui_address" \
                                 -logflags=0                 \
diff --git a/packages/addons/service/syncthing/source/default.py b/packages/addons/service/syncthing/source/default.py
index 93af06affa..ad10c47600 100644
--- a/packages/addons/service/syncthing/source/default.py
+++ b/packages/addons/service/syncthing/source/default.py
@@ -8,13 +8,13 @@ import xbmcaddon
 
 class Monitor(xbmc.Monitor):
 
-   def __init__(self, *args, **kwargs):
-      xbmc.Monitor.__init__(self)
-      self.id = xbmcaddon.Addon().getAddonInfo('id')
+    def __init__(self, *args, **kwargs):
+        xbmc.Monitor.__init__(self)
+        self.id = xbmcaddon.Addon().getAddonInfo('id')
 
-   def onSettingsChanged(self):
-      subprocess.call(['systemctl', 'restart', self.id])
+    def onSettingsChanged(self):
+        subprocess.call(['systemctl', 'restart', self.id])
 
 
-if __name__ == "__main__":
-   Monitor().waitForAbort()
+if __name__ == '__main__':
+    Monitor().waitForAbort()