- gcc5-go in Tumbleweed includes this commit

a850225433
  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
This commit is contained in:
Jordi Massaguer 2016-01-21 16:53:25 +00:00 committed by Git OBS Bridge
parent a421f515c9
commit fc77975fbd
3 changed files with 24 additions and 2 deletions

View File

@ -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

View File

@ -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}

View File

@ -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