diff --git a/docker.changes b/docker.changes index c054efe..3850fa4 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 18 15:44:11 UTC 2016 - jmassaguerpla@suse.com + +- Remove gcc5_socker_workaround.patch: This patch is not needed anymore + since gcc5 has been updated in all platforms + ------------------------------------------------------------------- Mon Apr 18 06:19:18 UTC 2016 - asarai@suse.de diff --git a/docker.spec b/docker.spec index 28e0798..9752376 100644 --- a/docker.spec +++ b/docker.spec @@ -47,7 +47,6 @@ Source7: README_SUSE.md Source8: docker-audit.rules # TODO: remove once we figure out what is wrong with iptables on ppc64le Source100: sysconfig.docker.ppc64le -Patch1: gcc5_socket_workaround.patch %if 0%{?is_opensuse} # nothing %else @@ -160,7 +159,6 @@ Test package for docker. It contains the source code and the tests. %if 0%{?is_opensuse} # nothing %else -%patch1 -p1 %patch200 -p1 %endif %ifnarch %go_arches diff --git a/gcc5_socket_workaround.patch b/gcc5_socket_workaround.patch deleted file mode 100644 index 8b7a4df..0000000 --- a/gcc5_socket_workaround.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: docker-1.11.0/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go -=================================================================== ---- docker-1.11.0.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go -+++ docker-1.11.0/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go -@@ -24,7 +24,7 @@ type ifreqIndex struct { - - type ifreqHwaddr struct { - IfrnName [ifNameSize]byte -- IfruHwaddr syscall.RawSockaddr -+ IfruHwaddr patchedRawSockAddr - } - - var rnd = rand.New(rand.NewSource(time.Now().UnixNano())) -Index: docker-1.11.0/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_ppc64xe_type.go -=================================================================== ---- /dev/null -+++ docker-1.11.0/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]int8 -+} -Index: docker-1.11.0/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_type.go -=================================================================== ---- /dev/null -+++ docker-1.11.0/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 -+}