[arch-commits] Commit in docker/trunk (PKGBUILD)

[Sébastien Luttringer]

    Date: Tuesday, January 19, 2021 @ 17:27:10
  Author: seblu
Revision: 823772

upgpkg: docker 1:20.10.2-4

- Revert fix from FS#69258. Introduce another issue.
- Prevent module outside of GOPATH dowloading (GO111MODULE=off)

Modified:
  docker/trunk/PKGBUILD

----------+
 PKGBUILD |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-19 17:27:06 UTC (rev 823771)
+++ PKGBUILD	2021-01-19 17:27:10 UTC (rev 823772)
@@ -3,7 +3,7 @@
 
 pkgname=docker
 pkgver=20.10.2
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
 arch=('x86_64')
@@ -25,7 +25,6 @@
         "git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT"
         "git+https://github.com/docker/buildx.git#commit=$_BUILDX_COMMIT"
         "git+https://github.com/docker/app.git#commit=$_APP_COMMIT"
-        'https://github.com/moby/libnetwork/commit/c3fabc6892002c6cd556c37330eb95d1d84b2d9c.patch'
         "$pkgname.sysusers")
 sha256sums=('SKIP'
             'SKIP'
@@ -33,12 +32,9 @@
             'SKIP'
             'SKIP'
             'SKIP'
-            '0c9e0065b8b67f771971b32bc1a8893f697e8f3c59c5dab5964da8528c8db174'
             '541826011a9836d05a2f42293d5f1beadf2ca8d89fb604487d61a013505678eb')
 
 prepare(){
-  # fix FS#69258
-  patch -d moby/vendor/github.com/docker/libnetwork -p 1 < c3fabc6892002c6cd556c37330eb95d1d84b2d9c.patch
   cd cli
   sed -i 's/-v md2man/-v go-md2man/' scripts/docs/generate-man.sh
   sed -i 's/md2man/go-md2man/' man/md2man-all.sh
@@ -88,6 +84,7 @@
   export CGO_LDFLAGS="${LDFLAGS}"
   export LDFLAGS=''
   export GOFLAGS='-buildmode=pie -trimpath -mod=readonly -modcacherw -ldflags=-linkmode=external'
+  export GO111MODULE=off
 
   ### cli
   echo 'Building cli'