Merge branch 'main' into feat/py313-pkgs-batch-02

Signed-off-by: Scott Moser <[email protected]>

.github/actions/docker-run/action.yaml

@@ -6,7 +6,7 @@ inputs:
     required: true
   image:
     description: "The image to use"
-    default: "ghcr.io/wolfi-dev/sdk:latest@sha256:2e3b5215dc97a856e7d097bc9526980e67c954fad99f718bc506f75374396425"
+    default: "ghcr.io/wolfi-dev/sdk:latest@sha256:ff191d976f24586394d0a03df7900a8f6f76fe1adbbe209e9f92e960bd7e8120"
     required: false
   workdir:
     description: "The images working directory"

Makefile

@@ -140,7 +140,7 @@ dev-container:
 	    -v "${PWD}:${PWD}" \
 	    -w "${PWD}" \
 	    -e SOURCE_DATE_EPOCH=0 \
-	    ghcr.io/wolfi-dev/sdk:latest@sha256:2e3b5215dc97a856e7d097bc9526980e67c954fad99f718bc506f75374396425
+	    ghcr.io/wolfi-dev/sdk:latest@sha256:ff191d976f24586394d0a03df7900a8f6f76fe1adbbe209e9f92e960bd7e8120
 
 PACKAGES_CONTAINER_FOLDER ?= /work/packages
 # This target spins up a docker container that is helpful for testing local
@@ -208,7 +208,7 @@ dev-container-wolfi:
 		--mount type=bind,source="${PWD}/local-melange.rsa.pub",destination="/etc/apk/keys/local-melange.rsa.pub",readonly \
 		--mount type=bind,source="$(TMP_REPOS_FILE)",destination="/etc/apk/repositories",readonly \
 		-w "$(PACKAGES_CONTAINER_FOLDER)" \
-		ghcr.io/wolfi-dev/sdk:latest@sha256:2e3b5215dc97a856e7d097bc9526980e67c954fad99f718bc506f75374396425
+		ghcr.io/wolfi-dev/sdk:latest@sha256:ff191d976f24586394d0a03df7900a8f6f76fe1adbbe209e9f92e960bd7e8120
 	@rm "$(TMP_REPOS_FILE)"
 	@rmdir "$(TMP_REPOS_DIR)"
 

aactl.yaml

@@ -1,7 +1,7 @@
 package:
   name: aactl
   version: 0.4.12
-  epoch: 19
+  epoch: 20
   description: Google Container Analysis data import utility, supports OSS vulnerability scanner reports, SLSA provenance and sigstore attestations.
   copyright:
     - license: Apache-2.0
@@ -23,7 +23,7 @@ pipeline:
 
   - uses: go/bump
     with:
-      deps: github.com/docker/[email protected] github.com/sigstore/[email protected] github.com/cloudflare/[email protected] golang.org/x/[email protected] gopkg.in/go-jose/[email protected] google.golang.org/[email protected] google.golang.org/[email protected] github.com/sigstore/cosign/[email protected] golang.org/x/[email protected] github.com/hashicorp/[email protected] github.com/docker/[email protected] github.com/golang-jwt/jwt/[email protected]
+      deps: github.com/docker/[email protected] github.com/sigstore/[email protected] github.com/cloudflare/[email protected] gopkg.in/go-jose/[email protected] google.golang.org/[email protected] google.golang.org/[email protected] github.com/sigstore/cosign/[email protected] golang.org/x/[email protected] github.com/hashicorp/[email protected] github.com/docker/[email protected] github.com/golang-jwt/jwt/[email protected] golang.org/x/[email protected]
       replaces: github.com/go-jose/go-jose/v3=github.com/go-jose/go-jose/[email protected] github.com/sigstore/cosign/v2=github.com/sigstore/cosign/[email protected]
 
   - runs: |

actions-runner-controller.yaml

@@ -1,7 +1,7 @@
 package:
   name: actions-runner-controller
   version: 0.9.3
-  epoch: 3
+  epoch: 4
   description: Kubernetes controller for GitHub Actions self-hosted runners
   copyright:
     - license: Apache-2.0
@@ -22,7 +22,7 @@ pipeline:
 
   - uses: go/bump
     with:
-      deps: github.com/golang-jwt/jwt/[email protected]
+      deps: github.com/golang-jwt/jwt/[email protected] golang.org/x/[email protected]
 
   - uses: go/build
     with:

amass.yaml

@@ -1,7 +1,7 @@
 package:
   name: amass
   version: 4.2.0
-  epoch: 13
+  epoch: 14
   description: "attack surfaces and external asset discovery tools set"
   copyright:
     - license: Apache-2.0
@@ -20,7 +20,7 @@ pipeline:
 
   - uses: go/bump
     with:
-      deps: github.com/jackc/pgx/[email protected] google.golang.org/[email protected] golang.org/x/[email protected]
+      deps: github.com/jackc/pgx/[email protected] google.golang.org/[email protected] golang.org/x/[email protected] golang.org/x/[email protected]
       modroot: .
 
   - uses: go/build

amazon-cloudwatch-agent-operator.yaml

@@ -1,7 +1,7 @@
 package:
   name: amazon-cloudwatch-agent-operator
   version: 2.0.0
-  epoch: 0
+  epoch: 1
   description: Software developed to manage the CloudWatch Agent on kubernetes.
   copyright:
     - license: Apache-2.0
@@ -13,6 +13,10 @@ pipeline:
       repository: https://github.com/aws/amazon-cloudwatch-agent-operator
       tag: v${{package.version}}
 
+  - uses: go/bump
+    with:
+      deps: golang.org/x/[email protected]
+
   - uses: go/build
     with:
       output: manager

amazon-cloudwatch-agent.yaml

@@ -1,7 +1,7 @@
 package:
   name: amazon-cloudwatch-agent
   version: 1.300051.0
-  epoch: 0
+  epoch: 1
   description: CloudWatch Agent enables you to collect and export host-level metrics and logs on instances running Linux or Windows server.
   copyright:
     - license: Apache-2.0
@@ -21,6 +21,10 @@ pipeline:
       tag: v${{package.version}}
       expected-commit: 2c8e72f671b762087ea2d6de9b961c1d6eba8ba6
 
+  - uses: go/bump
+    with:
+      deps: golang.org/x/[email protected]
+
   - uses: go/build
     with:
       packages: ./cmd/amazon-cloudwatch-agent

apko.yaml

@@ -1,7 +1,7 @@
 package:
   name: apko
   version: 0.21.0
-  epoch: 0
+  epoch: 1
   description: Build OCI images using APK directly without Dockerfile
   copyright:
     - license: Apache-2.0
@@ -24,6 +24,10 @@ pipeline:
       tag: v${{package.version}}
       expected-commit: d45b6da444f211f49e25d25d26cc0241023d22c8
 
+  - uses: go/bump
+    with:
+      deps: golang.org/x/[email protected]
+
   - runs: |
       make apko
       install -m755 -D ./apko "${{targets.contextdir}}"/usr/bin/apko

argo-cd-2.13.yaml

@@ -1,7 +1,7 @@
 package:
   name: argo-cd-2.13
   version: 2.13.2
-  epoch: 0
+  epoch: 1
   description: Declarative continuous deployment for Kubernetes.
   copyright:
     - license: Apache-2.0
@@ -32,7 +32,7 @@ pipeline:
 
   - uses: go/bump
     with:
-      deps: github.com/golang-jwt/jwt/[email protected] github.com/Azure/azure-sdk-for-go/sdk/[email protected] github.com/Azure/azure-sdk-for-go/sdk/[email protected] github.com/Azure/azure-sdk-for-go/sdk/[email protected] github.com/AzureAD/[email protected] github.com/pkg/[email protected]
+      deps: github.com/golang-jwt/jwt/[email protected] github.com/Azure/azure-sdk-for-go/sdk/[email protected] github.com/Azure/azure-sdk-for-go/sdk/[email protected] github.com/Azure/azure-sdk-for-go/sdk/[email protected] github.com/AzureAD/[email protected] github.com/pkg/[email protected] golang.org/x/[email protected]
 
   - runs: |
       cd ui

argo-events.yaml

@@ -1,7 +1,7 @@
 package:
   name: argo-events
   version: 1.9.3
-  epoch: 0
+  epoch: 1
   description: Event-driven Automation Framework for Kubernetes.
   copyright:
     - license: Apache-2.0
@@ -15,7 +15,7 @@ pipeline:
 
   - uses: go/bump
     with:
-      deps: github.com/hamba/avro/[email protected]
+      deps: github.com/hamba/avro/[email protected] golang.org/x/[email protected]
       replaces: github.com/whilp/git-urls=github.com/chainguard-dev/[email protected] github.com/hamba/avro=github.com/hamba/avro/[email protected]
 
   - uses: go/build

asciidoc.yaml

@@ -1,11 +1,14 @@
 package:
   name: asciidoc
   version: 10.2.1
-  epoch: 0
+  epoch: 1
   description: "Text based documentation"
   copyright:
     - license: GPL-2.0-or-later
 
+vars:
+  py-version: 3.13
+
 environment:
   contents:
     packages:
@@ -17,8 +20,8 @@ environment:
       - git
       - libxml2-utils
       - libxslt
-      - py3-pip
-      - python3
+      - py${{vars.py-version}}-pip
+      - python-${{vars.py-version}}
       - wolfi-base
 
 pipeline:
@@ -28,6 +31,10 @@ pipeline:
       tag: ${{package.version}}
       expected-commit: 21e33efe96ba9a51d99d1150691dae750afd6ed1
 
+  - uses: patch
+    with:
+      patches: allow-specify-python.yaml
+
   - runs: |
       autoreconf -fi
 
@@ -40,8 +47,12 @@ pipeline:
         --infodir=/usr/share/info
 
   - uses: autoconf/make
+    with:
+      opts: PYTHON=python${{vars.py-version}}
 
   - uses: autoconf/make-install
+    with:
+      opts: PYTHON=python${{vars.py-version}}
 
 update:
   enabled: true

asciidoc/allow-specify-python.yaml

@@ -0,0 +1,77 @@
+From af56a5e8290c3a6fbcfd9ef32be90fef147fdb91 Mon Sep 17 00:00:00 2001
+From: Scott Moser <[email protected]>
+Date: Thu, 12 Dec 2024 14:04:32 -0500
+Subject: [PATCH] Allow python to be provided in Makefile
+
+When 'python3' is used to do the install (through `make install`)
+then the shbang on the installed program will be /usr/bin/python3.
+For systems with more than one python, it is better to invoke
+with python3.X so that the shbang has the proper value
+(/usr/bin/python3.X rather than /usr/bin/python3).
+
+https://github.com/asciidoc-py/asciidoc-py/pull/276
+---
+ Makefile.in | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 35861db..934928e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -29,6 +29,7 @@ doc = $(wildcard README*) $(wildcard BUGS*) $(wildcard INSTALL*) $(wildcard CHAN
+
+ TARGETS = doc
+
++PYTHON ?= python3
+ DESTDIR ?= /
+
+ INSTDIRS = $(TARGETS:%=%dir)
+@@ -53,7 +54,7 @@ $(INSTDIRS):
+ 	$(INSTALL) -d $(DESTDIR)$($@)
+
+ $(manp): %.1 : %.1.txt
+-	python3 -m asciidoc.a2x -f manpage $<
++	$(PYTHON) -m asciidoc.a2x -f manpage $<
+
+ ##.
+
+@@ -78,7 +79,7 @@ doc_spell: spell
+
+ .PHONY: pip
+ pip:
+-	python3 -m pip install --root $(DESTDIR) .
++	$(PYTHON) -m pip install --root $(DESTDIR) .
+
+ ##   install: install asciidoc to target directory
+ .PHONY: install
+@@ -109,7 +110,7 @@ docs:
+ ##   uninstall: uninstall asciidoc
+ .PHONY: uninstall
+ uninstall:
+-	python3 -m pip uninstall asciidoc
++	$(PYTHON) -m pip uninstall asciidoc
+ 	rm -f $(DESTDIR)$(manpdir)/asciidoc.1
+ 	rm -f $(DESTDIR)$(manpdir)/testasciidoc.1
+ 	rm -f $(DESTDIR)$(manpdir)/a2x.1
+@@ -121,7 +122,7 @@ clean:
+ 	rm -f $(manp)
+
+ MANIFEST: build_manifest.py
+-	python3 build_manifest.py
++	$(PYTHON) build_manifest.py
+
+ ##.
+ ##   dist: creates the zip and tarball for release
+@@ -140,6 +141,6 @@ dist: manpages MANIFEST
+ ##   test: run the asciidoc test suite
+ .PHONY: test
+ test:
+-	python3 -m asciidoc.asciidoc --doctest
+-	python3 -m pytest
+-	python3 tests/testasciidoc.py run
++	$(PYTHON) -m asciidoc.asciidoc --doctest
++	$(PYTHON) -m pytest
++	$(PYTHON) tests/testasciidoc.py run
+-- 
+2.47.1
+

aws-c-s3.yaml

@@ -1,6 +1,6 @@
 package:
   name: aws-c-s3
-  version: 0.7.6
+  version: 0.7.7
   epoch: 0
   description: "AWS C99 library implementation for communicating with the S3 service"
   copyright:
@@ -37,7 +37,7 @@ environment:
 pipeline:
   - uses: git-checkout
     with:
-      expected-commit: 33b8cd07c53068e1408f85ae956c44c9753df0f3
+      expected-commit: 21a4ab4dacd1eaf61e6c044c7a299d68fd4c1876
       repository: https://github.com/awslabs/aws-c-s3
       tag: v${{package.version}}
 

aws-cli-2.yaml

@@ -2,7 +2,7 @@
 #nolint:documentation
 package:
   name: aws-cli-2
-  version: 2.22.15
+  version: 2.22.16
   epoch: 0
   description: "Universal Command Line Interface for Amazon Web Services (v2)"
   copyright:
@@ -31,7 +31,7 @@ pipeline:
   - uses: git-checkout
     with:
       repository: https://github.com/aws/aws-cli
-      expected-commit: e9b9cd81d825dabd953741f56afd4fcc838ad277
+      expected-commit: c9d20e55a17c4b489dc6ccc58f64425165c9447f
       tag: ${{package.version}}
 
   - runs: |

aws-eks-pod-identity-agent.yaml

@@ -1,7 +1,7 @@
 #nolint:git-checkout-must-use-github-updates,valid-pipeline-git-checkout-tag
 package:
   name: aws-eks-pod-identity-agent
-  version: 0_git20241211
+  version: 0_git20241212
   epoch: 0
   description: EKS Pod Identity is a feature of Amazon EKS that simplifies the process for cluster administrators to configure Kubernetes applications with AWS IAM permissions
   copyright:

aws-load-balancer-controller.yaml

@@ -1,6 +1,6 @@
 package:
   name: aws-load-balancer-controller
-  version: 2.10.1
+  version: 2.11.0
   epoch: 0
   description: A Kubernetes controller for Elastic Load Balancers
   copyright:
@@ -20,7 +20,7 @@ pipeline:
     with:
       repository: https://github.com/kubernetes-sigs/aws-load-balancer-controller
       tag: v${{package.version}}
-      expected-commit: 2a63f05a5e0b73cf652b374ae0ae09220fa8b920
+      expected-commit: ba4152c1ba7c75be194d75cf343219d4aeaeb116
 
   - runs: |
       # https://github.com/kubernetes-sigs/aws-load-balancer-controller/blob/main/Dockerfile#L18-L27

azcopy.yaml

@@ -1,7 +1,7 @@
 package:
   name: azcopy
   version: 10.27.1
-  epoch: 0
+  epoch: 1
   description: The new Azure Storage data transfer utility
   copyright:
     - license: MIT
@@ -13,6 +13,10 @@ pipeline:
       tag: v${{package.version}}
       expected-commit: 741ca876e9874f2f169fbfb355c123fe39337081
 
+  - uses: go/bump
+    with:
+      deps: golang.org/x/[email protected]
+
   - uses: go/build
     with:
       packages: .