Run of fresh-releases for golang-gopkg-hlandau-service.v2

Merge these changes:

Summary

Merged new upstream version: 2.0.17 (was: 2.0.16).

Diff

Branch: main

diff --git a/debian/changelog b/debian/changelog
index 26535bf..fe81571 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-golang-gopkg-hlandau-service.v2 (2.0.16-5) UNRELEASED; urgency=low
+golang-gopkg-hlandau-service.v2 (2.0.17-1) UNRELEASED; urgency=low
 
   * Bump debhelper from old 11 to 12.
   * Set debhelper-compat version in Build-Depends.
   * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
     Repository-Browse.
+  * New upstream release.
 
- -- Debian Janitor <janitor@jelmer.uk>  Sat, 06 Jun 2020 20:19:30 -0000
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 14 Mar 2022 12:51:32 -0000
 
 golang-gopkg-hlandau-service.v2 (2.0.16-4) unstable; urgency=medium
 
diff --git a/debian/patches/license.patch b/debian/patches/license.patch
index 33d2db9..bba8094 100644
--- a/debian/patches/license.patch
+++ b/debian/patches/license.patch
@@ -10,8 +10,10 @@ Origin: upstream, https://github.com/hlandau/rilts/blob/e4791634449efa0ae1a63046
 Last-Update: 2016-10-19
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: golang-gopkg-hlandau-service.v2/LICENSE
+===================================================================
 --- /dev/null
-+++ b/LICENSE
++++ golang-gopkg-hlandau-service.v2/LICENSE
 @@ -0,0 +1,5 @@
 +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 +
diff --git a/service.go b/service.go
index cd57ee4..70383ea 100644
--- a/service.go
+++ b/service.go
@@ -321,7 +321,7 @@ func (info *Info) runInteractively() error {
 		doneChan <- err
 	}()
 
-	sig := make(chan os.Signal)
+	sig := make(chan os.Signal, 1)
 	signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
 
 	var exitErr error
diff --git a/service_windows.go b/service_windows.go
index 04cfbdc..4de81b3 100644
--- a/service_windows.go
+++ b/service_windows.go
@@ -2,8 +2,8 @@ package service
 
 import (
 	"fmt"
-	"github.com/btcsuite/winsvc/mgr"
-	"github.com/btcsuite/winsvc/svc"
+	"golang.org/x/sys/windows/svc"
+	"golang.org/x/sys/windows/svc/mgr"
 	"gopkg.in/hlandau/easyconfig.v1/cflag"
 	"gopkg.in/hlandau/svcutils.v1/exepath"
 	"os"
@@ -205,7 +205,7 @@ func (info *Info) startService() error {
 	}
 	defer service.Close()
 
-	err = service.Start(os.Args)
+	err = service.Start(os.Args...)
 	if err != nil {
 		return fmt.Errorf("could not start service: %v", err)
 	}

Branch: pristine-tar

diff --git a/golang-gopkg-hlandau-service.v2_2.0.17.orig.tar.gz.delta b/golang-gopkg-hlandau-service.v2_2.0.17.orig.tar.gz.delta
new file mode 100644
index 0000000..5427d3f
Binary files /dev/null and b/golang-gopkg-hlandau-service.v2_2.0.17.orig.tar.gz.delta differ
diff --git a/golang-gopkg-hlandau-service.v2_2.0.17.orig.tar.gz.id b/golang-gopkg-hlandau-service.v2_2.0.17.orig.tar.gz.id
new file mode 100644
index 0000000..8332e34
--- /dev/null
+++ b/golang-gopkg-hlandau-service.v2_2.0.17.orig.tar.gz.id
@@ -0,0 +1 @@
+36c187bb52793ae7af11dd41bb6af9d9d4c9a90a

Branch: upstream

Tag: upstream/2.0.17
diff --git a/service.go b/service.go
index cd57ee4..70383ea 100644
--- a/service.go
+++ b/service.go
@@ -321,7 +321,7 @@ func (info *Info) runInteractively() error {
 		doneChan <- err
 	}()
 
-	sig := make(chan os.Signal)
+	sig := make(chan os.Signal, 1)
 	signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
 
 	var exitErr error
diff --git a/service_windows.go b/service_windows.go
index 04cfbdc..4de81b3 100644
--- a/service_windows.go
+++ b/service_windows.go
@@ -2,8 +2,8 @@ package service
 
 import (
 	"fmt"
-	"github.com/btcsuite/winsvc/mgr"
-	"github.com/btcsuite/winsvc/svc"
+	"golang.org/x/sys/windows/svc"
+	"golang.org/x/sys/windows/svc/mgr"
 	"gopkg.in/hlandau/easyconfig.v1/cflag"
 	"gopkg.in/hlandau/svcutils.v1/exepath"
 	"os"
@@ -205,7 +205,7 @@ func (info *Info) startService() error {
 	}
 	defer service.Close()
 
-	err = service.Start(os.Args)
+	err = service.Start(os.Args...)
 	if err != nil {
 		return fmt.Errorf("could not start service: %v", err)
 	}

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☑ command has not changed
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far.not currently attempting to back off
  • ☒ merge proposals for the package maintainer are currently being rate-limited (open: 1253, max open: 300)
  • ☑ change set 6705cbb4-1077-4dcd-95f6-cfffc4065fc1 is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-releases golang-gopkg-hlandau-service.v2-dev

Lintian Result

Full worker log Full build log