docker: Fix patches

Author: nfnty

docker/docker/PKGBUILD

@@ -21,19 +21,16 @@ _TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
 source=("git+https://github.com/docker/cli.git#tag=v$pkgver"
         "git+https://github.com/moby/moby.git#tag=v$pkgver"
         "git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT"
-        'capabilities.patch'
         'disableresolution.patch'
         "$pkgname.sysusers")
 sha256sums=('4ed0d3d0427cc06c92bacae0a02683ec5bfd7a4705d9ee6082eece90883c16b9'
             'b01447e534d0dd60860227b197f1387067ba74430631fac6a66e9658b1a1c595'
             '28a6641d508f60d47315efb3c85d97360188750a45bd6d3c8737d3f1a2b44121'
             'SKIP'
-            'SKIP'
             '541826011a9836d05a2f42293d5f1beadf2ca8d89fb604487d61a013505678eb')
 
 prepare() {
   cd "${srcdir}/moby"
-  patch --strip=1 --input="${srcdir}/capabilities.patch"
   patch --strip=1 --input="${srcdir}/disableresolution.patch"
 }
 # create a fake go path directory and pushd into it

docker/docker/capabilities.patch

@@ -1,23 +1,32 @@
 diff --git a/daemon/network.go b/daemon/network.go
-index 01b5956adb..eb44df7895 100644
+index 0896378906..4ab7ad55b5 100644
 --- a/daemon/network.go
 +++ b/daemon/network.go
-@@ -10,7 +10,6 @@ import (
- 	"sync"
+@@ -12,7 +12,6 @@ import (
 
- 	"github.com/docker/docker/api/types"
+ 	"github.com/containerd/log"
+ 	"github.com/docker/docker/api/types/backend"
 -	containertypes "github.com/docker/docker/api/types/container"
+ 	"github.com/docker/docker/api/types/events"
  	"github.com/docker/docker/api/types/filters"
- 	"github.com/docker/docker/api/types/network"
- 	"github.com/docker/docker/container"
-@@ -860,9 +859,7 @@ func buildCreateEndpointOptions(c *container.Container, n libnetwork.Network, ep
- 		createOptions = append(createOptions, libnetwork.CreateOptionService(svcCfg.Name, svcCfg.ID, net.ParseIP(vip), portConfigs, svcCfg.Aliases[n.ID()]))
+ 	networktypes "github.com/docker/docker/api/types/network"
+@@ -815,8 +814,6 @@ func buildCreateEndpointOptions(c *container.Container, n *libnetwork.Network, e
+ 	var createOptions []libnetwork.EndpointOption
+ 	var genericOptions = make(options.Generic)
+ 
+-	nwName := n.Name()
+-
+ 	if epConfig != nil {
+ 		if ipam := epConfig.IPAMConfig; ipam != nil {
+ 			var ipList []net.IP
+@@ -877,9 +874,7 @@ func buildCreateEndpointOptions(c *container.Container, n *libnetwork.Network, e
+ 		createOptions = append(createOptions, libnetwork.CreateOptionService(svcCfg.Name, svcCfg.ID, vip, portConfigs, svcCfg.Aliases[nwID]))
  	}
 
--	if !containertypes.NetworkMode(n.Name()).IsUserDefined() {
+-	if !containertypes.NetworkMode(nwName).IsUserDefined() {
 -		createOptions = append(createOptions, libnetwork.CreateOptionDisableResolution())
 -	}
 +	createOptions = append(createOptions, libnetwork.CreateOptionDisableResolution())
 
- 	// configs that are applicable only for the endpoint in the network
- 	// to which container was connected to on docker run.
+ 	epOpts, err := buildPortsRelatedCreateEndpointOptions(c, n, sb)
+ 	if err != nil {