From fbfa40129d8ff5d15fe21f3f3664b6992a1c02e7 Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh Date: Sat, 9 Mar 2024 21:45:47 +0800 Subject: [PATCH] sysutils/container-diff: Update to 0.19.0 - Convert to USES=go:modules Changes: https://github.com/GoogleContainerTools/container-diff/releases --- sysutils/container-diff/Makefile | 15 +++------------ sysutils/container-diff/distinfo | 10 +++++----- ...m-docker-docker-pkg-mount-mountinfo_freebsd.go | 11 ----------- ...r-github.com-docker-docker-pkg-system-mknod.go | 11 ----------- ...-dockerclient-internal-archive-archive_unix.go | 11 ----------- 5 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 sysutils/container-diff/files/patch-vendor-github.com-docker-docker-pkg-mount-mountinfo_freebsd.go delete mode 100644 sysutils/container-diff/files/patch-vendor-github.com-docker-docker-pkg-system-mknod.go delete mode 100644 sysutils/container-diff/files/patch-vendor-github.com-fsouza-go-dockerclient-internal-archive-archive_unix.go diff --git a/sysutils/container-diff/Makefile b/sysutils/container-diff/Makefile index 8cb33d6491bee..aaa772e823509 100644 --- a/sysutils/container-diff/Makefile +++ b/sysutils/container-diff/Makefile @@ -1,7 +1,6 @@ PORTNAME= container-diff -PORTVERSION= 0.17.0 +PORTVERSION= 0.19.0 DISTVERSIONPREFIX= v -PORTREVISION= 17 CATEGORIES= sysutils MAINTAINER= sunpoet@FreeBSD.org @@ -11,18 +10,10 @@ WWW= https://github.com/GoogleContainerTools/container-diff LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go +USES= go:modules -GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} +GO_MODULE= github.com/GoogleContainerTools/container-diff PLIST_FILES= bin/container-diff -USE_GITHUB= yes -GH_TUPLE= GoogleContainerTools:container-diff:v${PORTVERSION} \ - golang:sys:v0.6.0:sys - -pre-patch: - @${RM} -r ${WRKSRC}/vendor/golang.org/x/sys - @${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys - .include diff --git a/sysutils/container-diff/distinfo b/sysutils/container-diff/distinfo index 27fa135fe32cf..457d06998e97b 100644 --- a/sysutils/container-diff/distinfo +++ b/sysutils/container-diff/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1678535597 -SHA256 (GoogleContainerTools-container-diff-v0.17.0_GH0.tar.gz) = b1d909c4eff0e3355ba45516daddef0adfa4cdcd0c8b41863060c66f524353f9 -SIZE (GoogleContainerTools-container-diff-v0.17.0_GH0.tar.gz) = 2565245 -SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 -SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234 +TIMESTAMP = 1709390414 +SHA256 (go/sysutils_container-diff/container-diff-v0.19.0/v0.19.0.mod) = 1bc35c03f60e0fb977f4f642f51ceb035657f329debee26263d5fc11ae676945 +SIZE (go/sysutils_container-diff/container-diff-v0.19.0/v0.19.0.mod) = 2775 +SHA256 (go/sysutils_container-diff/container-diff-v0.19.0/v0.19.0.zip) = a8398fb898b1361a1d6ee43aa269249cda6291128bba482ffc52207df2ebe8f8 +SIZE (go/sysutils_container-diff/container-diff-v0.19.0/v0.19.0.zip) = 413617 diff --git a/sysutils/container-diff/files/patch-vendor-github.com-docker-docker-pkg-mount-mountinfo_freebsd.go b/sysutils/container-diff/files/patch-vendor-github.com-docker-docker-pkg-mount-mountinfo_freebsd.go deleted file mode 100644 index 090910c287026..0000000000000 --- a/sysutils/container-diff/files/patch-vendor-github.com-docker-docker-pkg-mount-mountinfo_freebsd.go +++ /dev/null @@ -1,11 +0,0 @@ ---- vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig 2018-10-02 00:39:19 UTC -+++ vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go -@@ -37,7 +37,7 @@ func parseMountTable(filter FilterFunc) - - if filter != nil { - // filter out entries we're not interested in -- skip, stop = filter(p) -+ skip, stop = filter(&mountinfo) - if skip { - continue - } diff --git a/sysutils/container-diff/files/patch-vendor-github.com-docker-docker-pkg-system-mknod.go b/sysutils/container-diff/files/patch-vendor-github.com-docker-docker-pkg-system-mknod.go deleted file mode 100644 index 7c36b7495ac73..0000000000000 --- a/sysutils/container-diff/files/patch-vendor-github.com-docker-docker-pkg-system-mknod.go +++ /dev/null @@ -1,11 +0,0 @@ ---- vendor/github.com/docker/docker/pkg/system/mknod.go.orig 2018-10-30 20:25:08 UTC -+++ vendor/github.com/docker/docker/pkg/system/mknod.go -@@ -8,7 +8,7 @@ import ( - - // Mknod creates a filesystem node (file, device special file or named pipe) named path - // with attributes specified by mode and dev. --func Mknod(path string, mode uint32, dev int) error { -+func Mknod(path string, mode uint32, dev uint64) error { - return unix.Mknod(path, mode, dev) - } - diff --git a/sysutils/container-diff/files/patch-vendor-github.com-fsouza-go-dockerclient-internal-archive-archive_unix.go b/sysutils/container-diff/files/patch-vendor-github.com-fsouza-go-dockerclient-internal-archive-archive_unix.go deleted file mode 100644 index 0205c50ecd484..0000000000000 --- a/sysutils/container-diff/files/patch-vendor-github.com-fsouza-go-dockerclient-internal-archive-archive_unix.go +++ /dev/null @@ -1,11 +0,0 @@ ---- vendor/github.com/fsouza/go-dockerclient/internal/archive/archive_unix.go.orig 2019-02-19 22:02:30 UTC -+++ vendor/github.com/fsouza/go-dockerclient/internal/archive/archive_unix.go -@@ -42,7 +42,7 @@ func getInodeFromStat(stat interface{}) - s, ok := stat.(*syscall.Stat_t) - - if ok { -- inode = s.Ino -+ inode = uint64(s.Ino) - } - - return