Skip to content

Commit 6997bc5

Browse files
authored
Merge branch 'main' into 20260420-fpr
2 parents ae2f71b + 5c61120 commit 6997bc5

17 files changed

Lines changed: 12292 additions & 12117 deletions

.github/workflows/digestabot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
release-assets.githubusercontent.com:443
3737
tuf-repo-cdn.sigstore.dev:443
3838
39-
- uses: chainguard-dev/actions/setup-gitsign@de68b87302e6266db5fb5220246f8aa46fe94b67
39+
- uses: chainguard-dev/actions/setup-gitsign@061bc0e921116bde1470f51fb5c86d5318f16558
4040

4141
- uses: octo-sts/action@f603d3be9d8dd9871a265776e625a27b00effe05 # v1.1.1
4242
id: octo-sts

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
github.com:443
3030
octo-sts.dev:443
3131
release-assets.githubusercontent.com:443
32-
- uses: chainguard-dev/actions/setup-gitsign@de68b87302e6266db5fb5220246f8aa46fe94b67
32+
- uses: chainguard-dev/actions/setup-gitsign@061bc0e921116bde1470f51fb5c86d5318f16558
3333
- name: Set up Octo-STS
3434
uses: octo-sts/action@f603d3be9d8dd9871a265776e625a27b00effe05 # v1.1.1
3535
id: octo-sts

.github/workflows/style.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
go-version-file: go.mod
126126
check-latest: true
127127

128-
- uses: chainguard-dev/actions/gofmt@de68b87302e6266db5fb5220246f8aa46fe94b67 # main
128+
- uses: chainguard-dev/actions/gofmt@061bc0e921116bde1470f51fb5c86d5318f16558 # main
129129
with:
130130
args: -s
131131

@@ -163,7 +163,7 @@ jobs:
163163
go-version-file: go.mod
164164
check-latest: true
165165

166-
- uses: chainguard-dev/actions/goimports@de68b87302e6266db5fb5220246f8aa46fe94b67 # main
166+
- uses: chainguard-dev/actions/goimports@061bc0e921116bde1470f51fb5c86d5318f16558 # main
167167

168168
golangci-lint:
169169
name: golangci-lint

.github/workflows/third-party.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
apk update
4343
apk add bash curl findutils gh git gnutar ${{ env.GO_RELEASE }} nodejs perl upx xz yara-x~${{ env.YARA_X_RELEASE }}
44-
- uses: chainguard-dev/actions/setup-gitsign@de68b87302e6266db5fb5220246f8aa46fe94b67
44+
- uses: chainguard-dev/actions/setup-gitsign@061bc0e921116bde1470f51fb5c86d5318f16558
4545
- name: Set up Octo-STS
4646
uses: octo-sts/action@f603d3be9d8dd9871a265776e625a27b00effe05 # v1.1.1
4747
id: octo-sts

.github/workflows/update-yara-x.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
sum.golang.org:443
112112
tuf-repo-cdn.sigstore.dev:443
113113
114-
- uses: chainguard-dev/actions/setup-gitsign@de68b87302e6266db5fb5220246f8aa46fe94b67
114+
- uses: chainguard-dev/actions/setup-gitsign@061bc0e921116bde1470f51fb5c86d5318f16558
115115
- name: Set up Octo-STS
116116
uses: octo-sts/action@f603d3be9d8dd9871a265776e625a27b00effe05 # v1.1.1
117117
id: octo-sts

.github/workflows/version.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
rekor.sigstore.dev:443
4040
release-assets.githubusercontent.com:443
4141
tuf-repo-cdn.sigstore.dev:443
42-
- uses: chainguard-dev/actions/setup-gitsign@de68b87302e6266db5fb5220246f8aa46fe94b67
42+
- uses: chainguard-dev/actions/setup-gitsign@061bc0e921116bde1470f51fb5c86d5318f16558
4343
- name: Set up Octo-STS
4444
uses: octo-sts/action@f603d3be9d8dd9871a265776e625a27b00effe05 # v1.1.1
4545
id: octo-sts

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/chainguard-dev/malcontent
22

3-
go 1.26.1
3+
go 1.26.2
44

55
require (
66
github.com/VirusTotal/yara-x/go v1.15.0
@@ -12,7 +12,7 @@ require (
1212
github.com/charmbracelet/lipgloss v1.1.0
1313
github.com/cosnicolaou/pbzip2 v1.0.6
1414
github.com/egibs/go-debian v0.19.3
15-
github.com/egibs/reconcile v0.3.0
15+
github.com/egibs/reconcile v0.4.0
1616
github.com/fatih/color v1.19.0
1717
github.com/gabriel-vasile/mimetype v1.4.13
1818
github.com/google/go-cmp v0.7.0
@@ -21,7 +21,7 @@ require (
2121
github.com/klauspost/pgzip v1.2.6
2222
github.com/minio/sha256-simd v1.0.1
2323
github.com/olekukonko/tablewriter v1.1.4
24-
github.com/puzpuzpuz/xsync/v4 v4.4.0
24+
github.com/puzpuzpuz/xsync/v4 v4.5.0
2525
github.com/shirou/gopsutil/v4 v4.26.3
2626
github.com/ulikunitz/xz v0.5.15
2727
github.com/urfave/cli/v3 v3.8.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ github.com/ebitengine/purego v0.10.0 h1:QIw4xfpWT6GWTzaW5XEKy3HXoqrJGx1ijYHzTF0/
4646
github.com/ebitengine/purego v0.10.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
4747
github.com/egibs/go-debian v0.19.3 h1:daSpxqoOL0i25KCuKcy5h+6ucQzSS9QD0hMAH6swRQc=
4848
github.com/egibs/go-debian v0.19.3/go.mod h1:heIPouUaS2YMRC8IIwUNZCZ44k3NJTm7u4XAHvgShnU=
49-
github.com/egibs/reconcile v0.3.0 h1:ZVUR21PRW65CHz/8BCw5zn4DM20cGY+JCoOf1kYjGYE=
50-
github.com/egibs/reconcile v0.3.0/go.mod h1:qdYs6llt5Z7keNCPLysb4f4K4mV1RkUMA+12dYo5+0A=
49+
github.com/egibs/reconcile v0.4.0 h1:Vzw/yGabfka+AgJGPusAkQKufMBfIbhTnpI/yRKIYok=
50+
github.com/egibs/reconcile v0.4.0/go.mod h1:WwpWHM/r+kPnQv6puRqtRxmYDAY7PHr6HTVXpJNrxQ4=
5151
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
5252
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
5353
github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w=
@@ -114,8 +114,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
114114
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
115115
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
116116
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
117-
github.com/puzpuzpuz/xsync/v4 v4.4.0 h1:vlSN6/CkEY0pY8KaB0yqo/pCLZvp9nhdbBdjipT4gWo=
118-
github.com/puzpuzpuz/xsync/v4 v4.4.0/go.mod h1:VJDmTCJMBt8igNxnkQd86r+8KUeN1quSfNKu5bLYFQo=
117+
github.com/puzpuzpuz/xsync/v4 v4.5.0 h1:vOSWu6b57/emh+L/Cw0BeQfvxa/cogFywXHeGUxQxAg=
118+
github.com/puzpuzpuz/xsync/v4 v4.5.0/go.mod h1:VJDmTCJMBt8igNxnkQd86r+8KUeN1quSfNKu5bLYFQo=
119119
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
120120
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
121121
github.com/shirou/gopsutil/v4 v4.26.3 h1:2ESdQt90yU3oXF/CdOlRCJxrP+Am1aBYubTMTfxJ1qc=

pkg/release/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
const (
12-
ID string = "v1.22.1"
12+
ID string = "v1.22.2"
1313
)
1414

1515
// Check if the build info contains a version.

tests/linux/2024.sliver/de33b8d9694b6b4c44e3459b2151571af5d0e2031551f9f1a70b6db475ba71b2.elf.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
],
2727
"RiskScore": 4,
2828
"RiskLevel": "CRITICAL",
29-
"RuleURL": "https://github.com/Neo23x0/signature-base/blob/8a89b3bf54517bbc35718460321d42536e1e6198/yara/gen_gobfuscate.yar#L2-L18",
29+
"RuleURL": "https://github.com/Neo23x0/signature-base/blob/eaf65c0c2c2a7c4b5888b22f4b815369e6465e27/yara/gen_gobfuscate.yar#L2-L18",
3030
"ReferenceURL": "https://github.com/unixpickle/gobfuscate",
3131
"RuleAuthor": "James Quinn, Paul Hager (merged with new similar pattern)",
32-
"RuleLicenseURL": "https://github.com/Neo23x0/signature-base/blob/8a89b3bf54517bbc35718460321d42536e1e6198/LICENSE",
32+
"RuleLicenseURL": "https://github.com/Neo23x0/signature-base/blob/eaf65c0c2c2a7c4b5888b22f4b815369e6465e27/LICENSE",
3333
"ID": "3P/YARAForge/signature_susp_gobfuscate",
3434
"RuleName": "SIGNATURE_BASE_SUSP_Gobfuscate_May21"
3535
},

0 commit comments

Comments
 (0)