kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 0.12.0

Browse source 
Changes:	https://github.com/GoogleContainerTools/container-diff/releases
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2018-11-18 20:36:52 +00:00
parent bf026c4ce7
commit ba40de9546
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=485261
4 changed files with 17 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sysutils/container-diff/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= container-diff
PORTVERSION= 0.11.0
PORTVERSION= 0.12.0
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
@ -12,9 +12,10 @@ COMMENT= Diff your Docker containers
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT}
USES= go
GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT}
PLIST_FILES= bin/container-diff
GH_ACCOUNT= GoogleContainerTools

6
sysutils/container-diff/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1530209843
SHA256 (GoogleContainerTools-container-diff-v0.11.0_GH0.tar.gz) = b86361c6cd091c0d25809743f7ca883b856438a20b9e100c1925638c8296698d
SIZE (GoogleContainerTools-container-diff-v0.11.0_GH0.tar.gz) = 2314230
TIMESTAMP = 1538662056
SHA256 (GoogleContainerTools-container-diff-v0.12.0_GH0.tar.gz) = 3f457c62073fac50493e7e237c247b30e1d1209ffb4c5b703def1a07a7822376
SIZE (GoogleContainerTools-container-diff-v0.12.0_GH0.tar.gz) = 1976629

53
sysutils/container-diff/files/patch-uint32-Ino
View file

@ -1,53 +0,0 @@
--- vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2017-12-27 17:49:24 UTC
+++ vendor/github.com/docker/docker/pkg/archive/archive_unix.go
@@ -58,7 +58,7 @@ func setHeaderForSpecialDevice(hdr *tar.
return
}
-func getInodeFromStat(stat interface{}) (inode uint64, err error) {
+func getInodeFromStat(stat interface{}) (inode uint32, err error) {
s, ok := stat.(*syscall.Stat_t)
if ok {
--- vendor/github.com/docker/docker/pkg/archive/archive.go.orig 2017-12-27 17:49:24 UTC
+++ vendor/github.com/docker/docker/pkg/archive/archive.go
@@ -378,7 +378,7 @@ type tarAppender struct {
Buffer *bufio.Writer
// for hardlink mapping
- SeenFiles map[uint64]string
+ SeenFiles map[uint32]string
IDMappings *idtools.IDMappings
ChownOpts *idtools.IDPair
@@ -391,7 +391,7 @@ type tarAppender struct {
func newTarAppender(idMapping *idtools.IDMappings, writer io.Writer, chownOpts *idtools.IDPair) *tarAppender {
return &tarAppender{
- SeenFiles: make(map[uint64]string),
+ SeenFiles: make(map[uint32]string),
TarWriter: tar.NewWriter(writer),
Buffer: pools.BufioWriter32KPool.Get(nil),
IDMappings: idMapping,
--- vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig 2017-12-27 17:49:24 UTC
+++ vendor/github.com/docker/docker/pkg/archive/changes_unix.go
@@ -28,7 +28,7 @@ func (info *FileInfo) isDir() bool {
return info.parent == nil || info.stat.Mode()&unix.S_IFDIR != 0
}
-func getIno(fi os.FileInfo) uint64 {
+func getIno(fi os.FileInfo) uint32 {
return fi.Sys().(*syscall.Stat_t).Ino
}
--- vendor/github.com/docker/docker/pkg/archive/changes.go.orig 2017-12-27 17:49:24 UTC
+++ vendor/github.com/docker/docker/pkg/archive/changes.go
@@ -363,7 +363,7 @@ func ChangesDirs(newDir, oldDir string)
func ChangesSize(newDir string, changes []Change) int64 {
var (
size int64
- sf = make(map[uint64]struct{})
+ sf = make(map[uint32]struct{})
)
for _, change := range changes {
if change.Kind == ChangeModify || change.Kind == ChangeAdd {

11
sysutils/container-diff/files/patch-vendor-github.com-docker-docker-pkg-mount-mountinfo_freebsd.go Normal file
View file

@ -0,0 +1,11 @@
--- 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
}