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

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

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: |

caddy.yaml

@@ -1,7 +1,7 @@
 package:
   name: caddy
   version: 2.8.4
-  epoch: 4
+  epoch: 5
   description: Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
   copyright:
     - license: Apache-2.0
@@ -29,7 +29,7 @@ pipeline:
 
   - uses: go/bump
     with:
-      deps: github.com/quic-go/[email protected]
+      deps: github.com/quic-go/[email protected] golang.org/x/[email protected]
 
   - uses: go/build
     with:

cluster-api-controller.yaml

@@ -1,7 +1,7 @@
 package:
   name: cluster-api-controller
   version: 1.9.0
-  epoch: 0
+  epoch: 1
   description: Cluster API core controller
   copyright:
     - license: Apache-2.0
@@ -22,6 +22,10 @@ pipeline:
       repository: https://github.com/kubernetes-sigs/cluster-api
       tag: v${{package.version}}
 
+  - uses: go/bump
+    with:
+      deps: golang.org/x/[email protected]
+
   - uses: go/build
     with:
       ldflags: -s -w

cluster-autoscaler-1.31.yaml

@@ -1,7 +1,7 @@
 package:
   name: cluster-autoscaler-1.31
   version: 1.31.1
-  epoch: 0
+  epoch: 1
   description: Autoscaling components for Kubernetes
   copyright:
     - license: Apache-2.0
@@ -28,7 +28,7 @@ pipeline:
 
   - uses: go/bump
     with:
-      deps: github.com/opencontainers/[email protected] github.com/Azure/azure-sdk-for-go/sdk/[email protected] github.com/golang-jwt/jwt/[email protected]
+      deps: github.com/opencontainers/[email protected] github.com/Azure/azure-sdk-for-go/sdk/[email protected] github.com/golang-jwt/jwt/[email protected] golang.org/x/[email protected]
       modroot: cluster-autoscaler
 
   - uses: go/build

crossplane-provider-aws.yaml

@@ -1,7 +1,7 @@
 package:
   name: crossplane-provider-aws
-  version: 1.17.0
-  epoch: 1
+  version: 1.18.0
+  epoch: 0
   description: Official AWS Provider for Crossplane by Upbound
   copyright:
     - license: Apache-2.0
@@ -30,18 +30,14 @@ environment:
 pipeline:
   - uses: git-checkout
     with:
-      expected-commit: 3d60c8cf56f04b3e80d56ea5c7b33e6712e323cb
+      expected-commit: 35a6b66e59d103972954f523deb9f3f7cdd489d8
       repository: https://github.com/upbound/provider-aws
       tag: v${{package.version}}
 
   - uses: patch
     with:
       patches: uptest_changes.patch
 
-  - uses: go/bump
-    with:
-      deps: golang.org/x/[email protected]
-
   - runs: |
       # `make` downloads `up`, unless we move our prebuilt `up` to where it expects it.
       GOARCH=$(go env GOARCH)

dagger.yaml

@@ -1,7 +1,7 @@
 package:
   name: dagger
-  version: 0.15.0
-  epoch: 1
+  version: 0.15.1
+  epoch: 0
   description: Application Delivery as Code that Runs Anywhere
   copyright:
     - license: Apache-2.0
@@ -15,11 +15,7 @@ pipeline:
     with:
       repository: https://github.com/dagger/dagger
       tag: v${{package.version}}
-      expected-commit: ba70be4ef8c2517bf9b683ca49e565cfaa771cae
-
-  - uses: go/bump
-    with:
-      deps: golang.org/x/[email protected]
+      expected-commit: 196f232a4d6b2d1d3db5f5e040cf20b6a76a76c5
 
   - uses: go/build
     with:

docker-credential-acr-env.yaml

@@ -1,7 +1,7 @@
 package:
   name: docker-credential-acr-env
   version: 0.7.0
-  epoch: 15
+  epoch: 16
   description: ACR Docker Credential Helper
   copyright:
     - license: Apache-2.0
@@ -24,7 +24,7 @@ pipeline:
 
   - uses: go/bump
     with:
-      deps: golang.org/x/[email protected] golang.org/x/[email protected] golang.org/x/crypto@v0.17.0
+      deps: golang.org/x/[email protected] golang.org/x/[email protected] golang.org/x/crypto@v0.31.0
 
   - runs: |
       make build

falcosidekick.yaml

@@ -1,7 +1,7 @@
 package:
   name: falcosidekick
   version: 2.30.0
-  epoch: 0
+  epoch: 1
   description: Connect Falco to your ecosystem
   copyright:
     - license: MIT
@@ -22,6 +22,10 @@ pipeline:
       repository: https://github.com/falcosecurity/falcosidekick
       tag: ${{package.version}}
 
+  - uses: go/bump
+    with:
+      deps: golang.org/x/[email protected]
+
   - runs: |
       make falcosidekick RELEASE=${{package.version}}
       mkdir -p ${{targets.destdir}}/usr/bin

ferretdb.yaml

@@ -1,7 +1,7 @@
 package:
   name: ferretdb
   version: 1.24.0
-  epoch: 1
+  epoch: 2
   description: "A truly Open Source MongoDB alternative"
   copyright:
     - license: Apache-2.0
@@ -21,6 +21,10 @@ pipeline:
       tag: v${{package.version}}
       expected-commit: 7d9c7b9922555c1c8b64fe1ac596f4c1efb570ce
 
+  - uses: go/bump
+    with:
+      deps: golang.org/x/[email protected]
+
   - uses: go/build
     with:
       packages: ./cmd/ferretdb