From 7761a4672ef76278c09608436ffd1ccd9136935c Mon Sep 17 00:00:00 2001
From: Gyu-Ho Lee <gyuhox@gmail.com>
Date: Mon, 11 Sep 2017 14:53:37 -0700
Subject: [PATCH] vendor: upgrade go-systemd to v15, remove cockroachdb/cmux

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
---
 cmd/vendor/github.com/coreos/go-systemd/util/util_cgo.go | 5 +++--
 glide.lock                                               | 8 +++-----
 glide.yaml                                               | 4 +---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/cmd/vendor/github.com/coreos/go-systemd/util/util_cgo.go b/cmd/vendor/github.com/coreos/go-systemd/util/util_cgo.go
index 22c0d6099df..6269bc73236 100644
--- a/cmd/vendor/github.com/coreos/go-systemd/util/util_cgo.go
+++ b/cmd/vendor/github.com/coreos/go-systemd/util/util_cgo.go
@@ -122,11 +122,12 @@ func runningFromSystemService() (ret bool, err error) {
 	errno := C.my_sd_pid_get_owner_uid(sd_pid_get_owner_uid, 0, &uid)
 	serrno := syscall.Errno(-errno)
 	// when we're running from a unit file, sd_pid_get_owner_uid returns
-	// ENOENT (systemd <220) or ENXIO (systemd >=220)
+	// ENOENT (systemd <220), ENXIO (systemd 220-223), or ENODATA
+	// (systemd >=234)
 	switch {
 	case errno >= 0:
 		ret = false
-	case serrno == syscall.ENOENT, serrno == syscall.ENXIO:
+	case serrno == syscall.ENOENT, serrno == syscall.ENXIO, serrno == syscall.ENODATA:
 		// Since the implementation of sessions in systemd relies on
 		// the `pam_systemd` module, using the sd_pid_get_owner_uid
 		// heuristic alone can result in false positives if that module
diff --git a/glide.lock b/glide.lock
index 306456f810c..37a3eb6c543 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 680fead4df2e814f315fb1111c187f500faf7d9573295e331876a46aa126f8f7
-updated: 2017-09-06T14:59:05.315378166-07:00
+hash: f12c87d509e99534547e948533b8e8a88043c2261c0be08f155a26cd920b5fd4
+updated: 2017-09-11T14:52:48.727295105-07:00
 imports:
 - name: github.com/beorn7/perks
   version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
@@ -7,8 +7,6 @@ imports:
   - quantile
 - name: github.com/bgentry/speakeasy
   version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd
-- name: github.com/cockroachdb/cmux
-  version: 112f0506e7743d64a6eb8fedbcff13d9979bbf92
 - name: github.com/coreos/bbolt
   version: e1c92081e510bb6b2bbfc93e7e6bd0b6dabd3e12
 - name: github.com/coreos/go-semver
@@ -16,7 +14,7 @@ imports:
   subpackages:
   - semver
 - name: github.com/coreos/go-systemd
-  version: 48702e0da86bd25e76cfef347e2adeb434a0d0a6
+  version: d2196463941895ee908e13531a23a39feb9e1243
   subpackages:
   - daemon
   - journal
diff --git a/glide.yaml b/glide.yaml
index b4402f5c491..3a935d09895 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -6,14 +6,12 @@ import:
   version: v0.1.0
 - package: github.com/coreos/bbolt
   version: v1.3.1-coreos.1
-- package: github.com/cockroachdb/cmux
-  version: 112f0506e7743d64a6eb8fedbcff13d9979bbf92
 - package: github.com/coreos/go-semver
   version: v0.2.0
   subpackages:
   - semver
 - package: github.com/coreos/go-systemd
-  version: v14
+  version: v15
   subpackages:
   - daemon
   - journal