Skip to content

Commit

Permalink
Bump all 3rd-party deps and workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Haist authored and hillu committed Nov 21, 2024
1 parent a6e4a8f commit 0aa923e
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 491 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ jobs:
build-linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: 1.16
go-version: 1.21

- name: Install cross-build dependencies
run: sudo apt-get -qq -y update && sudo apt-get -qq -y --no-install-recommends install make gcc gcc-multilib gcc-mingw-w64 autoconf automake libtool pkg-config ca-certificates wget patch sed git-core moreutils zip
Expand All @@ -30,15 +30,15 @@ jobs:
run: make release VERSIONSUFFIX=+$GITHUB_SHA

- name: Upload a Build Artifact
uses: actions/upload-artifact@v2.2.4
uses: actions/upload-artifact@v4
with:
name: spyre-zips
path: spyre-*.zip

build-macosx:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Update build environment
run: |
Expand All @@ -58,7 +58,7 @@ jobs:
run: gmake release VERSIONSUFFIX=+$GITHUB_SHA

- name: Upload a Build Artifact
uses: actions/upload-artifact@v2.2.4
uses: actions/upload-artifact@v4
with:
name: spyre-macosx-zips
path: spyre-*.zip
14 changes: 7 additions & 7 deletions 3rdparty.mk
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ endef
3rdparty_JOBS := 8
3rdparty_TARGETS := yara musl openssl

yara_VERSION := 4.2.3
yara_VERSION := 4.5.2
yara_URL := https://github.com/VirusTotal/yara/archive/v$(yara_VERSION).tar.gz
yara_ARCHS := $(3rdparty_ARCHS)
# This is executed in the source directory
yara_PREP := ./bootstrap.sh

musl_VERSION := 1.2.3
musl_VERSION := 1.2.5
musl_URL := https://musl.libc.org/releases/musl-$(musl_VERSION).tar.gz
musl_ARCHS := $(filter %-linux-musl,$(3rdparty_ARCHS))

openssl_VERSION := 1.1.1t
openssl_VERSION := 1.1.1w
openssl_URL := https://www.openssl.org/source/openssl-$(openssl_VERSION).tar.gz
openssl_ARCHS := $(3rdparty_ARCHS)

Expand Down Expand Up @@ -81,7 +81,7 @@ define unpack_TEMPLATE
_3rdparty/src/$1-$($1_VERSION)/.unpack-stamp: _3rdparty/archive/$1-$($1_VERSION).tar.gz
@mkdir -p $$(@D)
$(TAR) --strip=1 -xzf $$^ -C $$(@D)
$(foreach patch,$($1_PATCHES),patch -p1 -d $$(@D) < _3rdparty/$(patch)$(\n))
$(foreach patch,$($1_PATCHES),patch -p1 -d $$(@D) < _3rdparty/$(patch); )
$(if $($1_PREP),cd $$(@D) && $($1_PREP))
touch $$@
endef
Expand Down Expand Up @@ -131,9 +131,9 @@ _3rdparty/build/$1/yara-$(yara_VERSION)/.build-stamp: _3rdparty/src/yara-$(yara_
LDFLAGS="$$(shell PKG_CONFIG_PATH=$$(abspath _3rdparty/tgt/$1/lib/pkgconfig) \
pkg-config --static --libs libcrypto \
| $(SED) -e 's/-ldl//g' )"
$(MAKE) -s -C $$(@D)/libyara uninstall
$(MAKE) -s -j$(3rdparty_JOBS) -C $$(@D)/libyara
$(MAKE) -s -C $$(@D)/libyara install
$(MAKE) -s -C $$(@D) uninstall
$(MAKE) -s -j$(3rdparty_JOBS) -C $$(@D)
$(MAKE) -s -C $$(@D) install
$(if $(or $(findstring $(patsubst %-linux-gnu,%-linux-musl,$(3rdparty_NATIVE_ARCH)),$1),
$(findstring $(patsubst %-redhat-linux,%-linux-musl,$(3rdparty_NATIVE_ARCH)),$1)),\
mkdir -p _3rdparty/tgt/bin && ln -sf $(patsubst %,$(abspath _3rdparty/tgt/$1)/bin/%,yarac yara) _3rdparty/tgt//bin)
Expand Down
17 changes: 11 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
module github.com/spyre-project/spyre

go 1.11
go 1.21

require (
github.com/daviddengcn/go-colortext v1.0.0
github.com/hillu/go-archive-zip-crypto v0.0.0-20200712202847-bd5cf365dd44
github.com/hillu/go-ntdll v0.0.0-20211011155505-c466bba4706f
github.com/hillu/go-yara/v4 v4.2.3
github.com/hillu/go-ntdll v0.0.0-20240418173803-69345773b582
github.com/hillu/go-yara/v4 v4.3.3
github.com/mitchellh/go-ps v1.0.0
github.com/spf13/afero v1.5.1
github.com/spf13/afero v1.11.0
github.com/spf13/pflag v1.0.5
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
golang.org/x/sys v0.27.0
gopkg.in/yaml.v3 v3.0.1
)

require (
golang.org/x/crypto v0.29.0 // indirect
golang.org/x/text v0.20.0 // indirect
)
Loading

0 comments on commit 0aa923e

Please sign in to comment.