Skip to content

Commit

Permalink
git: switch to openssf-compiler-options (#26389)
Browse files Browse the repository at this point in the history
Together with perl this should complete hardening of gcc-glibc image.
  • Loading branch information
xnox authored Aug 15, 2024
1 parent d5a89f0 commit 403b23c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions git.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: git
version: 2.46.0
epoch: 1
epoch: 2
description: "distributed version control system"
copyright:
- license: GPL-2.0-or-later
Expand All @@ -16,6 +16,7 @@ environment:
- ca-certificates-bundle
- curl-dev
- expat-dev
- openssf-compiler-options
- openssl-dev
- pcre2-dev
- wolfi-base
Expand Down Expand Up @@ -48,7 +49,6 @@ pipeline:
- runs: |
make prefix=/usr \
CFLAGS="-O2 -Wall" \
DESTDIR="${{targets.destdir}}" \
INSTALLDIRS=vendor \
install -j$(nproc)
Expand Down Expand Up @@ -130,6 +130,7 @@ test:
environment:
HOME: /tmp
pipeline:
- uses: test/hardening-check
- name: Verify git installation
runs: |
git --version || exit 1
Expand Down
2 changes: 1 addition & 1 deletion pipelines/test/hardening-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ pipeline:
debug "$f: not an ELF file"
continue
fi
if grep -qi "readelf: Error: .*: Failed to read file's magic number" "$errf"; then
if grep -qi "readelf: Error: .*: Failed to read file.*" "$errf"; then
debug "$f: not an ELF file"
continue
fi
Expand Down

0 comments on commit 403b23c

Please sign in to comment.