drop lxc-docker-nosha.patch

unclear why it was added and no longer applies
refs 98d3177ce0572141448422243831bebffb4c2a0e

diff --git a/docker.spec b/docker.spec
index eb2207a5465e337d6e0983f0f92c9ace37ca6cff..3282c6275a776525afe45a4d00365687125ea7bd 100644 (file)
--- 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 (file)
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~