From owner-svn-ports-all@freebsd.org Sun Jan 14 07:07:09 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4466EEA51F6; Sun, 14 Jan 2018 07:07:09 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1EB5C6F658; Sun, 14 Jan 2018 07:07:09 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 783651E6DD; Sun, 14 Jan 2018 07:07:08 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0E778In097170; Sun, 14 Jan 2018 07:07:08 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0E7784m097168; Sun, 14 Jan 2018 07:07:08 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201801140707.w0E7784m097168@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 14 Jan 2018 07:07:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458955 - in head/sysutils/container-diff: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/sysutils/container-diff: . files X-SVN-Commit-Revision: 458955 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jan 2018 07:07:09 -0000 Author: sunpoet Date: Sun Jan 14 07:07:08 2018 New Revision: 458955 URL: https://svnweb.freebsd.org/changeset/ports/458955 Log: Fix build on -head (OSVERSION >= 1200031) Ino is still uint32 for all versions of FreeBSD. Reference: https://golang.org/src/syscall/ztypes_freebsd_386.go https://golang.org/src/syscall/ztypes_freebsd_amd64.go https://golang.org/src/syscall/ztypes_freebsd_arm.go Added: head/sysutils/container-diff/files/patch-uint32-Ino - copied unchanged from r458954, head/sysutils/container-diff/files/extra-patch-without-ino64 Deleted: head/sysutils/container-diff/files/extra-patch-without-ino64 Modified: head/sysutils/container-diff/Makefile Modified: head/sysutils/container-diff/Makefile ============================================================================== --- head/sysutils/container-diff/Makefile Sun Jan 14 07:07:02 2018 (r458954) +++ head/sysutils/container-diff/Makefile Sun Jan 14 07:07:08 2018 (r458955) @@ -20,13 +20,6 @@ PLIST_FILES= bin/container-diff GH_ACCOUNT= GoogleCloudPlatform USE_GITHUB= yes -.include - -# Change inode size from 64 bits to 32 bits for systems without ino64 support -.if ${OSVERSION} < 1200031 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-without-ino64 -.endif - do-install: ${INSTALL_PROGRAM} ${WRKDIR}/bin/container-diff ${STAGEDIR}${PREFIX}/bin/container-diff Copied: head/sysutils/container-diff/files/patch-uint32-Ino (from r458954, head/sysutils/container-diff/files/extra-patch-without-ino64) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/container-diff/files/patch-uint32-Ino Sun Jan 14 07:07:08 2018 (r458955, copy of r458954, head/sysutils/container-diff/files/extra-patch-without-ino64) @@ -0,0 +1,53 @@ +--- 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 {