From fc77975fbd5c3863b34a4fce4d2d394f6033fce654579329ade8b125ddb0e1f5 Mon Sep 17 00:00:00 2001
From: Jordi Massaguer <jmassaguerpla@suse.com>
Date: Thu, 21 Jan 2016 16:53:25 +0000
Subject: [PATCH] - gcc5-go in Tumbleweed includes this commit  
 https://github.com/golang/gofrontend/commit/a850225433a66a58613c22185c3b09626f5545eb
   Which "fixes" the data type for RawSockaddr.Data   However, docker now
 expects the "wrong" data type, since docker had a workaround   for that
 issue.   Thus, we need to workaround the workaroundn in tumbleweed - There
 was an error in one of the file list

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=54
---
 docker.changes               | 14 ++++++++++++++
 docker.spec                  | 10 +++++++++-
 gcc5_socket_workaround.patch |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/docker.changes b/docker.changes
index 5fe194c..20bc487 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Jan 21 16:52:41 UTC 2016 - jmassaguerpla@suse.com
+
+- gcc5-go in Tumbleweed includes this commit
+  https://github.com/golang/gofrontend/commit/a850225433a66a58613c22185c3b09626f5545eb
+  Which "fixes" the data type for RawSockaddr.Data
+  However, docker now expects the "wrong" data type, since docker had a workaround
+  for that issue.
+  Thus, we need to workaround the workaroundn in tumbleweed
+
+- There was an error in one of the file list
+  
+ 
+-------------------------------------------------------------------
 Wed Dec 23 10:47:04 UTC 2015 - fcastelli@suse.com
 
 - Add rules for auditd. This is required to fix bnc#959405
diff --git a/docker.spec b/docker.spec
index d14e9d0..11c6458 100644
--- a/docker.spec
+++ b/docker.spec
@@ -158,7 +158,16 @@ Test package for docker. It contains the source code and the tests.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+# 1330 is Tumbleweed after leap has been released
+# gcc5-go in Tumbleweed includes this commit
+# https://github.com/golang/gofrontend/commit/a850225433a66a58613c22185c3b09626f5545eb
+# Which "fixes" the data type for RawSockaddr.Data
+# However, docker now expects the "wrong" data type, since docker had a workaround
+# for that issue.
+# Thus, we need to workaround the workaroundn in tumbleweed
+%if 0%{suse_version} >= 1330 && 0%{is_opensuse} == 1
 %patch5 -p1
+%endif
 %ifnarch %go_arches
 %patch100 -p1
 %patch101 -p0
@@ -207,7 +216,6 @@ install -D -m755 bundles/%{version}/dyngccgo/%{name}-%{version} %{buildroot}/%{_
 install -D -m755 bundles/%{version}/dyngccgo/dockerinit-%{version} %{buildroot}/%{_prefix}/lib/docker/dockerinit
 %endif
 install -d %{buildroot}/%{_prefix}/lib/docker
-install -D -m755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}/%{_prefix}/lib/docker/dockerinit
 install -Dd -m 0755 \
    %{buildroot}%{_sysconfdir}/init.d \
    %{buildroot}%{_sbindir}
diff --git a/gcc5_socket_workaround.patch b/gcc5_socket_workaround.patch
index ac23d8e..1f5b9d3 100644
--- a/gcc5_socket_workaround.patch
+++ b/gcc5_socket_workaround.patch
@@ -26,7 +26,7 @@ index 0000000..118f7bf
 +
 +type patchedRawSockAddr struct {
 +	Family uint16
-+	Data   [14]uint8
++	Data   [14]int8
 +}
 diff --git a/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_type.go b/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_type.go
 new file mode 100644