mirror of
https://github.com/containers/podman.git
synced 2025-11-03 07:47:19 +08:00
update buildah and c/common to latest
also includes bumps for c/storage and c/image Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
14
vendor/github.com/sylabs/sif/v2/pkg/sif/buffer.go
generated
vendored
14
vendor/github.com/sylabs/sif/v2/pkg/sif/buffer.go
generated
vendored
@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2021, Sylabs Inc. All rights reserved.
|
||||
// Copyright (c) 2021-2022, Sylabs Inc. All rights reserved.
|
||||
// This software is licensed under a 3-clause BSD license. Please consult the
|
||||
// LICENSE file distributed with the sources of this project regarding your
|
||||
// rights to use or distribute this software.
|
||||
@ -25,7 +25,7 @@ func NewBuffer(buf []byte) *Buffer {
|
||||
var errNegativeOffset = errors.New("negative offset")
|
||||
|
||||
// ReadAt implements the io.ReaderAt interface.
|
||||
func (b *Buffer) ReadAt(p []byte, off int64) (n int, err error) {
|
||||
func (b *Buffer) ReadAt(p []byte, off int64) (int, error) {
|
||||
if off < 0 {
|
||||
return 0, errNegativeOffset
|
||||
}
|
||||
@ -34,17 +34,17 @@ func (b *Buffer) ReadAt(p []byte, off int64) (n int, err error) {
|
||||
return 0, io.EOF
|
||||
}
|
||||
|
||||
n = copy(p, b.buf[off:])
|
||||
n := copy(p, b.buf[off:])
|
||||
if n < len(p) {
|
||||
err = io.EOF
|
||||
return n, io.EOF
|
||||
}
|
||||
return n, err
|
||||
return n, nil
|
||||
}
|
||||
|
||||
var errNegativePosition = errors.New("negative position")
|
||||
|
||||
// Write implements the io.Writer interface.
|
||||
func (b *Buffer) Write(p []byte) (n int, err error) {
|
||||
func (b *Buffer) Write(p []byte) (int, error) {
|
||||
if b.pos < 0 {
|
||||
return 0, errNegativePosition
|
||||
}
|
||||
@ -53,7 +53,7 @@ func (b *Buffer) Write(p []byte) (n int, err error) {
|
||||
b.buf = append(b.buf, make([]byte, need-have)...)
|
||||
}
|
||||
|
||||
n = copy(b.buf[b.pos:], p)
|
||||
n := copy(b.buf[b.pos:], p)
|
||||
b.pos += int64(n)
|
||||
return n, nil
|
||||
}
|
||||
|
||||
10
vendor/github.com/sylabs/sif/v2/pkg/sif/descriptor.go
generated
vendored
10
vendor/github.com/sylabs/sif/v2/pkg/sif/descriptor.go
generated
vendored
@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2018-2021, Sylabs Inc. All rights reserved.
|
||||
// Copyright (c) 2018-2022, Sylabs Inc. All rights reserved.
|
||||
// Copyright (c) 2017, SingularityWare, LLC. All rights reserved.
|
||||
// Copyright (c) 2017, Yannick Cote <yhcote@gmail.com> All rights reserved.
|
||||
// This software is licensed under a 3-clause BSD license. Please consult the
|
||||
@ -96,7 +96,7 @@ func (d *rawDescriptor) setExtra(v interface{}) error {
|
||||
}
|
||||
|
||||
// getPartitionMetadata gets metadata for a partition data object.
|
||||
func (d rawDescriptor) getPartitionMetadata() (fs FSType, pt PartType, arch string, err error) {
|
||||
func (d rawDescriptor) getPartitionMetadata() (FSType, PartType, string, error) {
|
||||
if got, want := d.DataType, DataPartition; got != want {
|
||||
return 0, 0, "", &unexpectedDataTypeError{got, []DataType{want}}
|
||||
}
|
||||
@ -142,6 +142,8 @@ func (d Descriptor) GroupID() uint32 { return d.raw.GroupID &^ descrGroupMask }
|
||||
// LinkedID returns the object/group ID d is linked to, or zero if d does not contain a linked
|
||||
// ID. If isGroup is true, the returned id is an object group ID. Otherwise, the returned id is a
|
||||
// data object ID.
|
||||
//
|
||||
//nolint:nonamedreturns // Named returns effective as documentation.
|
||||
func (d Descriptor) LinkedID() (id uint32, isGroup bool) {
|
||||
return d.raw.LinkedID &^ descrGroupMask, d.raw.LinkedID&descrGroupMask == descrGroupMask
|
||||
}
|
||||
@ -162,6 +164,8 @@ func (d Descriptor) ModifiedAt() time.Time { return time.Unix(d.raw.ModifiedAt,
|
||||
func (d Descriptor) Name() string { return strings.TrimRight(string(d.raw.Name[:]), "\000") }
|
||||
|
||||
// PartitionMetadata gets metadata for a partition data object.
|
||||
//
|
||||
//nolint:nonamedreturns // Named returns effective as documentation.
|
||||
func (d Descriptor) PartitionMetadata() (fs FSType, pt PartType, arch string, err error) {
|
||||
return d.raw.getPartitionMetadata()
|
||||
}
|
||||
@ -186,6 +190,8 @@ func getHashType(ht hashType) (crypto.Hash, error) {
|
||||
}
|
||||
|
||||
// SignatureMetadata gets metadata for a signature data object.
|
||||
//
|
||||
//nolint:nonamedreturns // Named returns effective as documentation.
|
||||
func (d Descriptor) SignatureMetadata() (ht crypto.Hash, fp []byte, err error) {
|
||||
if got, want := d.raw.DataType, DataSignature; got != want {
|
||||
return ht, fp, &unexpectedDataTypeError{got, []DataType{want}}
|
||||
|
||||
15
vendor/github.com/sylabs/sif/v2/pkg/sif/descriptor_input.go
generated
vendored
15
vendor/github.com/sylabs/sif/v2/pkg/sif/descriptor_input.go
generated
vendored
@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2021, Sylabs Inc. All rights reserved.
|
||||
// Copyright (c) 2021-2022, Sylabs Inc. All rights reserved.
|
||||
// This software is licensed under a 3-clause BSD license. Please consult the
|
||||
// LICENSE file distributed with the sources of this project regarding your
|
||||
// rights to use or distribute this software.
|
||||
@ -10,7 +10,6 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"time"
|
||||
)
|
||||
|
||||
@ -248,8 +247,9 @@ const DefaultObjectGroup = 1
|
||||
// this behavior, use OptNoGroup or OptGroupID. To link this data object, use OptLinkedID or
|
||||
// OptLinkedGroupID.
|
||||
//
|
||||
// By default, the data object will be aligned according to the system's memory page size. To
|
||||
// override this behavior, consider using OptObjectAlignment.
|
||||
// By default, the data object will not be aligned unless it is of type DataPartition, in which
|
||||
// case it will be aligned on a 4096 byte boundary. To override this behavior, consider using
|
||||
// OptObjectAlignment.
|
||||
//
|
||||
// By default, no name is set for data object. To set a name, use OptObjectName.
|
||||
//
|
||||
@ -258,8 +258,11 @@ const DefaultObjectGroup = 1
|
||||
// image modification time. To override this behavior, consider using OptObjectTime.
|
||||
func NewDescriptorInput(t DataType, r io.Reader, opts ...DescriptorInputOpt) (DescriptorInput, error) {
|
||||
dopts := descriptorOpts{
|
||||
groupID: DefaultObjectGroup,
|
||||
alignment: os.Getpagesize(),
|
||||
groupID: DefaultObjectGroup,
|
||||
}
|
||||
|
||||
if t == DataPartition {
|
||||
dopts.alignment = 4096
|
||||
}
|
||||
|
||||
for _, opt := range opts {
|
||||
|
||||
127
vendor/github.com/sylabs/sif/v2/pkg/sif/sif.go
generated
vendored
127
vendor/github.com/sylabs/sif/v2/pkg/sif/sif.go
generated
vendored
@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2018-2021, Sylabs Inc. All rights reserved.
|
||||
// Copyright (c) 2018-2022, Sylabs Inc. All rights reserved.
|
||||
// Copyright (c) 2017, SingularityWare, LLC. All rights reserved.
|
||||
// Copyright (c) 2017, Yannick Cote <yhcote@gmail.com> All rights reserved.
|
||||
// This software is licensed under a 3-clause BSD license. Please consult the
|
||||
@ -10,69 +10,68 @@
|
||||
//
|
||||
// Layout of a SIF file (example):
|
||||
//
|
||||
// .================================================.
|
||||
// | GLOBAL HEADER: Sifheader |
|
||||
// | - launch: "#!/usr/bin/env..." |
|
||||
// | - magic: "SIF_MAGIC" |
|
||||
// | - version: "1" |
|
||||
// | - arch: "4" |
|
||||
// | - uuid: b2659d4e-bd50-4ea5-bd17-eec5e54f918e |
|
||||
// | - ctime: 1504657553 |
|
||||
// | - mtime: 1504657653 |
|
||||
// | - ndescr: 3 |
|
||||
// | - descroff: 120 | --.
|
||||
// | - descrlen: 432 | |
|
||||
// | - dataoff: 4096 | |
|
||||
// | - datalen: 619362 | |
|
||||
// |------------------------------------------------| <-'
|
||||
// | DESCR[0]: Sifdeffile |
|
||||
// | - Sifcommon |
|
||||
// | - datatype: DATA_DEFFILE |
|
||||
// | - id: 1 |
|
||||
// | - groupid: 1 |
|
||||
// | - link: NONE |
|
||||
// | - fileoff: 4096 | --.
|
||||
// | - filelen: 222 | |
|
||||
// |------------------------------------------------| <-----.
|
||||
// | DESCR[1]: Sifpartition | | |
|
||||
// | - Sifcommon | | |
|
||||
// | - datatype: DATA_PARTITION | | |
|
||||
// | - id: 2 | | |
|
||||
// | - groupid: 1 | | |
|
||||
// | - link: NONE | | |
|
||||
// | - fileoff: 4318 | ----. |
|
||||
// | - filelen: 618496 | | | |
|
||||
// | - fstype: Squashfs | | | |
|
||||
// | - parttype: System | | | |
|
||||
// | - content: Linux | | | |
|
||||
// |------------------------------------------------| | | |
|
||||
// | DESCR[2]: Sifsignature | | | |
|
||||
// | - Sifcommon | | | |
|
||||
// | - datatype: DATA_SIGNATURE | | | |
|
||||
// | - id: 3 | | | |
|
||||
// | - groupid: NONE | | | |
|
||||
// | - link: 2 | ------'
|
||||
// | - fileoff: 622814 | ------.
|
||||
// | - filelen: 644 | | | |
|
||||
// | - hashtype: SHA384 | | | |
|
||||
// | - entity: @ | | | |
|
||||
// |------------------------------------------------| <-' | |
|
||||
// | Definition file data | | |
|
||||
// | . | | |
|
||||
// | . | | |
|
||||
// | . | | |
|
||||
// |------------------------------------------------| <---' |
|
||||
// | File system partition image | |
|
||||
// | . | |
|
||||
// | . | |
|
||||
// | . | |
|
||||
// |------------------------------------------------| <-----'
|
||||
// | Signed verification data |
|
||||
// | . |
|
||||
// | . |
|
||||
// | . |
|
||||
// `================================================'
|
||||
//
|
||||
// .================================================.
|
||||
// | GLOBAL HEADER: Sifheader |
|
||||
// | - launch: "#!/usr/bin/env..." |
|
||||
// | - magic: "SIF_MAGIC" |
|
||||
// | - version: "1" |
|
||||
// | - arch: "4" |
|
||||
// | - uuid: b2659d4e-bd50-4ea5-bd17-eec5e54f918e |
|
||||
// | - ctime: 1504657553 |
|
||||
// | - mtime: 1504657653 |
|
||||
// | - ndescr: 3 |
|
||||
// | - descroff: 120 | --.
|
||||
// | - descrlen: 432 | |
|
||||
// | - dataoff: 4096 | |
|
||||
// | - datalen: 619362 | |
|
||||
// |------------------------------------------------| <-'
|
||||
// | DESCR[0]: Sifdeffile |
|
||||
// | - Sifcommon |
|
||||
// | - datatype: DATA_DEFFILE |
|
||||
// | - id: 1 |
|
||||
// | - groupid: 1 |
|
||||
// | - link: NONE |
|
||||
// | - fileoff: 4096 | --.
|
||||
// | - filelen: 222 | |
|
||||
// |------------------------------------------------| <-----.
|
||||
// | DESCR[1]: Sifpartition | | |
|
||||
// | - Sifcommon | | |
|
||||
// | - datatype: DATA_PARTITION | | |
|
||||
// | - id: 2 | | |
|
||||
// | - groupid: 1 | | |
|
||||
// | - link: NONE | | |
|
||||
// | - fileoff: 4318 | ----. |
|
||||
// | - filelen: 618496 | | | |
|
||||
// | - fstype: Squashfs | | | |
|
||||
// | - parttype: System | | | |
|
||||
// | - content: Linux | | | |
|
||||
// |------------------------------------------------| | | |
|
||||
// | DESCR[2]: Sifsignature | | | |
|
||||
// | - Sifcommon | | | |
|
||||
// | - datatype: DATA_SIGNATURE | | | |
|
||||
// | - id: 3 | | | |
|
||||
// | - groupid: NONE | | | |
|
||||
// | - link: 2 | ------'
|
||||
// | - fileoff: 622814 | ------.
|
||||
// | - filelen: 644 | | | |
|
||||
// | - hashtype: SHA384 | | | |
|
||||
// | - entity: @ | | | |
|
||||
// |------------------------------------------------| <-' | |
|
||||
// | Definition file data | | |
|
||||
// | . | | |
|
||||
// | . | | |
|
||||
// | . | | |
|
||||
// |------------------------------------------------| <---' |
|
||||
// | File system partition image | |
|
||||
// | . | |
|
||||
// | . | |
|
||||
// | . | |
|
||||
// |------------------------------------------------| <-----'
|
||||
// | Signed verification data |
|
||||
// | . |
|
||||
// | . |
|
||||
// | . |
|
||||
// `================================================'
|
||||
package sif
|
||||
|
||||
import (
|
||||
|
||||
Reference in New Issue
Block a user