cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to consul-1.13.2.

Browse Source
This commit is contained in:
ajacoutot 2022-09-23 20:16:43 +00:00
parent f366bee23a
commit c619af8b58
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/consul/Makefile
View File

@ -3,7 +3,7 @@ ONLY_FOR_ARCHS= amd64
COMMENT= service discovery and configuration tool
VERSION= 1.13.1
VERSION= 1.13.2
# consul-vendored distfile generated by fetching archive from
# https://github.com/hashicorp/consul/archive/v$VERSION/consul-$VERSION.tar.gz
# and running "go mod tidy" + "go mod vendor"

4
sysutils/consul/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (consul-vendored-1.13.1.tar.gz) = 3jEO4gk5iX9tA/1wmmIG6IP1+Nb/C4weyBGkNGIztng=
SIZE (consul-vendored-1.13.1.tar.gz) = 37365082
SHA256 (consul-vendored-1.13.2.tar.gz) = WS7EnAk//+GqVDrgr6vIiSMP3FjG32u3kvZj6xzyKh4=
SIZE (consul-vendored-1.13.2.tar.gz) = 38264276

30
sysutils/consul/patches/patch-vendor_github_com_shirou_gopsutil_v3_disk_disk_openbsd_go Normal file
View File

@ -0,0 +1,30 @@
vendor/github.com/shirou/gopsutil/v3/disk/disk_openbsd.go:59:53: cannot use stat.F_mntfromname[:] (value of type []byte) as type []int8 in argument to common.IntToString
vendor/github.com/shirou/gopsutil/v3/disk/disk_openbsd.go:60:51: cannot use stat.F_mntonname[:] (value of type []byte) as type []int8 in argument to common.IntToString
vendor/github.com/shirou/gopsutil/v3/disk/disk_openbsd.go:61:52: cannot use stat.F_fstypename[:] (value of type []byte) as type []int8 in argument to common.IntToString
vendor/github.com/shirou/gopsutil/v3/disk/disk_openbsd.go:149:45: cannot use stat.F_fstypename[:] (value of type []byte) as type []int8 in argument to common.IntToString
Index: vendor/github.com/shirou/gopsutil/v3/disk/disk_openbsd.go
--- vendor/github.com/shirou/gopsutil/v3/disk/disk_openbsd.go.orig
+++ vendor/github.com/shirou/gopsutil/v3/disk/disk_openbsd.go
@@ -56,9 +56,9 @@ func PartitionsWithContext(ctx context.Context, all bo
}
d := PartitionStat{
- Device: common.IntToString(stat.F_mntfromname[:]),
- Mountpoint: common.IntToString(stat.F_mntonname[:]),
- Fstype: common.IntToString(stat.F_fstypename[:]),
+ Device: common.ByteToString(stat.F_mntfromname[:]),
+ Mountpoint: common.ByteToString(stat.F_mntonname[:]),
+ Fstype: common.ByteToString(stat.F_fstypename[:]),
Opts: opts,
}
@@ -146,7 +146,7 @@ func UsageWithContext(ctx context.Context, path string
}
func getFsType(stat unix.Statfs_t) string {
- return common.IntToString(stat.F_fstypename[:])
+ return common.ByteToString(stat.F_fstypename[:])
}
func SerialNumberWithContext(ctx context.Context, name string) (string, error) {