From 431601b65011c2ec1fb0b0921e5c6abf66c697cc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Sat, 18 Jun 2016 14:10:15 +0300
Subject: [PATCH] drop lxc-docker-nosha.patch

unclear why it was added and no longer applies
refs 98d3177ce0572141448422243831bebffb4c2a0e
---
 docker.spec            |  2 --
 lxc-docker-nosha.patch | 27 ---------------------------
 2 files changed, 29 deletions(-)
 delete mode 100644 lxc-docker-nosha.patch

diff --git a/docker.spec b/docker.spec
index eb2207a..3282c62 100644
--- a/docker.spec
+++ b/docker.spec
@@ -49,7 +49,6 @@ Suggests:	libcgroup
 Suggests:	xz >= 1:4.9
 Provides:	group(docker)
 Obsoletes:	lxc-docker < 1.1.1
-Patch0:		lxc-%{name}-nosha.patch
 # only runs on x64 hosts for now:
 # https://github.com/docker/docker/issues/136
 # https://github.com/docker/docker/issues/611
@@ -113,7 +112,6 @@ This plugin provides syntax highlighting in Dockerfile.
 
 %prep
 %setup -q -a1 -a2
-#%patch0 -p1 why is this patch needed?
 
 mv runc-%{runc_commit}* runc
 mv containerd-%{containerd_commit}* containerd
diff --git a/lxc-docker-nosha.patch b/lxc-docker-nosha.patch
deleted file mode 100644
index 2ab4972..0000000
--- a/lxc-docker-nosha.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Only in docker-0.7.0/: build
-diff -ur docker-0.7.0-o/utils/utils.go docker-0.7.0/utils/utils.go
---- docker-0.7.0-o/utils/utils.go	2013-11-26 01:09:45.000000000 -0700
-+++ docker-0.7.0/utils/utils.go	2013-11-28 12:39:38.000000000 -0700
-@@ -272,10 +272,6 @@
- // Figure out the path of our dockerinit (which may be SelfPath())
- func DockerInitPath(localCopy string) string {
- 	selfPath := SelfPath()
--	if isValidDockerInitPath(selfPath, selfPath) {
--		// if we're valid, don't bother checking anything else
--		return selfPath
--	}
- 	var possibleInits = []string{
- 		localCopy,
- 		filepath.Join(filepath.Dir(selfPath), "dockerinit"),
-@@ -291,9 +287,7 @@
- 				// LookPath already validated that this file exists and is executable (following symlinks), so how could Abs fail?
- 				panic(err)
- 			}
--			if isValidDockerInitPath(path, selfPath) {
--				return path
--			}
-+            return path
- 		}
- 	}
- 	return ""
-Only in docker-0.7.0/utils: utils.go~
-- 
2.43.0