From ff8de59d2bc70cec1ec2a887c0eb127b8eb0f561 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Mon, 20 Aug 2018 12:32:46 +0100
Subject: [PATCH] vendor: update minimum number of packages so compile with
go1.11 works
---
Gopkg.lock | 206 ++++++++++++++++--
vendor/github.com/okzk/sdnotify/notify.go | 1 +
.../github.com/okzk/sdnotify/notify_linux.go | 3 +-
.../github.com/okzk/sdnotify/sample/main.go | 20 +-
.../okzk/sdnotify/sample/sample.service | 2 +
vendor/github.com/okzk/sdnotify/util.go | 30 ++-
.../xanzy/ssh-agent/pageant_windows.go | 28 +--
7 files changed, 246 insertions(+), 44 deletions(-)
diff --git a/Gopkg.lock b/Gopkg.lock
index 45f49a4da..0e4edac06 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -3,57 +3,74 @@
[[projects]]
branch = "master"
+ digest = "1:df0ad5dd3f57601a1185ce7fdc76fef7101654c602d6a8c5153bce76ff6253c0"
name = "bazil.org/fuse"
packages = [
".",
"fs",
- "fuseutil"
+ "fuseutil",
]
+ pruneopts = ""
revision = "65cc252bf6691cb3c7014bcb2c8dc29de91e3a7e"
[[projects]]
+ digest = "1:4e800c0d846ed856a032380c87b22577ef03c146ccd26203b62ac90ef78e94b1"
name = "cloud.google.com/go"
packages = ["compute/metadata"]
+ pruneopts = ""
revision = "0fd7230b2a7505833d5f69b75cbd6c9582401479"
version = "v0.23.0"
[[projects]]
+ digest = "1:6f302284bb48712a01cdcd3216e8bbb293d1edb618f55b5fe7f92521cce930c7"
name = "github.com/Azure/azure-pipeline-go"
packages = ["pipeline"]
+ pruneopts = ""
revision = "7571e8eb0876932ab505918ff7ed5107773e5ee2"
version = "0.1.7"
[[projects]]
branch = "master"
+ digest = "1:fe7593b80dc3ea36fe51ca434844b801e1695e7b680851a137ed40fa2b4d6184"
name = "github.com/Azure/azure-storage-blob-go"
packages = ["2018-03-28/azblob"]
+ pruneopts = ""
revision = "eaae161d9d5e07363f04ddb19d84d57efc66d1a1"
[[projects]]
branch = "master"
+ digest = "1:f9282871e22332a39831bc53a3588fc04d763bf3f13312655580c7f4cb012b66"
name = "github.com/Unknwon/goconfig"
packages = ["."]
+ pruneopts = ""
revision = "ef1e4c783f8f0478bd8bff0edb3dd0bade552599"
[[projects]]
+ digest = "1:ac226c42eb54c121e0704c6f7f64c96c7817ad6d6286e5536e8cea72807e1079"
name = "github.com/VividCortex/ewma"
packages = ["."]
+ pruneopts = ""
revision = "b24eb346a94c3ba12c1da1e564dbac1b498a77ce"
version = "v1.1.1"
[[projects]]
branch = "master"
+ digest = "1:391632fa3a324c4f461f28baaf45cea8b21e13630b00f27059613f855bb544bb"
name = "github.com/a8m/tree"
packages = ["."]
+ pruneopts = ""
revision = "3cf936ce15d6100c49d9c75f79c220ae7e579599"
[[projects]]
+ digest = "1:61e512f75ec00c5d0e33e1f503fbad293f5850b76a8f62f6035097c8c436315d"
name = "github.com/abbot/go-http-auth"
packages = ["."]
+ pruneopts = ""
revision = "0ddd408d5d60ea76e320503cc7dd091992dee608"
version = "v0.4.0"
[[projects]]
+ digest = "1:f9dc8648e19ca5c4ccdf32e13301eaaff14a6662826c98926ba401d98bdea315"
name = "github.com/aws/aws-sdk-go"
packages = [
"aws",
@@ -87,42 +104,54 @@
"service/s3",
"service/s3/s3iface",
"service/s3/s3manager",
- "service/sts"
+ "service/sts",
]
+ pruneopts = ""
revision = "bfc1a07cf158c30c41a3eefba8aae043d0bb5bff"
version = "v1.14.8"
[[projects]]
+ digest = "1:a82690274ae3235a742afe7eebd9affcb97a80340af7d9b538f583cd953cff19"
name = "github.com/billziss-gh/cgofuse"
packages = ["fuse"]
+ pruneopts = ""
revision = "ea66f9809c71af94522d494d3d617545662ea59d"
version = "v1.1.0"
[[projects]]
branch = "master"
+ digest = "1:80db6bfe7a7d5e277987232bb650ccdeb365d00293576c5421dab101401741b6"
name = "github.com/coreos/bbolt"
packages = ["."]
+ pruneopts = ""
revision = "af9db2027c98c61ecd8e17caa5bd265792b9b9a2"
[[projects]]
+ digest = "1:982e2547680f9fd2212c6443ab73ea84eef40ee1cdcecb61d997de838445214c"
name = "github.com/cpuguy83/go-md2man"
packages = ["md2man"]
+ pruneopts = ""
revision = "20f5889cbdc3c73dbd2862796665e7c465ade7d1"
version = "v1.0.8"
[[projects]]
+ digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b"
name = "github.com/davecgh/go-spew"
packages = ["spew"]
+ pruneopts = ""
revision = "346938d642f2ec3594ed81d874461961cd0faa76"
version = "v1.1.0"
[[projects]]
+ digest = "1:7b4b8c901568da024c49be7ff5e20fdecef629b60679c803041093823fb8d081"
name = "github.com/djherbis/times"
packages = ["."]
+ pruneopts = ""
revision = "95292e44976d1217cf3611dc7c8d9466877d3ed5"
version = "v1.0.1"
[[projects]]
+ digest = "1:2a99d23b565e06fe1930f444c53c066216f06465c8d1d097b691f23c169858ea"
name = "github.com/dropbox/dropbox-sdk-go-unofficial"
packages = [
"dropbox",
@@ -135,185 +164,241 @@
"dropbox/team_common",
"dropbox/team_policies",
"dropbox/users",
- "dropbox/users_common"
+ "dropbox/users_common",
]
+ pruneopts = ""
revision = "7afa861bfde5a348d765522b303b6fbd9d250155"
version = "v4.1.0"
[[projects]]
+ digest = "1:617b3e0f5989d4ff866a1820480990c65dfc9257eb080da749a45e2d76681b02"
name = "github.com/go-ini/ini"
packages = ["."]
+ pruneopts = ""
revision = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"
version = "v1.37.0"
[[projects]]
+ digest = "1:f958a1c137db276e52f0b50efee41a1a389dcdded59a69711f3e872757dab34b"
name = "github.com/golang/protobuf"
packages = ["proto"]
+ pruneopts = ""
revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
version = "v1.1.0"
[[projects]]
branch = "master"
+ digest = "1:9abc49f39e3e23e262594bb4fb70abf74c0c99e94f99153f43b143805e850719"
name = "github.com/google/go-querystring"
packages = ["query"]
+ pruneopts = ""
revision = "53e6ce116135b80d037921a7fdd5138cf32d7a8a"
[[projects]]
+ digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be"
name = "github.com/inconshreveable/mousetrap"
packages = ["."]
+ pruneopts = ""
revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
version = "v1.0"
[[projects]]
branch = "master"
+ digest = "1:64b78d98b8956492576911baf6a1e3499816d4575e485d12792e4abe7d8b6c46"
name = "github.com/jlaffaye/ftp"
packages = ["."]
+ pruneopts = ""
revision = "2403248fa8cc9f7909862627aa7337f13f8e0bf1"
[[projects]]
+ digest = "1:6f49eae0c1e5dab1dafafee34b207aeb7a42303105960944828c2079b92fc88e"
name = "github.com/jmespath/go-jmespath"
packages = ["."]
+ pruneopts = ""
revision = "0b12d6b5"
[[projects]]
branch = "master"
+ digest = "1:2c5ad58492804c40bdaf5d92039b0cde8b5becd2b7feeb37d7d1cc36a8aa8dbe"
name = "github.com/kardianos/osext"
packages = ["."]
+ pruneopts = ""
revision = "ae77be60afb1dcacde03767a8c37337fad28ac14"
[[projects]]
+ digest = "1:1bea35e6d6ea2712107d20a9770cf331b5c18e17ba02d28011939d9bc7c67534"
name = "github.com/kr/fs"
packages = ["."]
+ pruneopts = ""
revision = "1455def202f6e05b95cc7bfc7e8ae67ae5141eba"
version = "v0.1.0"
[[projects]]
+ digest = "1:81e673df85e765593a863f67cba4544cf40e8919590f04d67664940786c2b61a"
name = "github.com/mattn/go-runewidth"
packages = ["."]
+ pruneopts = ""
revision = "9e777a8366cce605130a531d2cd6363d07ad7317"
version = "v0.0.2"
[[projects]]
branch = "master"
+ digest = "1:1f8bb0521ae032c1e4ba38adb361a1840b81c8bf52bea5fcf900edf44c17f6cb"
name = "github.com/ncw/go-acd"
packages = ["."]
+ pruneopts = ""
revision = "887eb06ab6a255fbf5744b5812788e884078620a"
[[projects]]
+ digest = "1:7a4827b2062a21ba644241bdec27959a5be2670f8aa4038ba14cfe2ce389e8d2"
name = "github.com/ncw/swift"
packages = ["."]
+ pruneopts = ""
revision = "b2a7479cf26fa841ff90dd932d0221cb5c50782d"
version = "v1.0.39"
[[projects]]
branch = "master"
+ digest = "1:1a25d906193d34ce43e96fcab1a2de2b90e0242f9b0c176564db1b268bf48ea5"
name = "github.com/nsf/termbox-go"
packages = ["."]
+ pruneopts = ""
revision = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"
[[projects]]
branch = "master"
+ digest = "1:7cdd61c36e251a51489ac7e73d070e3c67d8c9eb4bebf21a4886d6eec54d909c"
name = "github.com/okzk/sdnotify"
packages = ["."]
- revision = "ed8ca104421a21947710335006107540e3ecb335"
+ pruneopts = ""
+ revision = "d9becc38acbd785892af7637319e2c5e101057f7"
[[projects]]
+ digest = "1:4c0404dc03d974acd5fcd8b8d3ce687b13bd169db032b89275e8b9d77b98ce8c"
name = "github.com/patrickmn/go-cache"
packages = ["."]
+ pruneopts = ""
revision = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"
version = "v2.1.0"
[[projects]]
+ digest = "1:f6a7088857981d9d011920d6340f67d7b7649909918cf1ee6ba293718acc9e26"
name = "github.com/pengsrc/go-shared"
packages = [
"buffer",
"check",
"convert",
"log",
- "reopen"
+ "reopen",
]
+ pruneopts = ""
revision = "807ee759d82c84982a89fb3dc875ef884942f1e5"
version = "v0.2.0"
[[projects]]
+ digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca"
name = "github.com/pkg/errors"
packages = ["."]
+ pruneopts = ""
revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
version = "v0.8.0"
[[projects]]
+ digest = "1:a80af40d2e94dd143f966f7f5968e762a282ea739ba4ecb14d231503c200065b"
name = "github.com/pkg/sftp"
packages = ["."]
+ pruneopts = ""
revision = "57673e38ea946592a59c26592b7e6fbda646975b"
version = "1.8.0"
[[projects]]
+ digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411"
name = "github.com/pmezard/go-difflib"
packages = ["difflib"]
+ pruneopts = ""
revision = "792786c7400a136282c1664665ae0a8db921c6c2"
version = "v1.0.0"
[[projects]]
+ digest = "1:c426863e69173c90404c3d3ad4acde6ff87f9353658a670ac6fdbe08a633750f"
name = "github.com/rfjakob/eme"
packages = ["."]
+ pruneopts = ""
revision = "01668ae55fe0b79a483095689043cce3e80260db"
version = "v1.1"
[[projects]]
+ digest = "1:fd0e88ec70bf0efce538ec8b968a824d992cc60a6cf1539698aa366b3527a053"
name = "github.com/russross/blackfriday"
packages = ["."]
+ pruneopts = ""
revision = "55d61fa8aa702f59229e6cff85793c22e580eaf5"
version = "v1.5.1"
[[projects]]
branch = "master"
+ digest = "1:05dc5c00381eccf0bbc07717248b8757e0e9318877e15e09316fac9b72f1b3ef"
name = "github.com/sevlyar/go-daemon"
packages = ["."]
+ pruneopts = ""
revision = "f9261e73885de99b1647d68bedadf2b9a99ad11f"
[[projects]]
branch = "master"
+ digest = "1:50b5be512f924d289f20e8b2aef8951d98b9bd8c44666cf169514906df597a4c"
name = "github.com/skratchdot/open-golang"
packages = ["open"]
+ pruneopts = ""
revision = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c"
[[projects]]
+ digest = "1:a1403cc8a94b8d7956ee5e9694badef0e7b051af289caad1cf668331e3ffa4f6"
name = "github.com/spf13/cobra"
packages = [
".",
- "doc"
+ "doc",
]
+ pruneopts = ""
revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"
version = "v0.0.3"
[[projects]]
+ digest = "1:8e243c568f36b09031ec18dff5f7d2769dcf5ca4d624ea511c8e3197dc3d352d"
name = "github.com/spf13/pflag"
packages = ["."]
+ pruneopts = ""
revision = "583c0c0531f06d5278b7d917446061adc344b5cd"
version = "v1.0.1"
[[projects]]
+ digest = "1:c587772fb8ad29ad4db67575dad25ba17a51f072ff18a22b4f0257a4d9c24f75"
name = "github.com/stretchr/testify"
packages = [
"assert",
- "require"
+ "require",
]
+ pruneopts = ""
revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
version = "v1.2.2"
[[projects]]
branch = "master"
+ digest = "1:3c0753359567ac0500e17324c4da80398ee773093b4586e46210eea9dc03d155"
name = "github.com/t3rm1n4l/go-mega"
packages = ["."]
+ pruneopts = ""
revision = "854bf31d998b151cf5f94529c815bc4c67322949"
[[projects]]
- branch = "master"
+ digest = "1:afc0b8068986a01e2d8f449917829753a54f6bd4d1265c2b4ad9cba75560020f"
name = "github.com/xanzy/ssh-agent"
packages = ["."]
- revision = "ba9c9e33906f58169366275e3450db66139a31a9"
+ pruneopts = ""
+ revision = "640f0ab560aeb89d523bb6ac322b1244d5c3796c"
+ version = "v0.2.0"
[[projects]]
+ digest = "1:970aab2bde4ae92adf92ccae41eace959c66e2653ebb7e86355477e0307d0be8"
name = "github.com/yunify/qingstor-sdk-go"
packages = [
".",
@@ -326,13 +411,15 @@
"request/signer",
"request/unpacker",
"service",
- "utils"
+ "utils",
]
+ pruneopts = ""
revision = "4f9ac88c5fec7350e960aabd0de1f1ede0ad2895"
version = "v2.2.14"
[[projects]]
branch = "master"
+ digest = "1:419d8420cd7231162a9620ca6bc3b2c9ac98270590773d3f25d90950ccc984cc"
name = "golang.org/x/crypto"
packages = [
"bcrypt",
@@ -349,12 +436,14 @@
"scrypt",
"ssh",
"ssh/agent",
- "ssh/terminal"
+ "ssh/terminal",
]
+ pruneopts = ""
revision = "027cca12c2d63e3d62b670d901e8a2c95854feec"
[[projects]]
branch = "master"
+ digest = "1:5dc6753986b9eeba4abdf05dedc5ba06bb52dad43cc8aad35ffb42bb7adfa68f"
name = "golang.org/x/net"
packages = [
"context",
@@ -368,32 +457,38 @@
"publicsuffix",
"webdav",
"webdav/internal/xml",
- "websocket"
+ "websocket",
]
+ pruneopts = ""
revision = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"
[[projects]]
branch = "master"
+ digest = "1:823e7b6793b3f80b5d01da97211790dc89601937e4b70825fdcb5637ac60f04f"
name = "golang.org/x/oauth2"
packages = [
".",
"google",
"internal",
"jws",
- "jwt"
+ "jwt",
]
+ pruneopts = ""
revision = "1e0a3fa8ba9a5c9eb35c271780101fdaf1b205d7"
[[projects]]
branch = "master"
+ digest = "1:7e5298358e5f751305289e82373c7ac6832bdc492055d6da23c72fa1d8053c3f"
name = "golang.org/x/sys"
packages = [
"unix",
- "windows"
+ "windows",
]
+ pruneopts = ""
revision = "6c888cc515d3ed83fc103cf1d84468aad274b0a7"
[[projects]]
+ digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4"
name = "golang.org/x/text"
packages = [
"collate",
@@ -409,30 +504,36 @@
"unicode/bidi",
"unicode/cldr",
"unicode/norm",
- "unicode/rangetable"
+ "unicode/rangetable",
]
+ pruneopts = ""
revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
version = "v0.3.0"
[[projects]]
branch = "master"
+ digest = "1:55a681cb66f28755765fa5fa5104cbd8dc85c55c02d206f9f89566451e3fe1aa"
name = "golang.org/x/time"
packages = ["rate"]
+ pruneopts = ""
revision = "fbb02b2291d28baffd63558aa44b4b56f178d650"
[[projects]]
branch = "master"
+ digest = "1:7d15746ff4df12481c89fd953a28122fa75368fb1fb1bb1fed918a78647b3c3a"
name = "google.golang.org/api"
packages = [
"drive/v3",
"gensupport",
"googleapi",
"googleapi/internal/uritemplates",
- "storage/v1"
+ "storage/v1",
]
+ pruneopts = ""
revision = "2eea9ba0a3d94f6ab46508083e299a00bbbc65f6"
[[projects]]
+ digest = "1:c1771ca6060335f9768dff6558108bc5ef6c58506821ad43377ee23ff059e472"
name = "google.golang.org/appengine"
packages = [
".",
@@ -444,20 +545,89 @@
"internal/modules",
"internal/remote_api",
"internal/urlfetch",
- "urlfetch"
+ "urlfetch",
]
+ pruneopts = ""
revision = "b1f26356af11148e710935ed1ac8a7f5702c7612"
version = "v1.1.0"
[[projects]]
+ digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2"
name = "gopkg.in/yaml.v2"
packages = ["."]
+ pruneopts = ""
revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
version = "v2.2.1"
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
- inputs-digest = "670cdb55138aa1394b4c8f87345e9be9c8105248edda4be7176dddee2a4f5d26"
+ input-imports = [
+ "bazil.org/fuse",
+ "bazil.org/fuse/fs",
+ "github.com/Azure/azure-storage-blob-go/2018-03-28/azblob",
+ "github.com/Unknwon/goconfig",
+ "github.com/VividCortex/ewma",
+ "github.com/a8m/tree",
+ "github.com/abbot/go-http-auth",
+ "github.com/aws/aws-sdk-go/aws",
+ "github.com/aws/aws-sdk-go/aws/awserr",
+ "github.com/aws/aws-sdk-go/aws/corehandlers",
+ "github.com/aws/aws-sdk-go/aws/credentials",
+ "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds",
+ "github.com/aws/aws-sdk-go/aws/defaults",
+ "github.com/aws/aws-sdk-go/aws/ec2metadata",
+ "github.com/aws/aws-sdk-go/aws/request",
+ "github.com/aws/aws-sdk-go/aws/session",
+ "github.com/aws/aws-sdk-go/service/s3",
+ "github.com/aws/aws-sdk-go/service/s3/s3manager",
+ "github.com/billziss-gh/cgofuse/fuse",
+ "github.com/coreos/bbolt",
+ "github.com/djherbis/times",
+ "github.com/dropbox/dropbox-sdk-go-unofficial/dropbox",
+ "github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/common",
+ "github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/files",
+ "github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/sharing",
+ "github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/users",
+ "github.com/jlaffaye/ftp",
+ "github.com/ncw/go-acd",
+ "github.com/ncw/swift",
+ "github.com/nsf/termbox-go",
+ "github.com/okzk/sdnotify",
+ "github.com/patrickmn/go-cache",
+ "github.com/pkg/errors",
+ "github.com/pkg/sftp",
+ "github.com/rfjakob/eme",
+ "github.com/sevlyar/go-daemon",
+ "github.com/skratchdot/open-golang/open",
+ "github.com/spf13/cobra",
+ "github.com/spf13/cobra/doc",
+ "github.com/spf13/pflag",
+ "github.com/stretchr/testify/assert",
+ "github.com/stretchr/testify/require",
+ "github.com/t3rm1n4l/go-mega",
+ "github.com/xanzy/ssh-agent",
+ "github.com/yunify/qingstor-sdk-go/config",
+ "github.com/yunify/qingstor-sdk-go/request/errors",
+ "github.com/yunify/qingstor-sdk-go/service",
+ "golang.org/x/crypto/nacl/secretbox",
+ "golang.org/x/crypto/scrypt",
+ "golang.org/x/crypto/ssh",
+ "golang.org/x/crypto/ssh/terminal",
+ "golang.org/x/net/context",
+ "golang.org/x/net/html",
+ "golang.org/x/net/http2",
+ "golang.org/x/net/publicsuffix",
+ "golang.org/x/net/webdav",
+ "golang.org/x/net/websocket",
+ "golang.org/x/oauth2",
+ "golang.org/x/oauth2/google",
+ "golang.org/x/sys/unix",
+ "golang.org/x/text/unicode/norm",
+ "golang.org/x/time/rate",
+ "google.golang.org/api/drive/v3",
+ "google.golang.org/api/googleapi",
+ "google.golang.org/api/storage/v1",
+ ]
solver-name = "gps-cdcl"
solver-version = 1
diff --git a/vendor/github.com/okzk/sdnotify/notify.go b/vendor/github.com/okzk/sdnotify/notify.go
index bd1ac59f8..f7d70e0dd 100644
--- a/vendor/github.com/okzk/sdnotify/notify.go
+++ b/vendor/github.com/okzk/sdnotify/notify.go
@@ -2,6 +2,7 @@
package sdnotify
+// SdNotify sends a specified string to the systemd notification socket.
func SdNotify(state string) error {
// do nothing
return nil
diff --git a/vendor/github.com/okzk/sdnotify/notify_linux.go b/vendor/github.com/okzk/sdnotify/notify_linux.go
index 0ca13a145..91d1efac4 100644
--- a/vendor/github.com/okzk/sdnotify/notify_linux.go
+++ b/vendor/github.com/okzk/sdnotify/notify_linux.go
@@ -5,10 +5,11 @@ import (
"os"
)
+// SdNotify sends a specified string to the systemd notification socket.
func SdNotify(state string) error {
name := os.Getenv("NOTIFY_SOCKET")
if name == "" {
- return SdNotifyNoSocket
+ return ErrSdNotifyNoSocket
}
conn, err := net.DialUnix("unixgram", nil, &net.UnixAddr{Name: name, Net: "unixgram"})
diff --git a/vendor/github.com/okzk/sdnotify/sample/main.go b/vendor/github.com/okzk/sdnotify/sample/main.go
index 107a24d85..dd9d49e78 100644
--- a/vendor/github.com/okzk/sdnotify/sample/main.go
+++ b/vendor/github.com/okzk/sdnotify/sample/main.go
@@ -1,24 +1,25 @@
package main
import (
- "github.com/okzk/sdnotify"
"log"
"os"
"os/signal"
"syscall"
"time"
+
+ "github.com/okzk/sdnotify"
)
func reload() {
// Tells the service manager that the service is reloading its configuration.
- sdnotify.SdNotifyReloading()
+ sdnotify.Reloading()
log.Println("reloading...")
time.Sleep(time.Second)
log.Println("reloaded.")
// The service must also send a "READY" notification when it completed reloading its configuration.
- sdnotify.SdNotifyReady()
+ sdnotify.Ready()
}
func main() {
@@ -27,7 +28,16 @@ func main() {
log.Println("started.")
// Tells the service manager that service startup is finished.
- sdnotify.SdNotifyReady()
+ sdnotify.Ready()
+
+ go func() {
+ tick := time.Tick(30 * time.Second)
+ for {
+ <-tick
+ log.Println("watchdog reporting")
+ sdnotify.Watchdog()
+ }
+ }()
sigCh := make(chan os.Signal, 1)
signal.Notify(sigCh, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
@@ -40,7 +50,7 @@ func main() {
}
// Tells the service manager that the service is beginning its shutdown.
- sdnotify.SdNotifyStopping()
+ sdnotify.Stopping()
log.Println("existing...")
time.Sleep(time.Second)
diff --git a/vendor/github.com/okzk/sdnotify/sample/sample.service b/vendor/github.com/okzk/sdnotify/sample/sample.service
index 75b403841..895f8c107 100644
--- a/vendor/github.com/okzk/sdnotify/sample/sample.service
+++ b/vendor/github.com/okzk/sdnotify/sample/sample.service
@@ -6,6 +6,8 @@ Type=notify
ExecStart=/path/to/sample
ExecStop=/bin/kill -SIGTERM $MAINPID
ExecReload=/bin/kill -SIGHUP $MAINPID
+WatchdogSec=60s
+Restart=on-failure
[Install]
WantedBy = multi-user.target
diff --git a/vendor/github.com/okzk/sdnotify/util.go b/vendor/github.com/okzk/sdnotify/util.go
index 78477b8d9..71e1e928b 100644
--- a/vendor/github.com/okzk/sdnotify/util.go
+++ b/vendor/github.com/okzk/sdnotify/util.go
@@ -1,21 +1,39 @@
package sdnotify
-import "errors"
+import (
+ "errors"
+ "fmt"
+)
-var SdNotifyNoSocket = errors.New("No socket")
+// ErrSdNotifyNoSocket is the error returned when the NOTIFY_SOCKET does not exist.
+var ErrSdNotifyNoSocket = errors.New("No socket")
-func SdNotifyReady() error {
+// Ready sends READY=1 to the systemd notify socket.
+func Ready() error {
return SdNotify("READY=1")
}
-func SdNotifyStopping() error {
+// Stopping sends STOPPING=1 to the systemd notify socket.
+func Stopping() error {
return SdNotify("STOPPING=1")
}
-func SdNotifyReloading() error {
+// Reloading sends RELOADING=1 to the systemd notify socket.
+func Reloading() error {
return SdNotify("RELOADING=1")
}
-func SdNotifyStatus(status string) error {
+// Errno sends ERRNO=? to the systemd notify socket.
+func Errno(errno int) error {
+ return SdNotify(fmt.Sprintf("ERRNO=%d", errno))
+}
+
+// Status sends STATUS=? to the systemd notify socket.
+func Status(status string) error {
return SdNotify("STATUS=" + status)
}
+
+// Watchdog sends WATCHDOG=1 to the systemd notify socket.
+func Watchdog() error {
+ return SdNotify("WATCHDOG=1")
+}
diff --git a/vendor/github.com/xanzy/ssh-agent/pageant_windows.go b/vendor/github.com/xanzy/ssh-agent/pageant_windows.go
index 3507b0228..629560796 100644
--- a/vendor/github.com/xanzy/ssh-agent/pageant_windows.go
+++ b/vendor/github.com/xanzy/ssh-agent/pageant_windows.go
@@ -29,8 +29,8 @@ import (
"errors"
"fmt"
"sync"
- . "syscall"
- . "unsafe"
+ "syscall"
+ "unsafe"
)
// Maximum size of message can be sent to pageant
@@ -53,7 +53,7 @@ const (
type copyData struct {
dwData uintptr
cbData uint32
- lpData Pointer
+ lpData unsafe.Pointer
}
var (
@@ -65,7 +65,7 @@ var (
)
func winAPI(dllName, funcName string) func(...uintptr) (uintptr, uintptr, error) {
- proc := MustLoadDLL(dllName).MustFindProc(funcName)
+ proc := syscall.MustLoadDLL(dllName).MustFindProc(funcName)
return func(a ...uintptr) (uintptr, uintptr, error) { return proc.Call(a...) }
}
@@ -96,21 +96,21 @@ func query(msg []byte) ([]byte, error) {
thID, _, _ := winGetCurrentThreadID()
mapName := fmt.Sprintf("PageantRequest%08x", thID)
- pMapName, _ := UTF16PtrFromString(mapName)
+ pMapName, _ := syscall.UTF16PtrFromString(mapName)
- mmap, err := CreateFileMapping(InvalidHandle, nil, PAGE_READWRITE, 0, MaxMessageLen+4, pMapName)
+ mmap, err := syscall.CreateFileMapping(syscall.InvalidHandle, nil, syscall.PAGE_READWRITE, 0, MaxMessageLen+4, pMapName)
if err != nil {
return nil, err
}
- defer CloseHandle(mmap)
+ defer syscall.CloseHandle(mmap)
- ptr, err := MapViewOfFile(mmap, FILE_MAP_WRITE, 0, 0, 0)
+ ptr, err := syscall.MapViewOfFile(mmap, syscall.FILE_MAP_WRITE, 0, 0, 0)
if err != nil {
return nil, err
}
- defer UnmapViewOfFile(ptr)
+ defer syscall.UnmapViewOfFile(ptr)
- mmSlice := (*(*[MaxMessageLen]byte)(Pointer(ptr)))[:]
+ mmSlice := (*(*[MaxMessageLen]byte)(unsafe.Pointer(ptr)))[:]
copy(mmSlice, msg)
@@ -119,10 +119,10 @@ func query(msg []byte) ([]byte, error) {
cds := copyData{
dwData: agentCopydataID,
cbData: uint32(len(mapNameBytesZ)),
- lpData: Pointer(&(mapNameBytesZ[0])),
+ lpData: unsafe.Pointer(&(mapNameBytesZ[0])),
}
- resp, _, _ := winSendMessage(paWin, wmCopydata, 0, uintptr(Pointer(&cds)))
+ resp, _, _ := winSendMessage(paWin, wmCopydata, 0, uintptr(unsafe.Pointer(&cds)))
if resp == 0 {
return nil, ErrSendMessage
@@ -140,7 +140,7 @@ func query(msg []byte) ([]byte, error) {
}
func pageantWindow() uintptr {
- nameP, _ := UTF16PtrFromString("Pageant")
- h, _, _ := winFindWindow(uintptr(Pointer(nameP)), uintptr(Pointer(nameP)))
+ nameP, _ := syscall.UTF16PtrFromString("Pageant")
+ h, _, _ := winFindWindow(uintptr(unsafe.Pointer(nameP)), uintptr(unsafe.Pointer(nameP)))
return h
}