From nobody Sat Mar 09 14:10:41 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsQ1F3qTlz5DFfx; Sat, 9 Mar 2024 14:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TsQ1F21Wqz4r2M; Sat, 9 Mar 2024 14:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAvZc3+J9nepwfDxS1TjS+WLOmamLDFRSC9zyPQtsjE=; b=tHrL139ypnM2tXt87R9cIOLot2iXh6ZnVWACUcvSIx0IVAotgiGGeFfnyneO95wRpze0j3 f1caiMZiOaMmMqR7MVdySitwM8ksj6vwo3ifHFMNwNR/SIVtUmThz3/on85oWSlMPUWCKr 7ionKyUo8xKCJtHoNX2prIN3e2Vw02Ct/pYwarRnMSgDRSqlvoy0nV5pPn6D5yuUBXiN8L PpF5aUd5xGmShtPFdRed150vzqu5JqRbbmAG3oPMA+R8QMfy7caXVbS7zRwMtYqe8MfR0t syoeSxCcEkhwF9CCiAuce8jTzsE1U5sbgv9mBU+l4oB4NCG+9CwDfJEe6of63w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709993441; a=rsa-sha256; cv=none; b=DGmI673NvNYLByf0NsxnKkppACrN1OhpWRq7MEPVD59yjautlTQ8rPAQQoODp5KJh8wBE2 Hah2eeWjq6Sc8pxzDP4POpIe9R9H911c+Py9sgdwnNv7h7MR+83Guc5uYylqUN53MshT97 OWzCi+ZRU0Dvkg5YIm454QO9oePvPNF7Tvszx2rSKT43Oy3E+aOs4sw9M2lDYpgCr1CVoS h7hiYTqE0qQfjEMDQ7aOmVmiWND+3lFWg36f9b+NohmOMR8dFykNlfpZWorqkNmM4wz/Uz ic36KhqnefRM4dcxiTgEA0lEhfl4BVmRX/5Sjqd4JWw2SkW9vHTVZ2FtJ+8H5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAvZc3+J9nepwfDxS1TjS+WLOmamLDFRSC9zyPQtsjE=; b=WUcUtdwuTVGOx/TtveBO3mBBqWiSdJLvbbgjZKHGFpvvBIZH3BSg1OKYtHdIDbe2xwyJiN f6QwhLFAWjiSrO7gcVd81mjJZf2kXYqyM+0E37Xed8mtuR74uOWBNw7YMbQ+SvVe3NYdfc /gc1ROjKObNoeQQjJNhPLYPJ2HTC441xKsG3HNqQOT67w2ETQBtkYeXkJIdsFDKFfTZkQp lRqCLaaakxV5TOFAMVVxyLRURy2aHoLyG9AAdzpga31pABFvZ3vFlZtqE2swq0tbCWEIYZ viKsvDEpo4p4yFdsS21EyQsRytmL3nRWdg53lKv0K13EKHqTSPluEh3jglDwyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsQ1F1SKMz14XQ; Sat, 9 Mar 2024 14:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 429EAfYe003838; Sat, 9 Mar 2024 14:10:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 429EAf7V003835; Sat, 9 Mar 2024 14:10:41 GMT (envelope-from git) Date: Sat, 9 Mar 2024 14:10:41 GMT Message-Id: <202403091410.429EAf7V003835@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: fbfa40129d8f - main - sysutils/container-diff: Update to 0.19.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbfa40129d8ff5d15fe21f3f3664b6992a1c02e7 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=fbfa40129d8ff5d15fe21f3f3664b6992a1c02e7 commit fbfa40129d8ff5d15fe21f3f3664b6992a1c02e7 Author: Po-Chuan Hsieh AuthorDate: 2024-03-09 13:45:47 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-03-09 14:05:28 +0000 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 +++++----- ...ithub.com-docker-docker-pkg-mount-mountinfo_freebsd.go | 11 ----------- ...ch-vendor-github.com-docker-docker-pkg-system-mknod.go | 11 ----------- ...souza-go-dockerclient-internal-archive-archive_unix.go | 11 ----------- 5 files changed, 8 insertions(+), 50 deletions(-) diff --git a/sysutils/container-diff/Makefile b/sysutils/container-diff/Makefile index 8cb33d6491be..aaa772e82350 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 27fa135fe32c..457d06998e97 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 090910c28702..000000000000 --- 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 7c36b7495ac7..000000000000 --- 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 0205c50ecd48..000000000000 --- 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