gentoo resync : 02.02.2022

6 files changed, 45 insertions, 89 deletions

diff --git a/net-p2p/syncthing/files/stdiscosrv.initd b/net-p2p/syncthing/files/stdiscosrv.initd
deleted file mode 100644
index 333b980897b3..000000000000
--- a/net-p2p/syncthing/files/stdiscosrv.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-SD_USER=stdiscosrv
-SD_GROUP=stdiscosrv
-SD_HOMEDIR=/var/lib/stdiscosrv
-SD_LOGFILE=/var/log/syncthing/stdiscosrv.log
-
-
-description="Discovery service for syncthing"
-command="/usr/libexec/syncthing/stdiscosrv"
-command_args="${SD_OPTS}"
-pidfile="/run/stdiscosrv.pid"
-start_stop_daemon_args="--background
-  --user ${SD_USER}
-  --group ${SD_GROUP}
-  --chdir \"${SD_HOMEDIR}\"
-  --make-pidfile
-  --stdout \"${SD_LOGFILE}\"
-  --stderr \"${SD_LOGFILE}\"
-  "
-
-depend() {
-  need net
-}
-
-start_pre() {
-  checkpath -q -d -o ${SD_USER}:${SD_GROUP} ${SD_HOMEDIR}
-  checkpath -q -f -o ${SD_USER}:${SD_GROUP} ${SD_LOGFILE}
-}
diff --git a/net-p2p/syncthing/files/stdiscosrv.service b/net-p2p/syncthing/files/stdiscosrv.service
deleted file mode 100644
index 4011c7d4c5bd..000000000000
--- a/net-p2p/syncthing/files/stdiscosrv.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Syncthing discovery server
-After=network.target
-
-[Service]
-User=stdiscosrv
-Group=stdiscosrv
-ExecStart=/usr/libexec/syncthing/stdiscosrv
-WorkingDirectory=/var/lib/stdiscosrv
-
-PrivateTmp=true
-ProtectSystem=full
-ProtectHome=true
-NoNewPrivileges=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-p2p/syncthing/files/strelaysrv.initd b/net-p2p/syncthing/files/strelaysrv.initd
deleted file mode 100644
index 7eb77be26fda..000000000000
--- a/net-p2p/syncthing/files/strelaysrv.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-SR_USER=strelaysrv
-SR_GROUP=strelaysrv
-SR_HOMEDIR=/var/lib/strelaysrv
-SR_LOGFILE=/var/log/syncthing/strelaysrv.log
-
-
-description="Relay service for syncthing"
-command="/usr/libexec/syncthing/strelaysrv"
-command_args="${SR_OPTS}"
-pidfile="/run/strelaysrv.pid"
-start_stop_daemon_args="--background
-  --user ${SR_USER}
-  --group ${SR_GROUP}
-  --chdir \"${SR_HOMEDIR}\"
-  --make-pidfile
-  --stdout \"${SR_LOGFILE}\"
-  --stderr \"${SR_LOGFILE}\"
-  "
-
-depend() {
-  need net
-}
-
-start_pre() {
-  checkpath -q -d -o ${SR_USER}:${SR_GROUP} ${SR_HOMEDIR}
-  checkpath -q -f -o ${SR_USER}:${SR_GROUP} ${SR_LOGFILE}
-}
diff --git a/net-p2p/syncthing/files/syncthing-1.18.6-build-out.patch b/net-p2p/syncthing/files/syncthing-1.18.6-build-out.patch
new file mode 100644
index 000000000000..20dc63dca2f5
--- /dev/null
+++ b/net-p2p/syncthing/files/syncthing-1.18.6-build-out.patch
@@ -0,0 +1,30 @@
+diff --git a/build.go b/build.go
+index c2e1059398..7888c834d2 100644
+--- a/build.go
++++ b/build.go
+@@ -47,6 +47,7 @@ var (
+ 	cc             string
+ 	run            string
+ 	benchRun       string
++	buildOut       string
+ 	debugBinary    bool
+ 	coverage       bool
+ 	long           bool
+@@ -374,6 +375,7 @@ func parseFlags() {
+ 	flag.StringVar(&run, "run", "", "Specify which tests to run")
+ 	flag.StringVar(&benchRun, "bench", "", "Specify which benchmarks to run")
+ 	flag.BoolVar(&withNextGenGUI, "with-next-gen-gui", withNextGenGUI, "Also build 'newgui'")
++	flag.StringVar(&buildOut, "build-out", "", "Set the '-o' value for 'go build'")
+ 	flag.Parse()
+ }
+ 
+@@ -506,6 +508,9 @@ func build(target target, tags []string) {
+ 	}
+ 
+ 	args := []string{"build", "-v"}
++	if buildOut != "" {
++		args = append(args, "-o", buildOut)
++	}
+ 	args = appendParameters(args, tags, target.buildPkgs...)
+ 	runPrint(goCmd, args...)
+ }
diff --git a/net-p2p/syncthing/files/syncthing.confd b/net-p2p/syncthing/files/syncthing.confd
index 33773dc7fdf9..eb70f1adef95 100644
--- a/net-p2p/syncthing/files/syncthing.confd
+++ b/net-p2p/syncthing/files/syncthing.confd
@@ -20,5 +20,9 @@
 # Nice level of syncthing
 #SYNCTHING_NICE="0"
 
+# Where the syncthing GUI should listen. Can be a http(s) URI or a Unix domain socket
+#SYNCTHING_GUI_ADDRESS="http://127.0.0.1:8384"
+#SYNCTHING_GUI_ADDRESS="unix:/run/syncthing.sock"
+
 # Extra options for syncthing
 #SYNCTHING_OPTS=""
diff --git a/net-p2p/syncthing/files/syncthing.initd b/net-p2p/syncthing/files/syncthing.initd-r2
index b64ebac03254..d8e46180df12 100644
--- a/net-p2p/syncthing/files/syncthing.initd
+++ b/net-p2p/syncthing/files/syncthing.initd-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 SYNCTHING_USER=${SYNCTHING_USER:-syncthing}
@@ -9,20 +9,19 @@ SYNCTHING_LOGFILE=${SYNCTHING_LOGFILE:-/var/log/syncthing/syncthing.log}
 SYNCTHING_UMASK=${SYNCTHING_UMASK:-007}
 SYNCTHING_IONICE=${SYNCTHING_IONICE:-0}
 SYNCTHING_NICE=${SYNCTHING_NICE:-0}
+SYNCTHING_GUI_ADDRESS=${SYNCTHING_GUI_ADDRESS:-http://127.0.0.1:8384}
 
 description="Syncthing is an open, trustworthy and decentralized cloud storage system"
 command="/usr/bin/syncthing"
-command_args="-no-browser -home=${SYNCTHING_HOMEDIR} ${SYNCTHING_OPTS}"
-pidfile="/run/syncthing.pid"
-start_stop_daemon_args="--background \
-  --user ${SYNCTHING_USER} \
-  --group ${SYNCTHING_GROUP} \
-  --umask ${SYNCTHING_UMASK} \
-  --make-pidfile \
-  --ionice ${SYNCTHING_IONICE} \
-  --nicelevel ${SYNCTHING_NICE} \
-  --stdout ${SYNCTHING_LOGFILE} \
-  --stderr ${SYNCTHING_LOGFILE}"
+command_args="-no-browser -home=${SYNCTHING_HOMEDIR} -gui-address=${SYNCTHING_GUI_ADDRESS} ${SYNCTHING_OPTS}"
+pidfile="/run/${RC_SVCNAME}.pid"
+command_background="yes"
+command_user="${SYNCTHING_USER}:${SYNCTHING_GROUP}"
+umask="${SYNCTHING_UMASK}"
+start_stop_daemon_args="--ionice ${SYNCTHING_IONICE} \
+  --nicelevel ${SYNCTHING_NICE}"
+output_log="\"${SYNCTHING_LOGFILE}\""
+error_log="\"${SYNCTHING_LOGFILE}\""
 
 depend() {
   need localmount net