Merge branch 'main' into ossf-lazy

wolfi-dev · Jan 1, 2025 · bb0447e · bb0447e
2 parents 289c164 + 9cbaa8b
commit bb0447e
Show file tree

Hide file tree

Showing 27 changed files with 130 additions and 947 deletions.
diff --git a/ack.yaml b/ack.yaml
@@ -1,6 +1,6 @@
 package:
   name: ack
-  version: 3.8.0
+  version: 3.8.1
   epoch: 0
   description: A Perl-powered replacement for grep
   copyright:
@@ -21,7 +21,7 @@ environment:
 pipeline:
   - uses: fetch
     with:
-      expected-sha256: 640b1a1b36ca15a4d1d1792f2a44e69aeae58391cf0d21fa8a29665a8895f718
+      expected-sha256: 1c03ab46f4922a0bd2462f4cf7eeb3cb4b4e6d43cebd3cfcf3a2e132319eb88e
       uri: https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/ack-v${{package.version}}.tar.gz
 
   - runs: PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor

diff --git a/bc.yaml b/bc.yaml
@@ -1,8 +1,8 @@
 # Generated from https://git.alpinelinux.org/aports/plain/main/bc/APKBUILD
 package:
   name: bc
-  version: 1.07.1
-  epoch: 3
+  version: 1.08.0
+  epoch: 0
   description: An arbitrary precision numeric processing language (calculator)
   copyright:
     - license: GPL-3.0-or-later
@@ -25,7 +25,7 @@ environment:
 pipeline:
   - uses: fetch
     with:
-      expected-sha256: 62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a
+      expected-sha256: 7db49996cbe16d7602936fef586e69e492c3df65765c0a891841025a1ad741ef
       uri: https://ftp.gnu.org/gnu/bc/bc-${{package.version}}.tar.gz
 
   - uses: autoconf/configure

diff --git a/caddy.yaml b/caddy.yaml
@@ -1,7 +1,7 @@
 package:
   name: caddy
-  version: 2.8.4
-  epoch: 7
+  version: 2.9.0
+  epoch: 0
   description: Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
   copyright:
     - license: Apache-2.0
@@ -17,7 +17,7 @@ environment:
 pipeline:
   - uses: git-checkout
     with:
-      expected-commit: 7088605cc11c52c2777ab613dfc5c2a9816006e4
+      expected-commit: 3f3f8b3d5270add46d5fc7d99bdcc705ad2d5df4
       repository: https://github.com/caddyserver/caddy
       tag: v${{package.version}}
 
@@ -27,10 +27,6 @@ pipeline:
 
   - runs: tar cfv caddy-src.tar .
 
-  - uses: go/bump
-    with:
-      deps: github.com/quic-go/[email protected] golang.org/x/[email protected] golang.org/x/[email protected]
-
   - uses: go/build
     with:
       output: caddy

diff --git a/confluent-kafka.yaml b/confluent-kafka.yaml
@@ -8,7 +8,7 @@ package:
   # with the `version:` field.
   # 2. Created a new variable `mangled-package-version` to append `-ccs` to the
   # version.
-  version: 8.0.0.294
+  version: 8.0.0.300
   epoch: 0
   description: Community edition of Confluent Kafka.
   copyright:
@@ -46,7 +46,7 @@ var-transforms:
 pipeline:
   - uses: git-checkout
     with:
-      expected-commit: 4a9945439deedfbf3ca868172ece2a3aadbee665
+      expected-commit: ffbf56ebd04ff9a79c9124f0b2f9b1c16a89f405
       repository: https://github.com/confluentinc/kafka
       tag: v${{vars.mangled-package-version}}
 

diff --git a/croc.yaml b/croc.yaml
@@ -1,7 +1,7 @@
 package:
   name: croc
-  version: 10.1.3
-  epoch: 3
+  version: 10.2.1
+  epoch: 0
   description: Easily and securely send things from one computer to another
   copyright:
     - license: MIT
@@ -21,13 +21,9 @@ pipeline:
   - uses: git-checkout
     with:
       repository: https://github.com/schollz/croc
-      expected-commit: 65bda643515d301ba152af0cdbdcdc1f7e304291
+      expected-commit: 08f9d393e213c6c68984e0aa68b98dfe285db45e
       tag: v${{package.version}}
 
-  - uses: go/bump
-    with:
-      deps: golang.org/x/[email protected] golang.org/x/[email protected]
-
   - uses: go/build
     with:
       packages: .

diff --git a/e2fsprogs.yaml b/e2fsprogs.yaml
@@ -1,7 +1,7 @@
 package:
   name: e2fsprogs
-  version: 1.47.1
-  epoch: 1
+  version: 1.47.2
+  epoch: 0
   description: Standard Ext2/3/4 filesystem utilities
   copyright:
     - license: GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND MIT
@@ -21,7 +21,7 @@ environment:
 pipeline:
   - uses: git-checkout
     with:
-      expected-commit: 950a0d69c82b585aba30118f01bf80151deffe8c
+      expected-commit: c3cce4a07efefc62bc7fc57a678cb870af27d0f2
       repository: https://github.com/tytso/e2fsprogs
       tag: v${{package.version}}
 

diff --git a/gcc.yaml b/gcc.yaml
@@ -356,37 +356,7 @@ test:
         cc: gcc
     - uses: test/ldd-check
       with:
-        files: |-
-          /usr/lib/gcc/x86_64-pc-linux-gnu/14/plugin/libcc1plugin.so
-          /usr/lib/gcc/x86_64-pc-linux-gnu/14/plugin/libcc1plugin.so.0
-          /usr/lib/gcc/x86_64-pc-linux-gnu/14/plugin/libcc1plugin.so.0.0.0
-          /usr/lib/gcc/x86_64-pc-linux-gnu/14/plugin/libcp1plugin.so
-          /usr/lib/gcc/x86_64-pc-linux-gnu/14/plugin/libcp1plugin.so.0
-          /usr/lib/gcc/x86_64-pc-linux-gnu/14/plugin/libcp1plugin.so.0.0.0
-          /usr/lib/libasan.so
-          /usr/lib/libasan.so.8
-          /usr/lib/libasan.so.8.0.0
-          /usr/lib/libatomic.so
-          /usr/lib/libcc1.so
-          /usr/lib/libcc1.so.0
-          /usr/lib/libcc1.so.0.0.0
-          /usr/lib/libgomp.so
-          /usr/lib/libhwasan.so
-          /usr/lib/libhwasan.so.0
-          /usr/lib/libhwasan.so.0.0.0
-          /usr/lib/libitm.so
-          /usr/lib/libitm.so.1
-          /usr/lib/libitm.so.1.0.0
-          /usr/lib/liblsan.so
-          /usr/lib/liblsan.so.0
-          /usr/lib/liblsan.so.0.0.0
-          /usr/lib/libquadmath.so
-          /usr/lib/libtsan.so
-          /usr/lib/libtsan.so.2
-          /usr/lib/libtsan.so.2.0.0
-          /usr/lib/libubsan.so
-          /usr/lib/libubsan.so.1
-          /usr/lib/libubsan.so.1.0.0
+        packages: ${{package.name}}
 
 update:
   enabled: true

diff --git a/gitaly-17.6.yaml b/gitaly-17.6.yaml