CVS commit: pkgsrc/net/syncthing

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri May 24 19:25:55 UTC 2019

Modified Files:
        pkgsrc/net/syncthing: Makefile distinfo
Added Files:
        pkgsrc/net/syncthing/files: syncthing.sh

Log Message:
syncthing: Update to 1.1.3. Add an rc.subr script.

ok gdt

Bugfixes

    #5332: Duplicate Files Names in Out of Sync List
    #5456: Folder marked as "Up to Date" with failed items
    #5578: Filesystem Watcher Error on v1.1.0
    #5624: Simple Syncthing invocations take a long time to run
    #5676: Systemd circular dependency prevents startup
    #5531: Flush to database based on size instead of entries
    #5571: Dir/symlink updates overwrite conflicts & unscanned files
    #5599: Default folder in v1.1.0 isn’t created with useLargeBlocks = true
    #5482: minHomeDiskFreePct is still present in fresh configs
    #5493: Monitor bug: TERM signaling not passed to syncthing process
    #5557: Hashing performance degradation when using large blocks

Enhancements

    #1223: Mention license in "About" dialog
    #5554: Unnecessary time precision in pendingFolder/pendingDevice config entries
    #4921: Syncthing should guard against running old versions with new config
    #5065: Add support for TLS1.3
    #5346: Systemd unit should declare after=multiuser.target
    #5560: Change "Introduced by" icon
    #5569: Outdated copyright notes in "About" dialog
    #5365: .desktop files: desktop-entry-lacks-keywords-entry
    #5445: User/group ownership following parent dir

Other issues:

    #1101: Syncthing has no easter eggs
    #5480: Better describe exposed volumes in our Docker image
    #5077: TestWatchIgnore is flaky (OpenBSD (-current) Test failed)
    #5246: TestParentDeletion fails on OpenBSD
    #5311: Update prometheus/common/expfmt to pass tests on go1.11
    #5454: build.go setup problems with gomodules
    #5495: Dockerhub Docker builds fail continously
    #5515: Missing string from Transifex

API Changes

    Change #5479 introduces the new copyOwnershipFromParent folder
    configuration option. The default, false, matches the old behavior of
    not copying ownership information.
    Since change #5405, large (variable size) blocks are enabled by default for newly created folders.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/net/syncthing/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/net/syncthing/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/syncthing/files/syncthing.sh

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.88 pkgsrc/net/syncthing/Makefile:1.89
--- pkgsrc/net/syncthing/Makefile:1.88  Tue Apr 16 18:41:09 2019
+++ pkgsrc/net/syncthing/Makefile       Fri May 24 19:25:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2019/04/16 18:41:09 bsiegert Exp $
+# $NetBSD: Makefile,v 1.89 2019/05/24 19:25:55 nia Exp $
 
 # Upstream used to frequently break protocol compatibility.  While
 # users of pkgsrc syncthing on multiple systems can update
@@ -14,11 +14,11 @@
 # Note that the android versioning is disconnected from syncthing versioning;
 # see https://github.com/syncthing/syncthing-android/issues/652 for
 # a fuller explanation.
-DISTNAME=      syncthing-1.0.1
-PKGREVISION=   3
+DISTNAME=      syncthing-source-v1.1.3
+PKGNAME=       ${DISTNAME:S,source-v,,}
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=syncthing/}
-GITHUB_TAG=    v${PKGVERSION_NOREV}
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 # Minor version updates may be committed without asking.  Major
 # updates not following the above policy will be reverted.
@@ -27,14 +27,11 @@ HOMEPAGE=   https://syncthing.net/
 MAINTAINER=    gdt%NetBSD.org@localhost
 LICENSE=       mpl-2.0
 
-# System pax fails on NetBSD 6.  Just use bsdtar until this is understood.
-EXTRACT_USING=         bsdtar
-
 # The 'zillode' dependency calls the compiler on certain archs.
 USE_LANGUAGES=         c
 NO_CONFIGURE=          yes
 GO_SRCPATH=            github.com/syncthing/syncthing
-GO_DIST_BASE=          ${PKGNAME_NOREV}
+GO_DIST_BASE=          syncthing
 INSTALLATION_DIRS=     bin
 
 CHECK_RELRO_SKIP+=     bin/syncthing
@@ -53,6 +50,28 @@ SUBST_MESSAGE.go=    Fixing go executable r
 SUBST_FILES.go=                lib/auto/doc.go cmd/strelaypoolsrv/auto/doc.go
 SUBST_SED.go+=         -e 's|go run|"${GO}" run|'
 
+.include "../../mk/bsd.prefs.mk"
+
+PKG_SYSCONFSUBDIR=     syncthing
+
+SYNCTHING_USER?=       syncthing
+SYNCTHING_GROUP?=      syncthing
+
+PKG_GROUPS_VARS+=      SYNCTHING_GROUP
+PKG_USERS_VARS+=       SYNCTHING_USER
+
+OWN_DIRS_PERMS+=       ${PKG_SYSCONFDIR} ${SYNCTHING_USER} ${SYNCTHING_GROUP} 0755
+OWN_DIRS_PERMS+=       ${VARBASE}/db/syncthing ${SYNCTHING_USER} ${SYNCTHING_GROUP} 0755
+
+PKG_GROUPS=                    ${SYNCTHING_GROUP}
+PKG_USERS=                     ${SYNCTHING_USER}:${SYNCTHING_GROUP}
+PKG_HOME.${SYNCTHING_USER}=    ${VARBASE}/db/syncthing
+
+FILES_SUBST+=          SYNCTHING_USER=${SYNCTHING_USER}
+FILES_SUBST+=          SYNCTHING_GROUP=${SYNCTHING_GROUP}
+
+RCD_SCRIPTS+=          syncthing
+
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO} run build.go build syncthing
 

Index: pkgsrc/net/syncthing/distinfo
diff -u pkgsrc/net/syncthing/distinfo:1.67 pkgsrc/net/syncthing/distinfo:1.68
--- pkgsrc/net/syncthing/distinfo:1.67  Thu Feb  7 01:01:11 2019
+++ pkgsrc/net/syncthing/distinfo       Fri May 24 19:25:55 2019
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.67 2019/02/07 01:01:11 gdt Exp $
+$NetBSD: distinfo,v 1.68 2019/05/24 19:25:55 nia Exp $
 
-SHA1 (syncthing-1.0.1.tar.gz) = 2588cf71e6b1a4a3469a736087e2684d389a2646
-RMD160 (syncthing-1.0.1.tar.gz) = 0b5b784ba883479068fcf0f79b56f27b42f865aa
-SHA512 (syncthing-1.0.1.tar.gz) = 7f9fd48e00fae2f0913eb9eeddadaad1d5d7559164a24020706e70411f8ec43420192c4c9422699be6faa1641a382d5b8627038ca9a5dad38ee0e189970efbb7
-Size (syncthing-1.0.1.tar.gz) = 7114455 bytes
+SHA1 (syncthing-source-v1.1.3.tar.gz) = c9371dd0d38f062b24d7bd06775ce4af8f2ba724
+RMD160 (syncthing-source-v1.1.3.tar.gz) = 1c12ddc111d92ca4d66355bf1b6c6fef53bdc2cb
+SHA512 (syncthing-source-v1.1.3.tar.gz) = f439635a26547fb92ef8de341e41a3a9c7e603c3c25df91b765a5d9ac614f647c19a8be2c789de1bd8334efeee29510805d1b3adc1113da04df2b76d0842fce5
+Size (syncthing-source-v1.1.3.tar.gz) = 9347670 bytes

Added files:

Index: pkgsrc/net/syncthing/files/syncthing.sh
diff -u /dev/null pkgsrc/net/syncthing/files/syncthing.sh:1.1
--- /dev/null   Fri May 24 19:25:55 2019
+++ pkgsrc/net/syncthing/files/syncthing.sh     Fri May 24 19:25:55 2019
@@ -0,0 +1,37 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: syncthing.sh,v 1.1 2019/05/24 19:25:55 nia Exp $
+#
+# PROVIDE: syncthing
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="syncthing"
+rcvar=${name}
+
+: ${syncthing_user:=@SYNCTHING_USER@}
+: ${syncthing_user_home:=@VARBASE@/db/syncthing}
+: ${syncthing_group:=@SYNCTHING_GROUP@}
+: ${syncthing_home:=@PKG_SYSCONFDIR@}
+: ${syncthing_logfile:=@VARBASE@/log/syncthing.log}
+
+command="@PREFIX@/bin/syncthing"
+command_args="-logfile ${syncthing_logfile}"
+command_args="${command_args} -home ${syncthing_home} &"
+
+syncthing_env="STNODEFAULTFOLDER=1"
+syncthing_env="${syncthing_env} USER=${syncthing_user}"
+syncthing_env="${syncthing_env} HOME=${syncthing_user_home}"
+
+start_precmd="syncthing_precmd"
+
+syncthing_precmd()
+{
+       @TOUCH@ ${syncthing_logfile} && \
+       @CHOWN@ ${syncthing_user}:${syncthing_group} ${syncthing_logfile} && \
+       @CHMOD@ 0750 ${syncthing_logfile}
+}
+
+load_rc_config $name
+run_rc_command "$1"