- 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:
parent
a421f515c9
commit
fc77975fbd
@ -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
|
Wed Dec 23 10:47:04 UTC 2015 - fcastelli@suse.com
|
||||||
|
|
||||||
- Add rules for auditd. This is required to fix bnc#959405
|
- Add rules for auditd. This is required to fix bnc#959405
|
||||||
|
10
docker.spec
10
docker.spec
@ -158,7 +158,16 @@ Test package for docker. It contains the source code and the tests.
|
|||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -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
|
%patch5 -p1
|
||||||
|
%endif
|
||||||
%ifnarch %go_arches
|
%ifnarch %go_arches
|
||||||
%patch100 -p1
|
%patch100 -p1
|
||||||
%patch101 -p0
|
%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
|
install -D -m755 bundles/%{version}/dyngccgo/dockerinit-%{version} %{buildroot}/%{_prefix}/lib/docker/dockerinit
|
||||||
%endif
|
%endif
|
||||||
install -d %{buildroot}/%{_prefix}/lib/docker
|
install -d %{buildroot}/%{_prefix}/lib/docker
|
||||||
install -D -m755 bundles/%{version}/dynbinary/dockerinit-%{version} %{buildroot}/%{_prefix}/lib/docker/dockerinit
|
|
||||||
install -Dd -m 0755 \
|
install -Dd -m 0755 \
|
||||||
%{buildroot}%{_sysconfdir}/init.d \
|
%{buildroot}%{_sysconfdir}/init.d \
|
||||||
%{buildroot}%{_sbindir}
|
%{buildroot}%{_sbindir}
|
||||||
|
@ -26,7 +26,7 @@ index 0000000..118f7bf
|
|||||||
+
|
+
|
||||||
+type patchedRawSockAddr struct {
|
+type patchedRawSockAddr struct {
|
||||||
+ Family uint16
|
+ 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
|
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
|
new file mode 100644
|
||||||
|
Loading…
Reference in New Issue
Block a user