From 189a728725c03009e6f996979bf2ba59a7cba4ca Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 20 Mar 2018 04:09:22 +0100
Subject: [PATCH 1/2] Use ContainsAny instead of IndexAny

---
 unit/deserialize.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unit/deserialize.go b/unit/deserialize.go
index bf972805..c0c06bdf 100644
--- a/unit/deserialize.go
+++ b/unit/deserialize.go
@@ -88,7 +88,7 @@ func (l *lexer) lex() {
 				l.errchan <- err
 				return
 			}
-			if bytes.IndexAny(line, SYSTEMD_NEWLINE) == -1 {
+			if !bytes.ContainsAny(line, SYSTEMD_NEWLINE) {
 				l.errchan <- ErrLineTooLong
 				return
 			}

From 78271965de08c47c7b0fa824cee95e7a1f5818dc Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Wed, 23 May 2018 17:49:36 +0200
Subject: [PATCH 2/2] GO15VENDOREXPERIMENT is obsolete as we now require Go 1.7

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ce6cb2bc..881b94f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,6 @@ env:
   global:
     - IMPORTPATH=github.com/coreos/go-systemd
     - GOPATH=/opt
-    - GO15VENDOREXPERIMENT=1
     - DEP_BINDIR=/tmp
     - BUILD_DIR=/opt/src/github.com/coreos/go-systemd
   matrix: