CVS commit: pkgsrc/net/syncthing

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun  9 11:32:43 UTC 2020

Modified Files:
        pkgsrc/net/syncthing: Makefile PLIST distinfo
        pkgsrc/net/syncthing/patches:
            patch-vendor_golang.org_x_sys_cpu_cpu__arm64.go

Log Message:
syncthing: Update to 1.6.1

   v1.6.1

   This is a fixup release on 1.6.0 in order to restore the auto upgrade
   critera broken in 1.5.0.

   Bugfixes:

     * #6701: Syncthing 1.5.0+ auto upgrades even with auto upgrades disabled
       in config

   v1.6.0

   This release performs a database schema migration, and adds the
   BlockPullOrder, DisableFsync and MaxConcurrentWrites folder
   options to the configuration schema.

   The LocalChangeDetected event no longer has the action set to
   added for new files, instead showing modified for all local file
   changes.

   Bugfixes:

     * #3876: Removing and re-adding a folder may cause data loss
     * #5731: 100% CPU every minute on watch setup retry
     * #6268: Out of sync panel layout overflows
     * #6557: Folder error repeatedly set and unset
     * #6559: Deadlock on folder unsubscribe
     * #6576: Versioning params in config flip flop in order
     * #6578: Allow rescan at folder state "Local Additions"
     * #6583: Distributed deadlock on request
     * #6604: Docker healthcheck fails when run in host network

   Enhancements:

     * #5224: Accept new connections in place of old ones when appropriate
     * #6530: Add "Pause All"/"Resume All" button for devices
     * #6541: Limit number of concurrent writes while syncing

   Other issues:

     * #6575: Incomprehensible error message: 'directory is not empty; files
       within are probably ignored on connected devices only'
     * #6584: A field in a structure is sometimes protected by Mutex, but
       sometimes unprotected.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/net/syncthing/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/syncthing/PLIST
cvs rdiff -u -r1.78 -r1.79 pkgsrc/net/syncthing/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/syncthing/patches/patch-vendor_golang.org_x_sys_cpu_cpu__arm64.go

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/syncthing/Makefile
diff -u pkgsrc/net/syncthing/Makefile:1.109 pkgsrc/net/syncthing/Makefile:1.110
--- pkgsrc/net/syncthing/Makefile:1.109 Fri May 15 13:44:20 2020
+++ pkgsrc/net/syncthing/Makefile       Tue Jun  9 11:32:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2020/05/15 13:44:20 triaxx Exp $
+# $NetBSD: Makefile,v 1.110 2020/06/09 11:32:43 nia Exp $
 
 # Upstream used to frequently break protocol compatibility, but since
 # 2018 or so this has been much better.  While users of pkgsrc
@@ -17,7 +17,7 @@
 #
 # Minor version updates may be committed without asking.  Major
 # updates not following the above policy will be reverted.
-DISTNAME=      syncthing-source-v1.5.0
+DISTNAME=      syncthing-source-v1.6.1
 PKGNAME=       ${DISTNAME:S,source-v,,}
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=syncthing/}
@@ -33,7 +33,7 @@ USE_LANGUAGES=                c
 NO_CONFIGURE=          yes
 GO_SRCPATH=            github.com/syncthing/syncthing
 GO_DIST_BASE=          syncthing
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin share/applications
 
 CHECK_RELRO_SKIP+=     bin/syncthing
 
@@ -48,9 +48,15 @@ SUBST_SED.version+=  -e 's|"go"|"${GO}"|'
 SUBST_CLASSES+=                go
 SUBST_STAGE.go=                pre-build
 SUBST_MESSAGE.go=      Fixing go executable reference
-SUBST_FILES.go=                lib/auto/doc.go cmd/strelaypoolsrv/auto/doc.go
+SUBST_FILES.go=                lib/api/auto/doc.go cmd/strelaypoolsrv/auto/doc.go
 SUBST_SED.go+=         -e 's|go run|"${GO}" run|'
 
+SUBST_CLASSES+=                bin
+SUBST_STAGE.bin=       pre-install
+SUBST_MESSAGE.bin=     Fixing location of installed binaries
+SUBST_FILES.bin=       etc/linux-desktop/*.desktop
+SUBST_SED.bin+=                -e 's,/usr/bin/syncthing,${PREFIX}/bin/syncthing,'
+
 .include "../../mk/bsd.prefs.mk"
 
 PKG_SYSCONFSUBDIR=     syncthing
@@ -80,7 +86,16 @@ do-build:
 
 # Binaries other than syncthing proper should perhaps be installed.
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/syncthing ${DESTDIR}/${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/syncthing ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA} ${WRKSRC}/syncthing ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA} ${WRKSRC}/etc/linux-desktop/*.desktop ${DESTDIR}${PREFIX}/share/applications
+.for s in 512 256 128 64 32
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
+       ${INSTALL_DATA} ${WRKSRC}/assets/logo-${s}.png  \
+               ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/syncthing.png
+.endfor
 
 .include "../../lang/go/go-package.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/syncthing/PLIST
diff -u pkgsrc/net/syncthing/PLIST:1.1 pkgsrc/net/syncthing/PLIST:1.2
--- pkgsrc/net/syncthing/PLIST:1.1      Sat Oct  3 16:26:00 2015
+++ pkgsrc/net/syncthing/PLIST  Tue Jun  9 11:32:43 2020
@@ -1,2 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2015/10/03 16:26:00 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/06/09 11:32:43 nia Exp $
 bin/syncthing
+share/applications/syncthing-start.desktop
+share/applications/syncthing-ui.desktop
+share/icons/hicolor/128x128/apps/syncthing.png
+share/icons/hicolor/256x256/apps/syncthing.png
+share/icons/hicolor/32x32/apps/syncthing.png
+share/icons/hicolor/512x512/apps/syncthing.png
+share/icons/hicolor/64x64/apps/syncthing.png

Index: pkgsrc/net/syncthing/distinfo
diff -u pkgsrc/net/syncthing/distinfo:1.78 pkgsrc/net/syncthing/distinfo:1.79
--- pkgsrc/net/syncthing/distinfo:1.78  Fri May 15 13:44:20 2020
+++ pkgsrc/net/syncthing/distinfo       Tue Jun  9 11:32:43 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.78 2020/05/15 13:44:20 triaxx Exp $
+$NetBSD: distinfo,v 1.79 2020/06/09 11:32:43 nia Exp $
 
-SHA1 (syncthing-source-v1.5.0.tar.gz) = 8b6ee4c5d618e2b8d71045b9d7d093fb11abda75
-RMD160 (syncthing-source-v1.5.0.tar.gz) = 697f1d5849799e0a65cee946118b6573558b05ac
-SHA512 (syncthing-source-v1.5.0.tar.gz) = 77faf8be58c3eb1925632ca18ff2ba0e0077dbb9ad10bb44299ed5402267610bb7a81865818f44da454b8db8c4067fcf44ee9caf1cdf5410246d4ef2005b65b0
-Size (syncthing-source-v1.5.0.tar.gz) = 10475068 bytes
-SHA1 (patch-vendor_golang.org_x_sys_cpu_cpu__arm64.go) = 26dd7a6395b120110ecccbb77045c296e51cbece
+SHA1 (syncthing-source-v1.6.1.tar.gz) = e4f390a0f944fb3cd145a4ab13596ed01062a7b1
+RMD160 (syncthing-source-v1.6.1.tar.gz) = 482c2549cc32d2af6b0b2e89563a4089a7df7692
+SHA512 (syncthing-source-v1.6.1.tar.gz) = 9f5c064bb081332d9ebd78e36f149929af652f0c0c78ffa4fc042ec2c07f1c5da5bf19a96b9d066780b4e085fde1250abace0d1f9eebf987f23d5d4298dfd009
+Size (syncthing-source-v1.6.1.tar.gz) = 10825929 bytes
+SHA1 (patch-vendor_golang.org_x_sys_cpu_cpu__arm64.go) = 86e6ff8b88c40c533da01631028341b7c59102cc

Index: pkgsrc/net/syncthing/patches/patch-vendor_golang.org_x_sys_cpu_cpu__arm64.go
diff -u pkgsrc/net/syncthing/patches/patch-vendor_golang.org_x_sys_cpu_cpu__arm64.go:1.1 pkgsrc/net/syncthing/patches/patch-vendor_golang.org_x_sys_cpu_cpu__arm64.go:1.2
--- pkgsrc/net/syncthing/patches/patch-vendor_golang.org_x_sys_cpu_cpu__arm64.go:1.1    Fri May  1 21:09:03 2020
+++ pkgsrc/net/syncthing/patches/patch-vendor_golang.org_x_sys_cpu_cpu__arm64.go        Tue Jun  9 11:32:43 2020
@@ -1,22 +1,20 @@
-$NetBSD: patch-vendor_golang.org_x_sys_cpu_cpu__arm64.go,v 1.1 2020/05/01 21:09:03 tnn Exp $
+$NetBSD: patch-vendor_golang.org_x_sys_cpu_cpu__arm64.go,v 1.2 2020/06/09 11:32:43 nia Exp $
 
 copypasta of devel/go-sys/patches/patch-cpu_cpu__arm64.go
 
---- vendor/golang.org/x/sys/cpu/cpu_arm64.go.orig      2020-04-08 07:13:30.000000000 +0000
+--- vendor/golang.org/x/sys/cpu/cpu_arm64.go.orig      2020-06-02 09:59:11.000000000 +0000
 +++ vendor/golang.org/x/sys/cpu/cpu_arm64.go
-@@ -10,8 +10,14 @@ const cacheLineSize = 64
+@@ -10,8 +10,12 @@ const cacheLineSize = 64
  
  func init() {
        switch runtime.GOOS {
--      case "darwin":
-+      case "darwin", "netbsd":
-               // iOS does not seem to allow reading these registers
+-      case "android", "darwin":
++      case "android", "darwin", "netbsd":
+               // Android and iOS don't seem to allow reading these registers.
 +              // NetBSD:
 +              // ID_AA64ISAR0_EL1 is a privileged register and cannot be read from EL0.
 +              // It can be read via sysctl(3). Example for future implementers:
 +              // https://nxr.netbsd.org/xref/src/usr.sbin/cpuctl/arch/aarch64.c
-+              ARM64.HasASIMD = true
-+              ARM64.HasFP = true
-       case "android", "linux":
-               doinit()
-       default:
+               // Fake the minimal features expected by
+               // TestARM64minimalFeatures.
+               ARM64.HasASIMD = true