From 28dd960cbf9f132269afbbe872a4ca41503801e1 Mon Sep 17 00:00:00 2001 From: boris smidt Date: Tue, 5 Nov 2024 20:43:30 +0100 Subject: [PATCH 1/6] feat(libbpf/bpftool): scaffold libbpf/bpftool --- pkgs/libbpf/bpftool/pkg.yaml | 1 + pkgs/libbpf/bpftool/registry.yaml | 9 +++++++++ registry.yaml | 8 ++++++++ 3 files changed, 18 insertions(+) create mode 100644 pkgs/libbpf/bpftool/pkg.yaml create mode 100644 pkgs/libbpf/bpftool/registry.yaml diff --git a/pkgs/libbpf/bpftool/pkg.yaml b/pkgs/libbpf/bpftool/pkg.yaml new file mode 100644 index 00000000000..3334c0e4395 --- /dev/null +++ b/pkgs/libbpf/bpftool/pkg.yaml @@ -0,0 +1 @@ +packages: [] diff --git a/pkgs/libbpf/bpftool/registry.yaml b/pkgs/libbpf/bpftool/registry.yaml new file mode 100644 index 00000000000..970099897b4 --- /dev/null +++ b/pkgs/libbpf/bpftool/registry.yaml @@ -0,0 +1,9 @@ +packages: + - type: github_release + repo_owner: libbpf + repo_name: bpftool + description: Automated upstream mirror for bpftool stand-alone build + version_constraint: "false" + version_overrides: + - version_constraint: "true" + no_asset: true diff --git a/registry.yaml b/registry.yaml index fca1ce4255d..60a92298aae 100644 --- a/registry.yaml +++ b/registry.yaml @@ -31488,6 +31488,14 @@ packages: description: Automatic Linux privesc via exploitation of low-hanging fruit e.g. gtfobins, pwnkit, dirty pipe, +w docker.sock supported_envs: - linux + - type: github_release + repo_owner: libbpf + repo_name: bpftool + description: Automated upstream mirror for bpftool stand-alone build + version_constraint: "false" + version_overrides: + - version_constraint: "true" + no_asset: true - type: github_release repo_owner: librespeed repo_name: speedtest-cli From 9f09bae3471397eadebb8a2cd50060c17a770840 Mon Sep 17 00:00:00 2001 From: boris smidt Date: Tue, 5 Nov 2024 21:12:59 +0100 Subject: [PATCH 2/6] Manually update the files to make it work. --- aqua.yaml | 1 + pkgs/libbpf/bpftool/pkg.yaml | 5 ++++- pkgs/libbpf/bpftool/registry.yaml | 11 +++++++++-- registry.yaml | 11 +++++++++-- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/aqua.yaml b/aqua.yaml index 321494f9679..f76cf02c2c9 100644 --- a/aqua.yaml +++ b/aqua.yaml @@ -13,3 +13,4 @@ packages: - name: suzuki-shunsuke/cmdx@v1.7.4 - name: jqlang/jq@jq-1.7.1 - name: cli/cli@v2.60.1 + - name: libbpf/bpftool@v7.5.0 diff --git a/pkgs/libbpf/bpftool/pkg.yaml b/pkgs/libbpf/bpftool/pkg.yaml index 3334c0e4395..2a4f21cd993 100644 --- a/pkgs/libbpf/bpftool/pkg.yaml +++ b/pkgs/libbpf/bpftool/pkg.yaml @@ -1 +1,4 @@ -packages: [] +packages: + - name: libbpf/bpftool@v7.5.0 + - name: libbpf/bpftool + version: v7.2.0 \ No newline at end of file diff --git a/pkgs/libbpf/bpftool/registry.yaml b/pkgs/libbpf/bpftool/registry.yaml index 970099897b4..4ef250807f1 100644 --- a/pkgs/libbpf/bpftool/registry.yaml +++ b/pkgs/libbpf/bpftool/registry.yaml @@ -5,5 +5,12 @@ packages: description: Automated upstream mirror for bpftool stand-alone build version_constraint: "false" version_overrides: - - version_constraint: "true" - no_asset: true + - version_constraint: semver(">= 7.2.0") + asset: bpftool-{{ .Version}}-{{.Arch}}.tar.gz + checksum: + type: github_release + asset: bpftool-{{ .Version}}-{{.Arch}}.tar.gz.sha256sum + algorithm: sha256 + supported_envs: + - linux/amd64 + - linux/arm64 \ No newline at end of file diff --git a/registry.yaml b/registry.yaml index 60a92298aae..968e06f7811 100644 --- a/registry.yaml +++ b/registry.yaml @@ -31494,8 +31494,15 @@ packages: description: Automated upstream mirror for bpftool stand-alone build version_constraint: "false" version_overrides: - - version_constraint: "true" - no_asset: true + - version_constraint: semver(">= 7.2.0") + asset: bpftool-{{ .Version}}-{{.Arch}}.tar.gz + checksum: + type: github_release + asset: bpftool-{{ .Version}}-{{.Arch}}.tar.gz.sha256sum + algorithm: sha256 + supported_envs: + - linux/amd64 + - linux/arm64 - type: github_release repo_owner: librespeed repo_name: speedtest-cli From bda7c84deea781d89b370f38e78600803c36d70e Mon Sep 17 00:00:00 2001 From: boris smidt Date: Tue, 5 Nov 2024 21:15:56 +0100 Subject: [PATCH 3/6] Add format --- pkgs/libbpf/bpftool/registry.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/libbpf/bpftool/registry.yaml b/pkgs/libbpf/bpftool/registry.yaml index 4ef250807f1..0707d29e5cf 100644 --- a/pkgs/libbpf/bpftool/registry.yaml +++ b/pkgs/libbpf/bpftool/registry.yaml @@ -6,10 +6,13 @@ packages: version_constraint: "false" version_overrides: - version_constraint: semver(">= 7.2.0") - asset: bpftool-{{ .Version}}-{{.Arch}}.tar.gz + asset: bpftool-{{ .Version}}-{{.Arch}}.{{.Format}} + format: tar.gz + files: + - name: bpftool checksum: type: github_release - asset: bpftool-{{ .Version}}-{{.Arch}}.tar.gz.sha256sum + asset: bpftool-{{ .Version}}-{{.Arch}}.{{.Format}}.sha256sum algorithm: sha256 supported_envs: - linux/amd64 From 73bbd635ab3449ba655f11f0a843bbd59b994d3e Mon Sep 17 00:00:00 2001 From: boris smidt Date: Tue, 5 Nov 2024 21:17:21 +0100 Subject: [PATCH 4/6] Update the registry.yaml --- registry.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/registry.yaml b/registry.yaml index 968e06f7811..4aae9f2d25f 100644 --- a/registry.yaml +++ b/registry.yaml @@ -31495,10 +31495,13 @@ packages: version_constraint: "false" version_overrides: - version_constraint: semver(">= 7.2.0") - asset: bpftool-{{ .Version}}-{{.Arch}}.tar.gz + asset: bpftool-{{ .Version}}-{{.Arch}}.{{.Format}} + format: tar.gz + files: + - name: bpftool checksum: type: github_release - asset: bpftool-{{ .Version}}-{{.Arch}}.tar.gz.sha256sum + asset: bpftool-{{ .Version}}-{{.Arch}}.{{.Format}}.sha256sum algorithm: sha256 supported_envs: - linux/amd64 From 6eb5f65cf6a9a171cd5c6a4339fd08b3d297b5e8 Mon Sep 17 00:00:00 2001 From: boris smidt Date: Tue, 5 Nov 2024 21:23:01 +0100 Subject: [PATCH 5/6] Add new lines --- aqua.yaml | 1 - pkgs/libbpf/bpftool/pkg.yaml | 2 +- pkgs/libbpf/bpftool/registry.yaml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/aqua.yaml b/aqua.yaml index f76cf02c2c9..321494f9679 100644 --- a/aqua.yaml +++ b/aqua.yaml @@ -13,4 +13,3 @@ packages: - name: suzuki-shunsuke/cmdx@v1.7.4 - name: jqlang/jq@jq-1.7.1 - name: cli/cli@v2.60.1 - - name: libbpf/bpftool@v7.5.0 diff --git a/pkgs/libbpf/bpftool/pkg.yaml b/pkgs/libbpf/bpftool/pkg.yaml index 2a4f21cd993..0e6a1730aea 100644 --- a/pkgs/libbpf/bpftool/pkg.yaml +++ b/pkgs/libbpf/bpftool/pkg.yaml @@ -1,4 +1,4 @@ packages: - name: libbpf/bpftool@v7.5.0 - name: libbpf/bpftool - version: v7.2.0 \ No newline at end of file + version: v7.2.0 diff --git a/pkgs/libbpf/bpftool/registry.yaml b/pkgs/libbpf/bpftool/registry.yaml index 0707d29e5cf..9f7b66f2e25 100644 --- a/pkgs/libbpf/bpftool/registry.yaml +++ b/pkgs/libbpf/bpftool/registry.yaml @@ -16,4 +16,4 @@ packages: algorithm: sha256 supported_envs: - linux/amd64 - - linux/arm64 \ No newline at end of file + - linux/arm64 From 0d380f188289530624fefb0e28f4ebf29053cb68 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Wed, 6 Nov 2024 06:41:54 +0900 Subject: [PATCH 6/6] fix(libbpf/bpftool): use `no_asset: true` --- pkgs/libbpf/bpftool/registry.yaml | 9 ++++----- registry.yaml | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/libbpf/bpftool/registry.yaml b/pkgs/libbpf/bpftool/registry.yaml index 9f7b66f2e25..d5a0b11b7b0 100644 --- a/pkgs/libbpf/bpftool/registry.yaml +++ b/pkgs/libbpf/bpftool/registry.yaml @@ -5,15 +5,14 @@ packages: description: Automated upstream mirror for bpftool stand-alone build version_constraint: "false" version_overrides: - - version_constraint: semver(">= 7.2.0") + - version_constraint: semver("<= 7.1.0") + no_asset: true + - version_constraint: "true" asset: bpftool-{{ .Version}}-{{.Arch}}.{{.Format}} format: tar.gz - files: - - name: bpftool checksum: type: github_release asset: bpftool-{{ .Version}}-{{.Arch}}.{{.Format}}.sha256sum algorithm: sha256 supported_envs: - - linux/amd64 - - linux/arm64 + - linux diff --git a/registry.yaml b/registry.yaml index 4aae9f2d25f..7dc54fcfac6 100644 --- a/registry.yaml +++ b/registry.yaml @@ -31494,18 +31494,17 @@ packages: description: Automated upstream mirror for bpftool stand-alone build version_constraint: "false" version_overrides: - - version_constraint: semver(">= 7.2.0") + - version_constraint: semver("<= 7.1.0") + no_asset: true + - version_constraint: "true" asset: bpftool-{{ .Version}}-{{.Arch}}.{{.Format}} format: tar.gz - files: - - name: bpftool checksum: type: github_release asset: bpftool-{{ .Version}}-{{.Arch}}.{{.Format}}.sha256sum algorithm: sha256 supported_envs: - - linux/amd64 - - linux/arm64 + - linux - type: github_release repo_owner: librespeed repo_name: speedtest-cli