From a421f515c9d7cbecf6a3ddb6b5b015011f002c7b3d9580efadd668fb61f1c12d Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Thu, 21 Jan 2016 15:15:06 +0000 Subject: [PATCH] add the patch for the previous fix that I forgot OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=53 --- gcc5_socket_workaround.patch | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 gcc5_socket_workaround.patch diff --git a/gcc5_socket_workaround.patch b/gcc5_socket_workaround.patch new file mode 100644 index 0000000..ac23d8e --- /dev/null +++ b/gcc5_socket_workaround.patch @@ -0,0 +1,46 @@ +diff --git a/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go b/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go +index 007ccb2..65f638f 100644 +--- a/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go ++++ b/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go +@@ -22,7 +22,7 @@ type ifreqIndex struct { + + type ifreqHwaddr struct { + IfrnName [ifNameSize]byte +- IfruHwaddr syscall.RawSockaddr ++ IfruHwaddr patchedRawSockAddr + } + + var rnd = rand.New(rand.NewSource(time.Now().UnixNano())) +diff --git a/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_ppc64xe_type.go b/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_ppc64xe_type.go +new file mode 100644 +index 0000000..118f7bf +--- /dev/null ++++ b/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_ppc64xe_type.go +@@ -0,0 +1,11 @@ ++// Copyright (c) 2015 SUSE LLC. All rights reserved. ++ ++// +build linux ++// +build ppc64 ppc64le ++ ++package bridge ++ ++type patchedRawSockAddr struct { ++ Family uint16 ++ Data [14]uint8 ++} +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 +index 0000000..cdba329 +--- /dev/null ++++ b/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_type.go +@@ -0,0 +1,10 @@ ++// Copyright (c) 2015 SUSE LLC. All rights reserved. ++ ++// +build linux,!ppc64,!ppc64le ++ ++package bridge ++ ++type patchedRawSockAddr struct { ++ Family uint16 ++ Data [14]int8 ++}