Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package arkade for openSUSE:Factory checked in at 2023-06-29 17:29:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arkade (Old) and /work/SRC/openSUSE:Factory/.arkade.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arkade" Thu Jun 29 17:29:23 2023 rev:10 rq:1095971 version:0.9.23 Changes: -------- --- /work/SRC/openSUSE:Factory/arkade/arkade.changes 2023-06-14 16:30:38.546948789 +0200 +++ /work/SRC/openSUSE:Factory/.arkade.new.13546/arkade.changes 2023-06-29 17:29:44.786757734 +0200 @@ -1,0 +2,21 @@ +Thu Jun 29 11:39:19 UTC 2023 - ka...@b1-systems.de + +- Update to version 0.9.23: + * unblock installs on arm64 nodes + * Add 1password and task CLIs to arkage get + * Bump github.com/otiai10/copy from 1.11.0 to 1.12.0 + * update chart url + * permit postgresql install on arm64 + * Bump golang.org/x/mod from 0.10.0 to 0.11.0 + * fix format + * shorten name + * add binaryBase optional field + * update inletsctl unit test + * fix: linux aarch64 + * Update tools.go + * Bump golang.org/x/crypto from 0.9.0 to 0.10.0 + * Add extra notes for test-tool.sh + * Add test tool note to PR template + * Update Kustomize to v5.0.3 and support Windows + +------------------------------------------------------------------- Old: ---- arkade-0.9.22.obscpio New: ---- arkade-0.9.23.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arkade.spec ++++++ --- /var/tmp/diff_new_pack.amdaHT/_old 2023-06-29 17:29:45.658762842 +0200 +++ /var/tmp/diff_new_pack.amdaHT/_new 2023-06-29 17:29:45.666762888 +0200 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: arkade -Version: 0.9.22 +Version: 0.9.23 Release: 0 Summary: Open Source Kubernetes Marketplace License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.amdaHT/_old 2023-06-29 17:29:45.698763075 +0200 +++ /var/tmp/diff_new_pack.amdaHT/_new 2023-06-29 17:29:45.702763100 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/alexellis/arkade</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">0.9.22</param> + <param name="revision">0.9.23</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.amdaHT/_old 2023-06-29 17:29:45.718763193 +0200 +++ /var/tmp/diff_new_pack.amdaHT/_new 2023-06-29 17:29:45.722763216 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/alexellis/arkade</param> - <param name="changesrevision">ab3f8aa2a12aa2f3407e8150b5bdea97fd582a6e</param></service></servicedata> + <param name="changesrevision">3a36fb5e13bcb6455e000d3e06bcfd998e9895ef</param></service></servicedata> (No newline at EOF) ++++++ arkade-0.9.22.obscpio -> arkade-0.9.23.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/.github/PULL_REQUEST_TEMPLATE.md new/arkade-0.9.23/.github/PULL_REQUEST_TEMPLATE.md --- old/arkade-0.9.22/.github/PULL_REQUEST_TEMPLATE.md 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/.github/PULL_REQUEST_TEMPLATE.md 2023-06-28 14:59:28.000000000 +0200 @@ -14,6 +14,11 @@ <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> +If updating or adding a new CLI to `arkade get`, run: + +``` +go build && ./hack/test-tool.sh TOOL_NAME +``` ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> @@ -33,5 +38,5 @@ - [ ] I've read the [CONTRIBUTION](https://github.com/alexellis/arkade/blob/master/CONTRIBUTING.md) guide - [ ] I have signed-off my commits with `git commit -s` -<!--- In case it is a new application --> +<!--- For "arkade install" or "arkade system install" --> - [ ] I have tested this on arm, or have added code to prevent deployment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/.gitignore new/arkade-0.9.23/.gitignore --- old/arkade-0.9.22/.gitignore 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/.gitignore 2023-06-28 14:59:28.000000000 +0200 @@ -1,4 +1,5 @@ arkade +arkade.exe bin/** kubeconfig .DS_Store diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/README.md new/arkade-0.9.23/README.md --- old/arkade-0.9.22/README.md 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/README.md 2023-06-28 14:59:28.000000000 +0200 @@ -800,6 +800,7 @@ | [nova](https://github.com/FairwindsOps/nova) | Find outdated or deprecated Helm charts running in your cluster. | | [oc](https://github.com/openshift/oc) | Client to use an OpenShift 4.x cluster. | | [oh-my-posh](https://github.com/jandedobbeleer/oh-my-posh) | A prompt theme engine for any shell that can display kubernetes information. | +| [op](https://github.com/1password/) | 1Password CLI enables you to automate administrative tasks and securely provision secrets across development environments. | | [opa](https://github.com/open-policy-agent/opa) | General-purpose policy engine that enables unified, context-aware policy enforcement across the entire stack. | | [openshift-install](https://github.com/openshift/installer) | CLI to install an OpenShift 4.x cluster. | | [operator-sdk](https://github.com/operator-framework/operator-sdk) | Operator SDK is a tool for scaffolding and generating code for building Kubernetes operators | @@ -820,6 +821,7 @@ | [stern](https://github.com/stern/stern) | Multi pod and container log tailing for Kubernetes. | | [syft](https://github.com/anchore/syft) | CLI tool and library for generating a Software Bill of Materials from container images and filesystems | | [talosctl](https://github.com/siderolabs/talos) | The command-line tool for managing Talos Linux OS. | +| [task](https://github.com/go-task/task) | A simple task runner and build tool | | [tctl](https://github.com/temporalio/tctl) | Temporal CLI. | | [terraform](https://github.com/hashicorp/terraform) | Infrastructure as Code for major cloud providers. | | [terragrunt](https://github.com/gruntwork-io/terragrunt) | Terragrunt is a thin wrapper for Terraform that provides extra tools for working with multiple Terraform modules | @@ -836,6 +838,6 @@ | [waypoint](https://github.com/hashicorp/waypoint) | Easy application deployment for Kubernetes and Amazon ECS | | [yq](https://github.com/mikefarah/yq) | Portable command-line YAML processor. | | [yt-dlp](https://github.com/yt-dlp/yt-dlp) | Fork of youtube-dl with additional features and fixes | -There are 136 tools, use `arkade get NAME` to download one. +There are 137 tools, use `arkade get NAME` to download one. > Note to contributors, run `arkade get --format markdown` to generate this > list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/cmd/apps/argocd_app.go new/arkade-0.9.23/cmd/apps/argocd_app.go --- old/arkade-0.9.22/cmd/apps/argocd_app.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/cmd/apps/argocd_app.go 2023-06-28 14:59:28.000000000 +0200 @@ -33,10 +33,6 @@ arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - _, err := k8s.KubectlTask("create", "ns", "argocd") if err != nil { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/cmd/apps/consul_app.go new/arkade-0.9.23/cmd/apps/consul_app.go --- old/arkade-0.9.22/cmd/apps/consul_app.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/cmd/apps/consul_app.go 2023-06-28 14:59:28.000000000 +0200 @@ -45,10 +45,6 @@ arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - namespace, _ := consul.Flags().GetString("namespace") overrides := map[string]string{} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/cmd/apps/falco.go new/arkade-0.9.23/cmd/apps/falco.go --- old/arkade-0.9.22/cmd/apps/falco.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/cmd/apps/falco.go 2023-06-28 14:59:28.000000000 +0200 @@ -65,10 +65,6 @@ arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - overrides := map[string]string{} if err := config.MergeFlags(overrides, customFlags); err != nil { return err diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/cmd/apps/gitea_app.go new/arkade-0.9.23/cmd/apps/gitea_app.go --- old/arkade-0.9.22/cmd/apps/gitea_app.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/cmd/apps/gitea_app.go 2023-06-28 14:59:28.000000000 +0200 @@ -90,10 +90,6 @@ WithHelmUpdateRepo(updateRepo). WithKubeconfigPath(kubeConfigPath) - if _, found := overrides["gitea.config.database.HOST"]; !found && arch != IntelArch { - return fmt.Errorf("if installing on ARM platform you'll need to use an external database") - } - _, err = apps.MakeInstallChart(giteaAppOptions) if err != nil { return err diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/cmd/apps/jenkins_app.go new/arkade-0.9.23/cmd/apps/jenkins_app.go --- old/arkade-0.9.22/cmd/apps/jenkins_app.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/cmd/apps/jenkins_app.go 2023-06-28 14:59:28.000000000 +0200 @@ -85,10 +85,6 @@ arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - jenkinsAppOptions := types.DefaultInstallOptions(). WithNamespace(ns). WithHelmRepo("jenkins/jenkins"). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/cmd/apps/kube_state_metrics.go new/arkade-0.9.23/cmd/apps/kube_state_metrics.go --- old/arkade-0.9.22/cmd/apps/kube_state_metrics.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/cmd/apps/kube_state_metrics.go 2023-06-28 14:59:28.000000000 +0200 @@ -41,10 +41,6 @@ arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - clientArch, clientOS := env.GetClientArch() fmt.Printf("Client: %q, %q\n", clientArch, clientOS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/cmd/apps/kyverno.go new/arkade-0.9.23/cmd/apps/kyverno.go --- old/arkade-0.9.22/cmd/apps/kyverno.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/cmd/apps/kyverno.go 2023-06-28 14:59:28.000000000 +0200 @@ -57,10 +57,6 @@ arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - overrides := map[string]string{} if err := config.MergeFlags(overrides, customFlags); err != nil { return err diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/cmd/apps/metallb_app.go new/arkade-0.9.23/cmd/apps/metallb_app.go --- old/arkade-0.9.22/cmd/apps/metallb_app.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/cmd/apps/metallb_app.go 2023-06-28 14:59:28.000000000 +0200 @@ -15,8 +15,7 @@ ) const ( - MetalLBNamespaceManifest = "https://raw.githubusercontent.com/metallb/metallb/v0.10.2/manifests/namespace.yaml" - MetalLBManifest = "https://raw.githubusercontent.com/metallb/metallb/v0.10.2/manifests/metallb.yaml" + MetalLBManifest = "https://raw.githubusercontent.com/metallb/metallb/v0.13.10/config/manifests/metallb-native.yaml" ) func MakeInstallMetalLB() *cobra.Command { @@ -57,16 +56,8 @@ arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - addressRange, _ := command.Flags().GetString("address-range") - if err := k8s.Kubectl("apply", "-f", MetalLBNamespaceManifest); err != nil { - return err - } - if err := k8s.Kubectl("apply", "-f", MetalLBManifest); err != nil { return err } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/cmd/apps/postgres_app.go new/arkade-0.9.23/cmd/apps/postgres_app.go --- old/arkade-0.9.22/cmd/apps/postgres_app.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/cmd/apps/postgres_app.go 2023-06-28 14:59:28.000000000 +0200 @@ -41,10 +41,6 @@ arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - ns, _ := postgresql.Flags().GetString("namespace") if ns != "default" { @@ -103,7 +99,7 @@ kubectl port-forward --namespace default svc/postgresql 5432:5432 & PGPASSWORD="$POSTGRES_PASSWORD" psql --host 127.0.0.1 -U postgres -d postgres -p 5432 -# Find out more at: https://github.com/helm/charts/tree/master/stable/postgresql` +# Find out more at: https://github.com/bitnami/charts/tree/main/bitnami/postgresql` const postgresqlInstallMsg = `======================================================================= = PostgreSQL has been installed. = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/cmd/apps/rabbitmq_app.go new/arkade-0.9.23/cmd/apps/rabbitmq_app.go --- old/arkade-0.9.22/cmd/apps/rabbitmq_app.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/cmd/apps/rabbitmq_app.go 2023-06-28 14:59:28.000000000 +0200 @@ -9,7 +9,6 @@ "github.com/alexellis/arkade/pkg" "github.com/alexellis/arkade/pkg/apps" - "github.com/alexellis/arkade/pkg/k8s" "github.com/alexellis/arkade/pkg/types" "github.com/spf13/cobra" ) @@ -60,11 +59,6 @@ return fmt.Errorf("error with --set usage: %s", err) } - arch := k8s.GetNodeArchitecture() - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - return nil } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/cmd/apps/redis_app.go new/arkade-0.9.23/cmd/apps/redis_app.go --- old/arkade-0.9.22/cmd/apps/redis_app.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/cmd/apps/redis_app.go 2023-06-28 14:59:28.000000000 +0200 @@ -39,10 +39,6 @@ arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - overrides := map[string]string{ "serviceAccount.create": "true", "rbac.create": "true", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/cmd/apps/tekton_app.go new/arkade-0.9.23/cmd/apps/tekton_app.go --- old/arkade-0.9.22/cmd/apps/tekton_app.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/cmd/apps/tekton_app.go 2023-06-28 14:59:28.000000000 +0200 @@ -32,10 +32,6 @@ arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(`only Intel and AMD (i.e. PC) architecture is supported for this app`) - } - fmt.Println("Installing Tekton pipelines...") _, err := k8s.KubectlTask("apply", "-f", "https://storage.googleapis.com/tekton-releases/pipeline/latest/release.yaml") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/cmd/apps/waypoint_app.go new/arkade-0.9.23/cmd/apps/waypoint_app.go --- old/arkade-0.9.22/cmd/apps/waypoint_app.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/cmd/apps/waypoint_app.go 2023-06-28 14:59:28.000000000 +0200 @@ -35,10 +35,6 @@ arch := k8s.GetNodeArchitecture() fmt.Printf("Node architecture: %q\n", arch) - if arch != IntelArch { - return fmt.Errorf(OnlyIntelArch) - } - namespace, _ := waypoint.Flags().GetString("namespace") overrides := map[string]string{} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/go.mod new/arkade-0.9.23/go.mod --- old/arkade-0.9.22/go.mod 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/go.mod 2023-06-28 14:59:28.000000000 +0200 @@ -10,12 +10,12 @@ github.com/google/go-containerregistry v0.15.2 github.com/morikuni/aec v1.0.0 github.com/olekukonko/tablewriter v0.0.5 - github.com/otiai10/copy v1.11.0 + github.com/otiai10/copy v1.12.0 github.com/pkg/errors v0.9.1 github.com/sethvargo/go-password v0.2.0 github.com/spf13/cobra v1.7.0 - golang.org/x/crypto v0.9.0 - golang.org/x/mod v0.10.0 + golang.org/x/crypto v0.10.0 + golang.org/x/mod v0.11.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -41,5 +41,5 @@ github.com/spf13/pflag v1.0.5 // indirect github.com/vbatts/tar-split v0.11.3 // indirect golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.8.0 // indirect + golang.org/x/sys v0.9.0 // indirect ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/go.sum new/arkade-0.9.23/go.sum --- old/arkade-0.9.22/go.sum 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/go.sum 2023-06-28 14:59:28.000000000 +0200 @@ -55,8 +55,8 @@ github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0Ys52cJydRwBkb8= github.com/opencontainers/image-spec v1.1.0-rc3/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= -github.com/otiai10/copy v1.11.0 h1:OKBD80J/mLBrwnzXqGtFCzprFSGioo30JcmR4APsNwc= -github.com/otiai10/copy v1.11.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww= +github.com/otiai10/copy v1.12.0 h1:cLMgSQnXBs1eehF0Wy/FAGsgDTDmAqFR7rQylBb1nDY= +github.com/otiai10/copy v1.12.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww= github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -87,17 +87,17 @@ github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8= github.com/vbatts/tar-split v0.11.3 h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RVck= github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= +golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= +golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= +golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/hack/test-tool.sh new/arkade-0.9.23/hack/test-tool.sh --- old/arkade-0.9.22/hack/test-tool.sh 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/hack/test-tool.sh 2023-06-28 14:59:28.000000000 +0200 @@ -2,6 +2,13 @@ if [ -z $1 ]; then + echo "test-tool.sh" + echo "" + echo "Downloads the tool for all supported operating systems and" + echo "CPU architectures. Print the file type for manual checking" + echo "This often finds issues with PRs that are not caught by" + echo "unit test alone" + echo echo usage: test-tool.sh TOOLNAME exit 1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/pkg/get/get_test.go new/arkade-0.9.23/pkg/get/get_test.go --- old/arkade-0.9.22/pkg/get/get_test.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/pkg/get/get_test.go 2023-06-28 14:59:28.000000000 +0200 @@ -22,6 +22,8 @@ arch string version string url string + // Optional fields + binary string } func getTool(name string, tools []Tool) *Tool { @@ -795,31 +797,38 @@ {os: "mingw64_nt-10.0-18362", arch: arch64bit, version: "0.8.16", - url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl.exe.tgz"}, + url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl.exe.tgz", + binary: "inletsctl"}, {os: "darwin", arch: arch64bit, version: "0.8.16", - url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl-darwin.tgz"}, + url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl-darwin.tgz", + binary: "inletsctl-darwin"}, {os: "darwin", arch: archDarwinARM64, version: "0.8.16", - url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl-darwin-arm64.tgz"}, + url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl-darwin-arm64.tgz", + binary: "inletsctl-darwin-arm64"}, {os: "linux", arch: arch64bit, version: "0.8.16", - url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl.tgz"}, + url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl.tgz", + binary: "inletsctl"}, {os: "linux", arch: "armv6l", version: "0.8.16", - url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl-armhf.tgz"}, + url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl-armhf.tgz", + binary: "inletsctl-armhf"}, {os: "linux", arch: "armv7l", version: "0.8.16", - url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl-armhf.tgz"}, + url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl-armhf.tgz", + binary: "inletsctl-armhf"}, {os: "linux", arch: archARM64, version: "0.8.16", - url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl-arm64.tgz"}, + url: "https://github.com/inlets/inletsctl/releases/download/0.8.16/inletsctl-arm64.tgz", + binary: "inletsctl-arm64"}, } for _, tc := range tests { got, err := tool.GetURL(tc.os, tc.arch, tc.version, false) @@ -827,7 +836,14 @@ t.Fatal(err) } if got != tc.url { - t.Fatalf("want: %s, got: %s", tc.url, got) + t.Errorf("for %s/%s, want: %q, but got: %q", tc.os, tc.arch, tc.url, got) + } + binary, err := GetBinaryName(tool, tc.os, tc.arch, tc.version) + if err != nil { + t.Fatal(err) + } + if binary != tc.binary { + t.Errorf("for %s/%s, want: %q, but got: %q", tc.os, tc.arch, tc.binary, binary) } } } @@ -870,23 +886,29 @@ tool := getTool(name, tools) - ver := "4.4.1" + ver := "v5.0.3" tests := []test{ {os: "linux", arch: arch64bit, version: ver, - url: "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv4.4.1/kustomize_v4.4.1_linux_amd64.tar.gz", + url: "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.0.3/kustomize_v5.0.3_linux_amd64.tar.gz", }, {os: "darwin", arch: arch64bit, version: ver, - url: "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv4.4.1/kustomize_v4.4.1_darwin_amd64.tar.gz", + url: "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.0.3/kustomize_v5.0.3_darwin_amd64.tar.gz", }, {os: "linux", arch: archARM64, version: ver, - url: "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv4.4.1/kustomize_v4.4.1_linux_arm64.tar.gz", + url: "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.0.3/kustomize_v5.0.3_linux_arm64.tar.gz", + }, + {os: "mingw64_nt-10.0-18362", + + arch: arch64bit, + version: ver, + url: "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.0.3/kustomize_v5.0.3_windows_amd64.tar.gz", }, } @@ -6310,3 +6332,107 @@ }) } + +func Test_DownloadTask(t *testing.T) { + tools := MakeTools() + name := "task" + + tool := getTool(name, tools) + + const toolVersion = "v3.26.0" + + tests := []test{ + { + os: "linux", + arch: arch64bit, + version: toolVersion, + url: "https://github.com/go-task/task/releases/download/v3.26.0/task_linux_amd64.tar.gz", + }, + { + os: "linux", + arch: archARM7, + version: toolVersion, + url: "https://github.com/go-task/task/releases/download/v3.26.0/task_linux_arm.tar.gz", + }, + { + os: "linux", + arch: archARM64, + version: toolVersion, + url: "https://github.com/go-task/task/releases/download/v3.26.0/task_linux_arm64.tar.gz", + }, + { + os: "darwin", + arch: archDarwinARM64, + version: toolVersion, + url: "https://github.com/go-task/task/releases/download/v3.26.0/task_darwin_arm64.tar.gz", + }, + { + os: "darwin", + arch: arch64bit, + version: toolVersion, + url: "https://github.com/go-task/task/releases/download/v3.26.0/task_darwin_amd64.tar.gz", + }, + } + + for _, tc := range tests { + got, err := tool.GetURL(tc.os, tc.arch, tc.version, false) + if err != nil { + t.Fatal(err) + } + if got != tc.url { + t.Errorf("want: %s, got: %s", tc.url, got) + } + } +} + +func Test_Download1Password(t *testing.T) { + tools := MakeTools() + name := "op" + + tool := getTool(name, tools) + + const toolVersion = "v2.17.0" + + tests := []test{ + { + os: "linux", + arch: arch64bit, + version: toolVersion, + url: "https://cache.agilebits.com/dist/1P/op2/pkg/v2.17.0/op_linux_amd64_v2.17.0.zip", + }, + { + os: "linux", + arch: arch64bit, + version: "", + url: "https://cache.agilebits.com/dist/1P/op2/pkg/v2.17.0/op_linux_amd64_v2.17.0.zip", + }, + { + os: "linux", + arch: archARM7, + version: toolVersion, + url: "https://cache.agilebits.com/dist/1P/op2/pkg/v2.17.0/op_linux_arm_v2.17.0.zip", + }, + { + os: "linux", + arch: archARM64, + version: toolVersion, + url: "https://cache.agilebits.com/dist/1P/op2/pkg/v2.17.0/op_linux_arm64_v2.17.0.zip", + }, + { + os: "ming", + arch: arch64bit, + version: toolVersion, + url: "https://cache.agilebits.com/dist/1P/op2/pkg/v2.17.0/op_windows_amd64_v2.17.0.zip", + }, + } + + for _, tc := range tests { + got, err := tool.GetURL(tc.os, tc.arch, tc.version, false) + if err != nil { + t.Fatal(err) + } + if got != tc.url { + t.Errorf("want: %s, got: %s", tc.url, got) + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arkade-0.9.22/pkg/get/tools.go new/arkade-0.9.23/pkg/get/tools.go --- old/arkade-0.9.22/pkg/get/tools.go 2023-06-10 10:16:57.000000000 +0200 +++ new/arkade-0.9.23/pkg/get/tools.go 2023-06-28 14:59:28.000000000 +0200 @@ -463,7 +463,7 @@ {{- end -}} https://github.com/inlets/inletsctl/releases/download/{{.Version}}/{{$fileName}}`, BinaryTemplate: `{{ if HasPrefix .OS "ming" -}} -{{.Name}}.exe +{{.Name}} {{- else if eq .OS "darwin" -}} {{- if eq .Arch "arm64" -}} {{.Name}}-darwin-arm64 @@ -471,13 +471,15 @@ {{.Name}}-darwin {{- end -}} {{- else if eq .OS "linux" -}} -{{.Name}} -{{- else if eq .Arch "armv6l" -}} -{{.Name}}-armhf -{{- else if eq .Arch "armv7l" -}} -{{.Name}}-armhf -{{- else if eq .Arch "aarch64" -}} -{{.Name}}-arm64 + {{- if eq .Arch "armv6l" -}} + {{.Name}}-armhf + {{- else if eq .Arch "armv7l" -}} + {{.Name}}-armhf + {{- else if eq .Arch "aarch64" -}} + {{.Name}}-arm64 + {{- else -}} + {{.Name}} + {{- end -}} {{- end -}}`, }, Tool{ @@ -544,9 +546,10 @@ Repo: "kustomize", Name: "kustomize", Description: "Customization of kubernetes YAML configurations", - Version: "4.4.1", + Version: "v5.0.3", BinaryTemplate: ` {{$osStr := ""}} + {{$ext := "tar.gz"}} {{- if eq .OS "linux" -}} {{- if eq .Arch "x86_64" -}} {{$osStr = "linux_amd64"}} @@ -556,7 +559,10 @@ {{- else if eq .OS "darwin" -}} {{$osStr = "darwin_amd64"}} {{- end -}} - kustomize%2Fv{{.Version}}/{{.Name}}_v{{.Version}}_{{$osStr}}.tar.gz`, + {{ if HasPrefix .OS "ming" -}} + {{$osStr = "windows_amd64"}} + {{- end -}} + kustomize%2F{{.Version}}/{{.Name}}_{{.Version}}_{{$osStr}}.{{$ext}}`, }) tools = append(tools, @@ -3683,5 +3689,61 @@ https://github.com/{{.Owner}}/{{.Repo}}/releases/download/{{.Version}}/{{.Name}}_{{.VersionNumber}}_{{$osStr}}_{{$arch}}.{{$extStr}}`, }) + tools = append(tools, + Tool{ + Owner: "go-task", + Repo: "task", + Name: "task", + Description: "A simple task runner and build tool", + BinaryTemplate: ` + {{$os := .OS}} + {{$arch := .Arch}} + {{$ext := "tar.gz"}} + + {{- if (or (eq .Arch "aarch64") (eq .Arch "arm64")) -}} + {{$arch = "arm64"}} + {{- else if eq .Arch "x86_64" -}} + {{ $arch = "amd64" }} + {{- else if eq .Arch "armv7l" -}} + {{ $arch = "arm" }} + {{- end -}} + + {{ if HasPrefix .OS "ming" -}} + {{$os = "windows"}} + {{$ext = "zip"}} + {{- end -}} + + {{.Name}}_{{$os}}_{{$arch}}.{{$ext}}`, + }) + + tools = append(tools, + Tool{ + Owner: "1password", + Name: "op", + Description: "1Password CLI enables you to automate administrative tasks and securely provision secrets across development environments.", + URLTemplate: ` + {{$os := .OS}} + {{$arch := .Arch}} + {{$version := .Version}} + + {{- if eq .Version "" -}} + {{ $version = "v2.17.0" }} + {{- end -}} + + {{- if eq .Arch "aarch64" -}} + {{ $arch = "arm64" }} + {{- else if eq .Arch "x86_64" -}} + {{ $arch = "amd64" }} + {{- else if eq .Arch "armv7l" -}} + {{ $arch = "arm" }} + {{- end -}} + + {{ if HasPrefix .OS "ming" -}} + {{$os = "windows"}} + {{- end -}} + + https://cache.agilebits.com/dist/1P/op2/pkg/{{$version}}/op_{{$os}}_{{$arch}}_{{$version}}.zip`, + }) + return tools } ++++++ arkade.obsinfo ++++++ --- /var/tmp/diff_new_pack.amdaHT/_old 2023-06-29 17:29:45.886764177 +0200 +++ /var/tmp/diff_new_pack.amdaHT/_new 2023-06-29 17:29:45.890764201 +0200 @@ -1,5 +1,5 @@ name: arkade -version: 0.9.22 -mtime: 1686385017 -commit: ab3f8aa2a12aa2f3407e8150b5bdea97fd582a6e +version: 0.9.23 +mtime: 1687957168 +commit: 3a36fb5e13bcb6455e000d3e06bcfd998e9895ef ++++++ vendor.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/otiai10/copy/README.md new/vendor/github.com/otiai10/copy/README.md --- old/vendor/github.com/otiai10/copy/README.md 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/github.com/otiai10/copy/README.md 2023-06-29 13:39:20.000000000 +0200 @@ -77,6 +77,15 @@ // If zero, the internal default buffer of 32KB is used. // See https://golang.org/pkg/io/#CopyBuffer for more information. CopyBufferSize uint + + // If you want to add some limitation on reading src file, + // you can wrap the src and provide new reader, + // such as `RateLimitReader` in the test case. + WrapReader func(src io.Reader) io.Reader + + // If given, copy.Copy refers to this fs.FS instead of the OS filesystem. + // e.g., You can use embed.FS to copy files from embedded filesystem. + FS fs.FS } ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/otiai10/copy/copy.go new/vendor/github.com/otiai10/copy/copy.go --- old/vendor/github.com/otiai10/copy/copy.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/github.com/otiai10/copy/copy.go 2023-06-29 13:39:20.000000000 +0200 @@ -2,6 +2,7 @@ import ( "io" + "io/fs" "io/ioutil" "os" "path/filepath" @@ -17,6 +18,13 @@ // Copy copies src to dest, doesn't matter if src is a directory or a file. func Copy(src, dest string, opts ...Options) error { opt := assureOptions(src, dest, opts...) + if opt.FS != nil { + info, err := fs.Stat(opt.FS, src) + if err != nil { + return onError(src, dest, err, opt) + } + return switchboard(src, dest, info, opt) + } info, err := os.Lstat(src) if err != nil { return onError(src, dest, err, opt) @@ -65,14 +73,20 @@ // with considering existence of parent directory // and file permission. func fcopy(src, dest string, info os.FileInfo, opt Options) (err error) { - s, err := os.Open(src) + + var readcloser io.ReadCloser + if opt.FS != nil { + readcloser, err = opt.FS.Open(src) + } else { + readcloser, err = os.Open(src) + } if err != nil { if os.IsNotExist(err) { return nil } return } - defer fclose(s, &err) + defer fclose(readcloser, &err) if err = os.MkdirAll(filepath.Dir(dest), os.ModePerm); err != nil { return @@ -92,10 +106,10 @@ var buf []byte = nil var w io.Writer = f - var r io.Reader = s + var r io.Reader = readcloser if opt.WrapReader != nil { - r = opt.WrapReader(s) + r = opt.WrapReader(r) } if opt.CopyBufferSize != 0 { @@ -145,7 +159,23 @@ } defer chmodfunc(&err) - contents, err := ioutil.ReadDir(srcdir) + var contents []os.FileInfo + if opt.FS != nil { + entries, err := fs.ReadDir(opt.FS, srcdir) + if err != nil { + return err + } + for _, e := range entries { + info, err := e.Info() + if err != nil { + return err + } + contents = append(contents, info) + } + } else { + contents, err = ioutil.ReadDir(srcdir) + } + if err != nil { if os.IsNotExist(err) { return nil @@ -237,7 +267,7 @@ // fclose ANYHOW closes file, // with asiging error raised during Close, // BUT respecting the error already reported. -func fclose(f *os.File, reported *error) { +func fclose(f io.Closer, reported *error) { if err := f.Close(); *reported == nil { *reported = err } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/otiai10/copy/options.go new/vendor/github.com/otiai10/copy/options.go --- old/vendor/github.com/otiai10/copy/options.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/github.com/otiai10/copy/options.go 2023-06-29 13:39:20.000000000 +0200 @@ -2,6 +2,7 @@ import ( "io" + "io/fs" "os" ) @@ -58,7 +59,11 @@ // If you want to add some limitation on reading src file, // you can wrap the src and provide new reader, // such as `RateLimitReader` in the test case. - WrapReader func(src *os.File) io.Reader + WrapReader func(src io.Reader) io.Reader + + // If given, copy.Copy refers to this fs.FS instead of the OS filesystem. + // e.g., You can use embed.FS to copy files from embedded filesystem. + FS fs.FS intent struct { src string diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/otiai10/copy/test/data/case18/assets/README.md new/vendor/github.com/otiai10/copy/test/data/case18/assets/README.md --- old/vendor/github.com/otiai10/copy/test/data/case18/assets/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor/github.com/otiai10/copy/test/data/case18/assets/README.md 2023-06-29 13:39:20.000000000 +0200 @@ -0,0 +1 @@ +# Hello \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/otiai10/copy/test_setup.go new/vendor/github.com/otiai10/copy/test_setup.go --- old/vendor/github.com/otiai10/copy/test_setup.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/github.com/otiai10/copy/test_setup.go 2023-06-29 13:39:20.000000000 +0200 @@ -16,4 +16,5 @@ os.Chmod("test/data/case07/dir_0555", 0o555) os.Chmod("test/data/case07/file_0444", 0o444) syscall.Mkfifo("test/data/case11/foo/bar", 0o555) + Copy("test/data/case18/assets", "test/data/case18/assets.backup") } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/otiai10/copy/test_setup_x.go new/vendor/github.com/otiai10/copy/test_setup_x.go --- old/vendor/github.com/otiai10/copy/test_setup_x.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/github.com/otiai10/copy/test_setup_x.go 2023-06-29 13:39:20.000000000 +0200 @@ -9,6 +9,7 @@ ) func setup(m *testing.M) { + os.RemoveAll("test/data.copy") os.MkdirAll("test/data.copy", os.ModePerm) os.Symlink("test/data/case01", "test/data/case03/case01") os.Chmod("test/data/case07/dir_0555", 0555) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/mkall.sh new/vendor/golang.org/x/sys/unix/mkall.sh --- old/vendor/golang.org/x/sys/unix/mkall.sh 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/mkall.sh 2023-06-29 13:39:20.000000000 +0200 @@ -50,7 +50,7 @@ # Use the Docker-based build system # Files generated through docker (use $cmd so you can Ctl-C the build or run) $cmd docker build --tag generate:$GOOS $GOOS - $cmd docker run --interactive --tty --volume $(cd -- "$(dirname -- "$0")/.." && /bin/pwd):/build generate:$GOOS + $cmd docker run --interactive --tty --volume $(cd -- "$(dirname -- "$0")/.." && pwd):/build generate:$GOOS exit fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/mkerrors.sh new/vendor/golang.org/x/sys/unix/mkerrors.sh --- old/vendor/golang.org/x/sys/unix/mkerrors.sh 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/mkerrors.sh 2023-06-29 13:39:20.000000000 +0200 @@ -741,7 +741,8 @@ e = errors[i].num; if(i > 0 && errors[i-1].num == e) continue; - strcpy(buf, strerror(e)); + strncpy(buf, strerror(e), sizeof(buf) - 1); + buf[sizeof(buf) - 1] = '\0'; // lowercase first letter: Bad -> bad, but STREAM -> STREAM. if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z) buf[0] += a - A; @@ -760,7 +761,8 @@ e = signals[i].num; if(i > 0 && signals[i-1].num == e) continue; - strcpy(buf, strsignal(e)); + strncpy(buf, strsignal(e), sizeof(buf) - 1); + buf[sizeof(buf) - 1] = '\0'; // lowercase first letter: Bad -> bad, but STREAM -> STREAM. if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z) buf[0] += a - A; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/syscall_linux.go new/vendor/golang.org/x/sys/unix/syscall_linux.go --- old/vendor/golang.org/x/sys/unix/syscall_linux.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/syscall_linux.go 2023-06-29 13:39:20.000000000 +0200 @@ -1699,12 +1699,23 @@ return ptracePoke(PTRACE_POKEUSR, PTRACE_PEEKUSR, pid, addr, data) } +// elfNT_PRSTATUS is a copy of the debug/elf.NT_PRSTATUS constant so +// x/sys/unix doesn't need to depend on debug/elf and thus +// compress/zlib, debug/dwarf, and other packages. +const elfNT_PRSTATUS = 1 + func PtraceGetRegs(pid int, regsout *PtraceRegs) (err error) { - return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout)) + var iov Iovec + iov.Base = (*byte)(unsafe.Pointer(regsout)) + iov.SetLen(int(unsafe.Sizeof(*regsout))) + return ptracePtr(PTRACE_GETREGSET, pid, uintptr(elfNT_PRSTATUS), unsafe.Pointer(&iov)) } func PtraceSetRegs(pid int, regs *PtraceRegs) (err error) { - return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs)) + var iov Iovec + iov.Base = (*byte)(unsafe.Pointer(regs)) + iov.SetLen(int(unsafe.Sizeof(*regs))) + return ptracePtr(PTRACE_SETREGSET, pid, uintptr(elfNT_PRSTATUS), unsafe.Pointer(&iov)) } func PtraceSetOptions(pid int, options int) (err error) { @@ -2420,6 +2431,21 @@ return rtSigprocmask(how, set, oldset, _C__NSIG/8) } +//sysnb getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) +//sysnb getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) + +func Getresuid() (ruid, euid, suid int) { + var r, e, s _C_int + getresuid(&r, &e, &s) + return int(r), int(e), int(s) +} + +func Getresgid() (rgid, egid, sgid int) { + var r, e, s _C_int + getresgid(&r, &e, &s) + return int(r), int(e), int(s) +} + /* * Unimplemented */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/syscall_openbsd.go new/vendor/golang.org/x/sys/unix/syscall_openbsd.go --- old/vendor/golang.org/x/sys/unix/syscall_openbsd.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/syscall_openbsd.go 2023-06-29 13:39:20.000000000 +0200 @@ -151,6 +151,21 @@ return } +//sysnb getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) +//sysnb getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) + +func Getresuid() (ruid, euid, suid int) { + var r, e, s _C_int + getresuid(&r, &e, &s) + return int(r), int(e), int(s) +} + +func Getresgid() (rgid, egid, sgid int) { + var r, e, s _C_int + getresgid(&r, &e, &s) + return int(r), int(e), int(s) +} + //sys ioctl(fd int, req uint, arg uintptr) (err error) //sys ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL @@ -338,8 +353,6 @@ // getgid // getitimer // getlogin -// getresgid -// getresuid // getthrid // ktrace // lfs_bmapv diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go new/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go --- old/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go 2023-06-29 13:39:20.000000000 +0200 @@ -329,6 +329,54 @@ SCM_WIFI_STATUS = 0x25 SFD_CLOEXEC = 0x400000 SFD_NONBLOCK = 0x4000 + SF_FP = 0x38 + SF_I0 = 0x20 + SF_I1 = 0x24 + SF_I2 = 0x28 + SF_I3 = 0x2c + SF_I4 = 0x30 + SF_I5 = 0x34 + SF_L0 = 0x0 + SF_L1 = 0x4 + SF_L2 = 0x8 + SF_L3 = 0xc + SF_L4 = 0x10 + SF_L5 = 0x14 + SF_L6 = 0x18 + SF_L7 = 0x1c + SF_PC = 0x3c + SF_RETP = 0x40 + SF_V9_FP = 0x70 + SF_V9_I0 = 0x40 + SF_V9_I1 = 0x48 + SF_V9_I2 = 0x50 + SF_V9_I3 = 0x58 + SF_V9_I4 = 0x60 + SF_V9_I5 = 0x68 + SF_V9_L0 = 0x0 + SF_V9_L1 = 0x8 + SF_V9_L2 = 0x10 + SF_V9_L3 = 0x18 + SF_V9_L4 = 0x20 + SF_V9_L5 = 0x28 + SF_V9_L6 = 0x30 + SF_V9_L7 = 0x38 + SF_V9_PC = 0x78 + SF_V9_RETP = 0x80 + SF_V9_XARG0 = 0x88 + SF_V9_XARG1 = 0x90 + SF_V9_XARG2 = 0x98 + SF_V9_XARG3 = 0xa0 + SF_V9_XARG4 = 0xa8 + SF_V9_XARG5 = 0xb0 + SF_V9_XXARG = 0xb8 + SF_XARG0 = 0x44 + SF_XARG1 = 0x48 + SF_XARG2 = 0x4c + SF_XARG3 = 0x50 + SF_XARG4 = 0x54 + SF_XARG5 = 0x58 + SF_XXARG = 0x5c SIOCATMARK = 0x8905 SIOCGPGRP = 0x8904 SIOCGSTAMPNS_NEW = 0x40108907 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_linux.go new/vendor/golang.org/x/sys/unix/zsyscall_linux.go --- old/vendor/golang.org/x/sys/unix/zsyscall_linux.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_linux.go 2023-06-29 13:39:20.000000000 +0200 @@ -2172,3 +2172,17 @@ } return } + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) { + RawSyscallNoError(SYS_GETRESUID, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid))) + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) { + RawSyscallNoError(SYS_GETRESGID, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid))) + return +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go 2023-06-29 13:39:20.000000000 +0200 @@ -519,6 +519,28 @@ // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) { + syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid))) + return +} + +var libc_getresuid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresuid getresuid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) { + syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid))) + return +} + +var libc_getresgid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresgid getresgid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func ioctl(fd int, req uint, arg uintptr) (err error) { _, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg)) if e1 != 0 { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s 2023-06-29 13:39:20.000000000 +0200 @@ -158,6 +158,16 @@ GLOBL ·libc_getcwd_trampoline_addr(SB), RODATA, $4 DATA ·libc_getcwd_trampoline_addr(SB)/4, $libc_getcwd_trampoline<>(SB) +TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0 + JMP libc_getresuid(SB) +GLOBL ·libc_getresuid_trampoline_addr(SB), RODATA, $4 +DATA ·libc_getresuid_trampoline_addr(SB)/4, $libc_getresuid_trampoline<>(SB) + +TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0 + JMP libc_getresgid(SB) +GLOBL ·libc_getresgid_trampoline_addr(SB), RODATA, $4 +DATA ·libc_getresgid_trampoline_addr(SB)/4, $libc_getresgid_trampoline<>(SB) + TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_ioctl(SB) GLOBL ·libc_ioctl_trampoline_addr(SB), RODATA, $4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go 2023-06-29 13:39:20.000000000 +0200 @@ -519,6 +519,28 @@ // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) { + syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid))) + return +} + +var libc_getresuid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresuid getresuid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) { + syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid))) + return +} + +var libc_getresgid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresgid getresgid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func ioctl(fd int, req uint, arg uintptr) (err error) { _, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg)) if e1 != 0 { @@ -527,6 +549,12 @@ return } +var libc_ioctl_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_ioctl ioctl "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) { _, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg)) if e1 != 0 { @@ -535,10 +563,6 @@ return } -var libc_ioctl_trampoline_addr uintptr - -//go:cgo_import_dynamic libc_ioctl ioctl "libc.so" - // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s 2023-06-29 13:39:20.000000000 +0200 @@ -158,6 +158,16 @@ GLOBL ·libc_getcwd_trampoline_addr(SB), RODATA, $8 DATA ·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB) +TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0 + JMP libc_getresuid(SB) +GLOBL ·libc_getresuid_trampoline_addr(SB), RODATA, $8 +DATA ·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB) + +TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0 + JMP libc_getresgid(SB) +GLOBL ·libc_getresgid_trampoline_addr(SB), RODATA, $8 +DATA ·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB) + TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_ioctl(SB) GLOBL ·libc_ioctl_trampoline_addr(SB), RODATA, $8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go 2023-06-29 13:39:20.000000000 +0200 @@ -519,6 +519,28 @@ // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) { + syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid))) + return +} + +var libc_getresuid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresuid getresuid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) { + syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid))) + return +} + +var libc_getresgid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresgid getresgid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func ioctl(fd int, req uint, arg uintptr) (err error) { _, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg)) if e1 != 0 { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s 2023-06-29 13:39:20.000000000 +0200 @@ -158,6 +158,16 @@ GLOBL ·libc_getcwd_trampoline_addr(SB), RODATA, $4 DATA ·libc_getcwd_trampoline_addr(SB)/4, $libc_getcwd_trampoline<>(SB) +TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0 + JMP libc_getresuid(SB) +GLOBL ·libc_getresuid_trampoline_addr(SB), RODATA, $4 +DATA ·libc_getresuid_trampoline_addr(SB)/4, $libc_getresuid_trampoline<>(SB) + +TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0 + JMP libc_getresgid(SB) +GLOBL ·libc_getresgid_trampoline_addr(SB), RODATA, $4 +DATA ·libc_getresgid_trampoline_addr(SB)/4, $libc_getresgid_trampoline<>(SB) + TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_ioctl(SB) GLOBL ·libc_ioctl_trampoline_addr(SB), RODATA, $4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go 2023-06-29 13:39:20.000000000 +0200 @@ -519,6 +519,28 @@ // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) { + syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid))) + return +} + +var libc_getresuid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresuid getresuid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) { + syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid))) + return +} + +var libc_getresgid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresgid getresgid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func ioctl(fd int, req uint, arg uintptr) (err error) { _, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg)) if e1 != 0 { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s 2023-06-29 13:39:20.000000000 +0200 @@ -158,6 +158,16 @@ GLOBL ·libc_getcwd_trampoline_addr(SB), RODATA, $8 DATA ·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB) +TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0 + JMP libc_getresuid(SB) +GLOBL ·libc_getresuid_trampoline_addr(SB), RODATA, $8 +DATA ·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB) + +TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0 + JMP libc_getresgid(SB) +GLOBL ·libc_getresgid_trampoline_addr(SB), RODATA, $8 +DATA ·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB) + TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_ioctl(SB) GLOBL ·libc_ioctl_trampoline_addr(SB), RODATA, $8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go 2023-06-29 13:39:20.000000000 +0200 @@ -519,6 +519,28 @@ // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) { + syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid))) + return +} + +var libc_getresuid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresuid getresuid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) { + syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid))) + return +} + +var libc_getresgid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresgid getresgid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func ioctl(fd int, req uint, arg uintptr) (err error) { _, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg)) if e1 != 0 { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s 2023-06-29 13:39:20.000000000 +0200 @@ -158,6 +158,16 @@ GLOBL ·libc_getcwd_trampoline_addr(SB), RODATA, $8 DATA ·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB) +TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0 + JMP libc_getresuid(SB) +GLOBL ·libc_getresuid_trampoline_addr(SB), RODATA, $8 +DATA ·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB) + +TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0 + JMP libc_getresgid(SB) +GLOBL ·libc_getresgid_trampoline_addr(SB), RODATA, $8 +DATA ·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB) + TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_ioctl(SB) GLOBL ·libc_ioctl_trampoline_addr(SB), RODATA, $8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go 2023-06-29 13:39:20.000000000 +0200 @@ -519,6 +519,28 @@ // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) { + syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid))) + return +} + +var libc_getresuid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresuid getresuid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) { + syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid))) + return +} + +var libc_getresgid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresgid getresgid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func ioctl(fd int, req uint, arg uintptr) (err error) { _, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg)) if e1 != 0 { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s 2023-06-29 13:39:20.000000000 +0200 @@ -189,6 +189,18 @@ GLOBL ·libc_getcwd_trampoline_addr(SB), RODATA, $8 DATA ·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB) +TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0 + CALL libc_getresuid(SB) + RET +GLOBL ·libc_getresuid_trampoline_addr(SB), RODATA, $8 +DATA ·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB) + +TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0 + CALL libc_getresgid(SB) + RET +GLOBL ·libc_getresgid_trampoline_addr(SB), RODATA, $8 +DATA ·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB) + TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0 CALL libc_ioctl(SB) RET diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go 2023-06-29 13:39:20.000000000 +0200 @@ -519,6 +519,28 @@ // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func getresuid(ruid *_C_int, euid *_C_int, suid *_C_int) { + syscall_rawSyscall(libc_getresuid_trampoline_addr, uintptr(unsafe.Pointer(ruid)), uintptr(unsafe.Pointer(euid)), uintptr(unsafe.Pointer(suid))) + return +} + +var libc_getresuid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresuid getresuid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) { + syscall_rawSyscall(libc_getresgid_trampoline_addr, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid))) + return +} + +var libc_getresgid_trampoline_addr uintptr + +//go:cgo_import_dynamic libc_getresgid getresgid "libc.so" + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func ioctl(fd int, req uint, arg uintptr) (err error) { _, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg)) if e1 != 0 { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s --- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s 2023-06-29 13:39:20.000000000 +0200 @@ -158,6 +158,16 @@ GLOBL ·libc_getcwd_trampoline_addr(SB), RODATA, $8 DATA ·libc_getcwd_trampoline_addr(SB)/8, $libc_getcwd_trampoline<>(SB) +TEXT libc_getresuid_trampoline<>(SB),NOSPLIT,$0-0 + JMP libc_getresuid(SB) +GLOBL ·libc_getresuid_trampoline_addr(SB), RODATA, $8 +DATA ·libc_getresuid_trampoline_addr(SB)/8, $libc_getresuid_trampoline<>(SB) + +TEXT libc_getresgid_trampoline<>(SB),NOSPLIT,$0-0 + JMP libc_getresgid(SB) +GLOBL ·libc_getresgid_trampoline_addr(SB), RODATA, $8 +DATA ·libc_getresgid_trampoline_addr(SB)/8, $libc_getresgid_trampoline<>(SB) + TEXT libc_ioctl_trampoline<>(SB),NOSPLIT,$0-0 JMP libc_ioctl(SB) GLOBL ·libc_ioctl_trampoline_addr(SB), RODATA, $8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/ztypes_linux.go new/vendor/golang.org/x/sys/unix/ztypes_linux.go --- old/vendor/golang.org/x/sys/unix/ztypes_linux.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/unix/ztypes_linux.go 2023-06-29 13:39:20.000000000 +0200 @@ -2555,6 +2555,11 @@ BPF_REG_8 = 0x8 BPF_REG_9 = 0x9 BPF_REG_10 = 0xa + BPF_CGROUP_ITER_ORDER_UNSPEC = 0x0 + BPF_CGROUP_ITER_SELF_ONLY = 0x1 + BPF_CGROUP_ITER_DESCENDANTS_PRE = 0x2 + BPF_CGROUP_ITER_DESCENDANTS_POST = 0x3 + BPF_CGROUP_ITER_ANCESTORS_UP = 0x4 BPF_MAP_CREATE = 0x0 BPF_MAP_LOOKUP_ELEM = 0x1 BPF_MAP_UPDATE_ELEM = 0x2 @@ -2566,6 +2571,7 @@ BPF_PROG_ATTACH = 0x8 BPF_PROG_DETACH = 0x9 BPF_PROG_TEST_RUN = 0xa + BPF_PROG_RUN = 0xa BPF_PROG_GET_NEXT_ID = 0xb BPF_MAP_GET_NEXT_ID = 0xc BPF_PROG_GET_FD_BY_ID = 0xd @@ -2610,6 +2616,7 @@ BPF_MAP_TYPE_CPUMAP = 0x10 BPF_MAP_TYPE_XSKMAP = 0x11 BPF_MAP_TYPE_SOCKHASH = 0x12 + BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED = 0x13 BPF_MAP_TYPE_CGROUP_STORAGE = 0x13 BPF_MAP_TYPE_REUSEPORT_SOCKARRAY = 0x14 BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = 0x15 @@ -2620,6 +2627,10 @@ BPF_MAP_TYPE_STRUCT_OPS = 0x1a BPF_MAP_TYPE_RINGBUF = 0x1b BPF_MAP_TYPE_INODE_STORAGE = 0x1c + BPF_MAP_TYPE_TASK_STORAGE = 0x1d + BPF_MAP_TYPE_BLOOM_FILTER = 0x1e + BPF_MAP_TYPE_USER_RINGBUF = 0x1f + BPF_MAP_TYPE_CGRP_STORAGE = 0x20 BPF_PROG_TYPE_UNSPEC = 0x0 BPF_PROG_TYPE_SOCKET_FILTER = 0x1 BPF_PROG_TYPE_KPROBE = 0x2 @@ -2651,6 +2662,7 @@ BPF_PROG_TYPE_EXT = 0x1c BPF_PROG_TYPE_LSM = 0x1d BPF_PROG_TYPE_SK_LOOKUP = 0x1e + BPF_PROG_TYPE_SYSCALL = 0x1f BPF_CGROUP_INET_INGRESS = 0x0 BPF_CGROUP_INET_EGRESS = 0x1 BPF_CGROUP_INET_SOCK_CREATE = 0x2 @@ -2689,6 +2701,12 @@ BPF_XDP_CPUMAP = 0x23 BPF_SK_LOOKUP = 0x24 BPF_XDP = 0x25 + BPF_SK_SKB_VERDICT = 0x26 + BPF_SK_REUSEPORT_SELECT = 0x27 + BPF_SK_REUSEPORT_SELECT_OR_MIGRATE = 0x28 + BPF_PERF_EVENT = 0x29 + BPF_TRACE_KPROBE_MULTI = 0x2a + BPF_LSM_CGROUP = 0x2b BPF_LINK_TYPE_UNSPEC = 0x0 BPF_LINK_TYPE_RAW_TRACEPOINT = 0x1 BPF_LINK_TYPE_TRACING = 0x2 @@ -2696,6 +2714,9 @@ BPF_LINK_TYPE_ITER = 0x4 BPF_LINK_TYPE_NETNS = 0x5 BPF_LINK_TYPE_XDP = 0x6 + BPF_LINK_TYPE_PERF_EVENT = 0x7 + BPF_LINK_TYPE_KPROBE_MULTI = 0x8 + BPF_LINK_TYPE_STRUCT_OPS = 0x9 BPF_ANY = 0x0 BPF_NOEXIST = 0x1 BPF_EXIST = 0x2 @@ -2733,6 +2754,7 @@ BPF_F_ZERO_CSUM_TX = 0x2 BPF_F_DONT_FRAGMENT = 0x4 BPF_F_SEQ_NUMBER = 0x8 + BPF_F_TUNINFO_FLAGS = 0x10 BPF_F_INDEX_MASK = 0xffffffff BPF_F_CURRENT_CPU = 0xffffffff BPF_F_CTXLEN_MASK = 0xfffff00000000 @@ -2747,6 +2769,7 @@ BPF_F_ADJ_ROOM_ENCAP_L4_GRE = 0x8 BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10 BPF_F_ADJ_ROOM_NO_CSUM_RESET = 0x20 + BPF_F_ADJ_ROOM_ENCAP_L2_ETH = 0x40 BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38 BPF_F_SYSCTL_BASE_NAME = 0x1 @@ -2771,10 +2794,16 @@ BPF_LWT_ENCAP_SEG6 = 0x0 BPF_LWT_ENCAP_SEG6_INLINE = 0x1 BPF_LWT_ENCAP_IP = 0x2 + BPF_F_BPRM_SECUREEXEC = 0x1 + BPF_F_BROADCAST = 0x8 + BPF_F_EXCLUDE_INGRESS = 0x10 + BPF_SKB_TSTAMP_UNSPEC = 0x0 + BPF_SKB_TSTAMP_DELIVERY_MONO = 0x1 BPF_OK = 0x0 BPF_DROP = 0x2 BPF_REDIRECT = 0x7 BPF_LWT_REROUTE = 0x80 + BPF_FLOW_DISSECTOR_CONTINUE = 0x81 BPF_SOCK_OPS_RTO_CB_FLAG = 0x1 BPF_SOCK_OPS_RETRANS_CB_FLAG = 0x2 BPF_SOCK_OPS_STATE_CB_FLAG = 0x4 @@ -2838,6 +2867,10 @@ BPF_FIB_LKUP_RET_UNSUPP_LWT = 0x6 BPF_FIB_LKUP_RET_NO_NEIGH = 0x7 BPF_FIB_LKUP_RET_FRAG_NEEDED = 0x8 + BPF_MTU_CHK_SEGS = 0x1 + BPF_MTU_CHK_RET_SUCCESS = 0x0 + BPF_MTU_CHK_RET_FRAG_NEEDED = 0x1 + BPF_MTU_CHK_RET_SEGS_TOOBIG = 0x2 BPF_FD_TYPE_RAW_TRACEPOINT = 0x0 BPF_FD_TYPE_TRACEPOINT = 0x1 BPF_FD_TYPE_KPROBE = 0x2 @@ -2847,6 +2880,19 @@ BPF_FLOW_DISSECTOR_F_PARSE_1ST_FRAG = 0x1 BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL = 0x2 BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP = 0x4 + BPF_CORE_FIELD_BYTE_OFFSET = 0x0 + BPF_CORE_FIELD_BYTE_SIZE = 0x1 + BPF_CORE_FIELD_EXISTS = 0x2 + BPF_CORE_FIELD_SIGNED = 0x3 + BPF_CORE_FIELD_LSHIFT_U64 = 0x4 + BPF_CORE_FIELD_RSHIFT_U64 = 0x5 + BPF_CORE_TYPE_ID_LOCAL = 0x6 + BPF_CORE_TYPE_ID_TARGET = 0x7 + BPF_CORE_TYPE_EXISTS = 0x8 + BPF_CORE_TYPE_SIZE = 0x9 + BPF_CORE_ENUMVAL_EXISTS = 0xa + BPF_CORE_ENUMVAL_VALUE = 0xb + BPF_CORE_TYPE_MATCHES = 0xc ) const ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/windows/syscall_windows.go new/vendor/golang.org/x/sys/windows/syscall_windows.go --- old/vendor/golang.org/x/sys/windows/syscall_windows.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/windows/syscall_windows.go 2023-06-29 13:39:20.000000000 +0200 @@ -405,7 +405,7 @@ //sys VerQueryValue(block unsafe.Pointer, subBlock string, pointerToBufferPointer unsafe.Pointer, bufSize *uint32) (err error) = version.VerQueryValueW // Process Status API (PSAPI) -//sys EnumProcesses(processIds []uint32, bytesReturned *uint32) (err error) = psapi.EnumProcesses +//sys enumProcesses(processIds *uint32, nSize uint32, bytesReturned *uint32) (err error) = psapi.EnumProcesses //sys EnumProcessModules(process Handle, module *Handle, cb uint32, cbNeeded *uint32) (err error) = psapi.EnumProcessModules //sys EnumProcessModulesEx(process Handle, module *Handle, cb uint32, cbNeeded *uint32, filterFlag uint32) (err error) = psapi.EnumProcessModulesEx //sys GetModuleInformation(process Handle, module Handle, modinfo *ModuleInfo, cb uint32) (err error) = psapi.GetModuleInformation @@ -1354,6 +1354,17 @@ return syscall.EWINDOWS } +func EnumProcesses(processIds []uint32, bytesReturned *uint32) error { + // EnumProcesses syscall expects the size parameter to be in bytes, but the code generated with mksyscall uses + // the length of the processIds slice instead. Hence, this wrapper function is added to fix the discrepancy. + var p *uint32 + if len(processIds) > 0 { + p = &processIds[0] + } + size := uint32(len(processIds) * 4) + return enumProcesses(p, size, bytesReturned) +} + func Getpid() (pid int) { return int(GetCurrentProcessId()) } func FindFirstFile(name *uint16, data *Win32finddata) (handle Handle, err error) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/golang.org/x/sys/windows/zsyscall_windows.go new/vendor/golang.org/x/sys/windows/zsyscall_windows.go --- old/vendor/golang.org/x/sys/windows/zsyscall_windows.go 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/golang.org/x/sys/windows/zsyscall_windows.go 2023-06-29 13:39:20.000000000 +0200 @@ -3516,12 +3516,8 @@ return } -func EnumProcesses(processIds []uint32, bytesReturned *uint32) (err error) { - var _p0 *uint32 - if len(processIds) > 0 { - _p0 = &processIds[0] - } - r1, _, e1 := syscall.Syscall(procEnumProcesses.Addr(), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(processIds)), uintptr(unsafe.Pointer(bytesReturned))) +func enumProcesses(processIds *uint32, nSize uint32, bytesReturned *uint32) (err error) { + r1, _, e1 := syscall.Syscall(procEnumProcesses.Addr(), 3, uintptr(unsafe.Pointer(processIds)), uintptr(nSize), uintptr(unsafe.Pointer(bytesReturned))) if r1 == 0 { err = errnoErr(e1) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/modules.txt new/vendor/modules.txt --- old/vendor/modules.txt 2023-06-13 13:04:01.000000000 +0200 +++ new/vendor/modules.txt 2023-06-29 13:39:20.000000000 +0200 @@ -106,7 +106,7 @@ ## explicit; go 1.18 github.com/opencontainers/image-spec/specs-go github.com/opencontainers/image-spec/specs-go/v1 -# github.com/otiai10/copy v1.11.0 +# github.com/otiai10/copy v1.12.0 ## explicit; go 1.18 github.com/otiai10/copy # github.com/pkg/errors v0.9.1 @@ -130,17 +130,17 @@ # github.com/vbatts/tar-split v0.11.3 ## explicit; go 1.15 github.com/vbatts/tar-split/archive/tar -# golang.org/x/crypto v0.9.0 +# golang.org/x/crypto v0.10.0 ## explicit; go 1.17 golang.org/x/crypto/bcrypt golang.org/x/crypto/blowfish -# golang.org/x/mod v0.10.0 +# golang.org/x/mod v0.11.0 ## explicit; go 1.17 golang.org/x/mod/semver # golang.org/x/sync v0.1.0 ## explicit golang.org/x/sync/errgroup -# golang.org/x/sys v0.8.0 +# golang.org/x/sys v0.9.0 ## explicit; go 1.17 golang.org/x/sys/execabs golang.org/x/sys/internal/unsafeheader