Merge branch 'main' into sca-diff-gpsd.yaml

wolfi-dev · Oct 18, 2024 · 48ee754 · 48ee754
2 parents 488ba33 + fe5d577
commit 48ee754
Show file tree

Hide file tree

Showing 87 changed files with 148 additions and 255 deletions.
diff --git a/ack.yaml b/ack.yaml
@@ -1,7 +1,7 @@
 package:
  name: ack
  version: 3.7.0
- epoch: 0
+ epoch: 1
  description: A Perl-powered replacement for grep
  copyright:
  - license: Artistic-2.0

diff --git a/acl.yaml b/acl.yaml
@@ -1,7 +1,7 @@
 package:
  name: acl
  version: 2.3.2
- epoch: 2
+ epoch: 3
  description: "access control list utilities"
  copyright:
  - license: LGPL-2.1-or-later AND GPL-2.0-or-later
@@ -24,7 +24,7 @@ pipeline:
  with:
  repository: https://git.savannah.nongnu.org/git/acl.git
  tag: v${{package.version}}
- expected-commit: cefe1c17f20448b7a0ca53ac9cf8a46d444a8cca
+ expected-commit: 214c7d146945c31a9dc04cb7094b85053f52a21e
 
  - runs: |
  ./autogen.sh

diff --git a/attr.yaml b/attr.yaml
@@ -1,7 +1,7 @@
 package:
  name: attr
  version: 2.5.2
- epoch: 2
+ epoch: 3
  description: "utilities for managing filesystem extended attributes"
  copyright:
  - license: GPL-2.0-or-later
@@ -23,7 +23,7 @@ pipeline:
  with:
  repository: https://git.savannah.nongnu.org/git/attr.git
  tag: v${{package.version}}
- expected-commit: cba99e6932f7d532460011a25f413c61aefaa872
+ expected-commit: ee80fdbc11c351fe96bc54a20c2893dde7df8845
 
  - runs: |
  ./autogen.sh

diff --git a/autoconf.yaml b/autoconf.yaml
@@ -1,7 +1,7 @@
 package:
  name: autoconf
  version: "2.72"
- epoch: 0
+ epoch: 1
  description: "GNU tool for generating configure scripts"
  copyright:
  - license: GPL-3.0-or-later

diff --git a/bats.yaml b/bats.yaml
@@ -1,7 +1,7 @@
 package:
  name: bats
  version: 1.11.0
- epoch: 0
+ epoch: 1
  description: Bash Automated Testing System
  copyright:
  - license: MIT

diff --git a/bind.yaml b/bind.yaml
@@ -1,6 +1,6 @@
 package:
  name: bind
- version: 9.18.30
+ version: 9.18.31
  epoch: 0
  description: The ISC DNS server
  copyright:
@@ -37,7 +37,7 @@ pipeline:
  with:
  repository: https://gitlab.isc.org/isc-projects/bind9.git
  tag: v${{package.version}}
- expected-commit: cdc8d6914853f23cb8893df0436abbd34b13bd11
+ expected-commit: 6298f90b852a220217435e5b560a40bcd494cc77
 
  - runs: |
  autoreconf -fi

diff --git a/bison.yaml b/bison.yaml
@@ -1,7 +1,7 @@
 package:
  name: bison
  version: 3.8.2
- epoch: 3
+ epoch: 4
  description: "The GNU general-purposes parser generator"
  copyright:
  - license: GPL-3.0-or-later

diff --git a/boost.yaml b/boost.yaml
@@ -1,7 +1,7 @@
 package:
  name: boost
  version: 1.86.0
- epoch: 0
+ epoch: 1
  description: "Free peer-reviewed portable C++ source libraries"
  copyright:
  - license: "BSL-1.0"

diff --git a/checksec.yaml b/checksec.yaml
@@ -1,7 +1,7 @@
 package:
  name: checksec
  version: 2.7.1
- epoch: 0
+ epoch: 1
  description: Binary security checker
  copyright:
  - license: BSD-3-Clause

diff --git a/cilium-1.16.yaml b/cilium-1.16.yaml
@@ -2,7 +2,7 @@
 package:
  name: cilium-1.16
  version: 1.16.2
- epoch: 0
+ epoch: 1
  description: Cilium is a networking, observability, and security solution with an eBPF-based dataplane
  copyright:
  - license: Apache-2.0
@@ -13,7 +13,7 @@ package:
  runtime:
  - bpftool
  # cilium does compilations at runtime on the node.
- - clang
+ - clang-17
  - cni-plugins-loopback
  # iptables packages are needed at build time because cilium-iptables
  # has a script that changes based on the presences of these packages
@@ -119,6 +119,10 @@ pipeline:
  with:
  patches: toolchains-paths.patch
 
+ - uses: patch
+ with:
+ patches: envoy-55b0fc45cfdc2c0df002690606853540cf794fab.patch
+
  - runs: |
  # Bazel errors out on toolchain stanza
  sed -i '/$toolchain /d' go.mod

diff --git a/cilium-1.16/envoy-55b0fc45cfdc2c0df002690606853540cf794fab.patch b/cilium-1.16/envoy-55b0fc45cfdc2c0df002690606853540cf794fab.patch
@@ -0,0 +1,43 @@
+diff --git a/WORKSPACE b/WORKSPACE
+index 026838fc..cea6a2e9 100644
+--- a/envoy/WORKSPACE
++++ b/envoy/WORKSPACE
+@@ -37,2 +37,3 @@ git_repository(
+ "@//patches:0003-tcp_proxy-Add-filter-state-proxy_read_before_connect.patch",
+ "@//patches:0004-listener-add-socket-options.patch",
++ "@//patches:55b0fc45cfdc2c0df002690606853540cf794fab.patch",
+
+diff --git a/patches/55b0fc45cfdc2c0df002690606853540cf794fab.patch b/patches/55b0fc45cfdc2c0df002690606853540cf794fab.patch
+new file mode 100644
+index 00000000..b85899c7
+--- /dev/null
++++ b/envoy/patches/55b0fc45cfdc2c0df002690606853540cf794fab.patch
+@@ -0,0 +1,28 @@
++From 55b0fc45cfdc2c0df002690606853540cf794fab Mon Sep 17 00:00:00 2001
++From: alyssawilk <alyssar@chromium.org>
++Date: Wed, 9 Oct 2024 16:23:02 -0400
++Subject: [PATCH] ci: change googleurl dep (#36515)
++
++backing file temporarily deleted and re-updated (with a new hash)
++
++Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
++---
++ bazel/repository_locations.bzl | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
++index b6e02d489b31..e42a6e7e2fd3 100644
++--- a/bazel/repository_locations.bzl
+++++ b/bazel/repository_locations.bzl
++@@ -1222,9 +1222,9 @@ REPOSITORY_LOCATIONS_SPEC = dict(
++ project_name = "Chrome URL parsing library",
++ project_desc = "Chrome URL parsing library",
++ project_url = "https://quiche.googlesource.com/googleurl",
++- # Static snapshot of https://quiche.googlesource.com/googleurl/+archive/dd4080fec0b443296c0ed0036e1e776df8813aa7.tar.gz
++ version = "dd4080fec0b443296c0ed0036e1e776df8813aa7",
++- sha256 = "59f14d4fb373083b9dc8d389f16bbb817b5f936d1d436aa67e16eb6936028a51",
+++ sha256 = "fc694942e8a7491dcc1dde1bddf48a31370a1f46fef862bc17acf07c34dc6325",
+++ # Static snapshot of https://quiche.googlesource.com/googleurl/+archive/dd4080fec0b443296c0ed0036e1e776df8813aa7.tar.gz
++ urls = ["https://storage.googleapis.com/quiche-envoy-integration/{version}.tar.gz"],
++ use_category = ["controlplane", "dataplane_core"],
++ extensions = [],
diff --git a/clang-15.yaml b/clang-15.yaml
@@ -1,7 +1,7 @@
 package:
  name: clang-15
  version: 15.0.7
- epoch: 3
+ epoch: 4
  description: "C language family frontend for LLVM"
  copyright:
  - license: Apache-2.0

diff --git a/cowsay.yaml b/cowsay.yaml
@@ -1,7 +1,7 @@
 package:
  name: cowsay
  version: 3.04
- epoch: 0
+ epoch: 1
  description: Configurable talking cow (and a few other creatures)
  copyright:
  - license: GPL-2.0-or-later

diff --git a/cronie.yaml b/cronie.yaml
@@ -1,7 +1,7 @@
 package:
  name: cronie
  version: 1.7.2
- epoch: 0
+ epoch: 1
  description: Cron daemon for executing programs at set times
  copyright:
  - license: ISC

diff --git a/dav1d.yaml b/dav1d.yaml
@@ -1,6 +1,6 @@
 package:
  name: dav1d
- version: 1.4.3
+ version: 1.5.0
  epoch: 0
  description: small and fast AV1 Decoder
  copyright:
@@ -22,7 +22,7 @@ pipeline:
  with:
  repository: https://code.videolan.org/videolan/dav1d.git
  tag: ${{package.version}}
- expected-commit: e9986de7f4264940af6fa1df1498fd2754077de4
+ expected-commit: 32cf02af50f32af108a3b281c452788dccdac648
 
  - uses: meson/configure
  with:

diff --git a/dns-root-hints.yaml b/dns-root-hints.yaml
@@ -1,7 +1,7 @@
 package:
  name: dns-root-hints
  version: "2022062901"
- epoch: 0
+ epoch: 1
  description: The DNS root hint(s)
  copyright:
  - license: CC-PDDC

diff --git a/dnssec-root.yaml b/dnssec-root.yaml
@@ -1,7 +1,7 @@
 package:
  name: dnssec-root
  version: "20190225"
- epoch: 0
+ epoch: 1
  description: The DNSSEC root key(s)
  copyright:
  - license: CC-PDDC

diff --git a/exiftool.yaml b/exiftool.yaml
@@ -1,7 +1,7 @@
 package:
  name: exiftool
  version: 12.70
- epoch: 0
+ epoch: 1
  description: ExifTool meta information reader/writer
  copyright:
  - license: GPL-3.0-only

diff --git a/fluent-plugin-cloudwatch-logs.yaml b/fluent-plugin-cloudwatch-logs.yaml
@@ -1,7 +1,7 @@
 package:
  name: fluent-plugin-cloudwatch-logs
  version: 0.14.3
- epoch: 3
+ epoch: 4
  description: CloudWatch Logs Plugin for Fluentd
  copyright:
  - license: MIT

diff --git a/fluent-plugin-detect-exceptions.yaml b/fluent-plugin-detect-exceptions.yaml
@@ -1,7 +1,7 @@
 package:
  name: fluent-plugin-detect-exceptions
  version: 0.0.15
- epoch: 2
+ epoch: 3
  description: Fluentd output plugin which detects exception stack traces in a stream of JSON log messages and combines all single-line messages that belong to the same stack trace into one multi-line message. This is an official Google Ruby gem.
  copyright:
  - license: Apache-2.0

diff --git a/fluent-plugin-elasticsearch.yaml b/fluent-plugin-elasticsearch.yaml
@@ -2,7 +2,7 @@
 package:
  name: fluent-plugin-elasticsearch
  version: 5.4.3
- epoch: 2
+ epoch: 3
  description: Elasticsearch output plugin for Fluent event collector
  copyright:
  - license: Apache-2.0

diff --git a/fluent-plugin-label-router.yaml b/fluent-plugin-label-router.yaml
@@ -1,7 +1,7 @@
 package:
  name: fluent-plugin-label-router
  version: "0.2.10_git20230928"
- epoch: 4
+ epoch: 5
  description: Label-Router helps routing log messages based on their labels and namespace tag in a Kubernetes environment.
  copyright:
  - license: Apache-2.0

diff --git a/fluent-plugin-newrelic.yaml b/fluent-plugin-newrelic.yaml
@@ -2,7 +2,7 @@
 package:
  name: fluent-plugin-newrelic
  version: "1.2.2_git20230928"
- epoch: 3
+ epoch: 4
  description: Sends FluentD events to New Relic
  copyright:
  - license: Apache-2.0

diff --git a/fluent-plugin-out-http.yaml b/fluent-plugin-out-http.yaml
@@ -1,7 +1,7 @@
 package:
  name: fluent-plugin-out-http
  version: 1.3.4
- epoch: 4
+ epoch: 5
  description: This is the Fluentd output plugin for enabling http access to the container
  copyright:
  - license: Apache-2.0

diff --git a/fluent-plugin-rewrite-tag-filter.yaml b/fluent-plugin-rewrite-tag-filter.yaml
@@ -1,7 +1,7 @@
 package:
  name: fluent-plugin-rewrite-tag-filter
  version: 2.4.0
- epoch: 3
+ epoch: 4
  description: Fluentd Output filter plugin to rewrite tags that matches specified attribute.
  copyright:
  - license: Apache-2.0

diff --git a/fluent-plugin-s3.yaml b/fluent-plugin-s3.yaml
@@ -1,7 +1,7 @@
 package:
  name: fluent-plugin-s3
  version: 1.7.2
- epoch: 3
+ epoch: 4
  description: Amazon S3 output plugin for Fluentd event collector
  copyright:
  - license: Apache-2.0

diff --git a/fluent-plugin-splunk-hec.yaml b/fluent-plugin-splunk-hec.yaml
@@ -1,7 +1,7 @@
 package:
  name: fluent-plugin-splunk-hec
  version: 1.3.3
- epoch: 11
+ epoch: 12
  description: This is the Fluentd output plugin for sending events to Splunk via HEC
  copyright:
  - license: Apache-2.0

diff --git a/hdf5.yaml b/hdf5.yaml
@@ -2,7 +2,7 @@ package:
  name: hdf5
  description: Library for accessing Hierarchical Data Format version 5 files
  version: 1.14.2
- epoch: 0
+ epoch: 1
  url: https://www.hdfgroup.org/solutions/hdf5/
  copyright:
  - license: BSD-3-Clause

diff --git a/intltool.yaml b/intltool.yaml
@@ -1,7 +1,7 @@
 package:
  name: intltool
  version: 0.51.0
- epoch: 0
+ epoch: 1
  description: The internationalization tool collection
  copyright:
  - license: GPL-2.0-or-later

diff --git a/iperf.yaml b/iperf.yaml
@@ -1,7 +1,7 @@
 package:
  name: iperf
  version: 2.2.0
- epoch: 1
+ epoch: 2
  description: A tool to measure IP bandwidth using UDP or TCP
  copyright:
  - license: NCSA

diff --git a/libcap.yaml b/libcap.yaml
@@ -1,7 +1,7 @@
 package:
  name: libcap
  version: "2.70"
- epoch: 2
+ epoch: 3
  description: "POSIX 1003.1e capabilities"
  copyright:
  - license: BSD-3-Clause OR GPL-2.0-only
@@ -21,7 +21,7 @@ pipeline:
  with:
  repository: git://git.kernel.org/pub/scm/libs/libcap/libcap.git
  tag: v1.${{package.version}}
- expected-commit: fd31b6cd318194906fc8f6cea582e475c67ec207
+ expected-commit: 8fe536b53f26b93849336713e50fd0d17272d200
 
  - runs: |
  set -x

diff --git a/libnfnetlink.yaml b/libnfnetlink.yaml
@@ -1,7 +1,7 @@
 package:
  name: libnfnetlink
- version: "1.0.2"
- epoch: 4
+ version: 1.0.2
+ epoch: 5
  description: low-level library for netfilter related kernel/userspace communication
  copyright:
  - license: GPL-2.0-or-later
@@ -21,7 +21,7 @@ pipeline:
  with:
  repository: git://git.netfilter.org/libnfnetlink
  tag: libnfnetlink-${{package.version}}
- expected-commit: 8182d92e81a7feb54a6a27c3c1691a26c1aeda03
+ expected-commit: a133e296a201b8a7c0803434421ed892b737152e
 
  - runs: |
  ./autogen.sh