Merge branch 'main' into wolfictl-8a42d8f3-a448-4e2b-96b2-a495495a0191

R-e1071.yaml

@@ -1,6 +1,6 @@
 package:
  name: R-e1071
- version: 1.7.14
+ version: 1.7.16
  epoch: 0
  description: Misc Functions of the Department of Statistics, Probability Theory Group
  copyright:
@@ -29,7 +29,7 @@ pipeline:
  with:
  repository: https://github.com/cran/e1071
  tag: ${{vars.mangled-package-version}}
- expected-commit: fe6af3fdb1246f8e9cfaa753d1f312503d864101
+ expected-commit: ba0bc20857db09cac09fd39dd41a283871e27c17
 
  - uses: R/build
  with:

apache2.yaml

@@ -0,0 +1,219 @@
+package:
+ name: apache2
+ version: 2.4.62
+ epoch: 0
+ description: "Apache HTTP Server"
+ copyright:
+ - license: Apache-2.0
+
+environment:
+ contents:
+ packages:
+ - apr-util-dev
+ - autoconf
+ - automake
+ - brotli-dev
+ - build-base
+ - libapr-dev
+ - libxml2-dev
+ - lua5.4-dev
+ - nghttp2-dev
+ - openssl-dev
+ - pcre2-dev
+ - readline-dev
+ - wolfi-base
+ - zlib-dev
+
+pipeline:
+ - uses: git-checkout
+ with:
+ expected-commit: f4c1e18ead5d642698034b831121cbb82b55f60e
+ repository: https://github.com/apache/httpd
+ tag: ${{package.version}}
+
+ - runs: |
+ set -x
+ ./buildconf --with-apr=/usr/bin/apr-1-config
+ mv configure.in configure.ac
+
+ - uses: autoconf/configure
+ with:
+ opts: |
+ --prefix=/ \
+ --enable-layout=Debian \
+ --enable-so \
+ --enable-suexec \
+ --with-suexec-caller=www-data \
+ --with-suexec-docroot=/var/www \
+ --with-suexec-logfile=/var/log/apache2/suexec.log \
+ --with-suexec-bin=/usr/sbin/suexec \
+ --with-suexec-uidmin=99 \
+ --with-suexec-gidmin=99 \
+ --with-apr=/usr/bin/apr-1-config \
+ --with-apr-util=/usr/bin/apu-1-config \
+ --with-pcre=/usr \
+ --enable-mods-shared=all \
+ --enable-mpms-shared=all \
+ --with-mpm=prefork \
+ --enable-ssl \
+ --with-ssl \
+ --enable-proxy \
+ --enable-cache \
+ --enable-disk-cache \
+ --enable-mem-cache \
+ --enable-file-cache \
+ --enable-ldap \
+ --enable-authnz-ldap \
+ --enable-cgid \
+ --enable-cgi \
+ --enable-authn-anon \
+ --enable-authn-alias \
+ --disable-imagemap \
+ --enable-proxy-connect \
+ --enable-proxy-http \
+ --enable-proxy-ftp \
+ --enable-deflate \
+ --enable-dbd \
+ --enable-exception-hook \
+ --enable-dav \
+ --enable-dav-fs \
+ --enable-dav-lock
+
+ - uses: autoconf/make
+
+ - uses: autoconf/make-install
+
+ - uses: strip
+
+subpackages:
+ - name: ${{package.name}}-dev
+ description: "Apache HTTP Server (development headers)"
+ pipeline:
+ - uses: split/dev
+ dependencies:
+ runtime:
+ - perl
+ - apr-util-dev
+
+ - name: ${{package.name}}-doc
+ description: "Apache HTTP Server (documentation)"
+ pipeline:
+ - uses: split/manpages
+ - runs: |
+ set -x
+ mkdir -p "${{targets.subpkgdir}}"/usr/share/doc/apache2
+ mv "${{targets.destdir}}"/usr/share/apache2/default-site/htdocs/manual "${{targets.subpkgdir}}"/usr/share/doc/apache2/
+ rm -rf /usr/share/apache2/default-site/htdocs
+
+ - name: ${{package.name}}-utils
+ description: "Apache HTTP Server (utilities)"
+ pipeline:
+ - runs: |
+ set -x
+ # Move utilities to usr/bin
+ mkdir -p "${{targets.subpkgdir}}"/usr/bin
+ for i in ab htdbm htdigest htpasswd httxt2dbm logresolve; do
+ mv "${{targets.destdir}}"/usr/bin/$i "${{targets.subpkgdir}}"/usr/bin/
+ done
+ # Move utilities to usr/sbin
+ mkdir -p "${{targets.subpkgdir}}"/usr/sbin
+ for i in checkgid fcgistarter htcacheclean rotatelogs; do
+ mv "${{targets.destdir}}"/usr/sbin/$i "${{targets.subpkgdir}}"/usr/sbin/
+ done
+
+ - name: ${{package.name}}-data
+ description: "Apache HTTP Server (data files)"
+ pipeline:
+ - runs: |
+ mkdir -p "${{targets.subpkgdir}}"/usr/share/apache2
+ mv "${{targets.destdir}}"/usr/share/apache2/icons "${{targets.subpkgdir}}"/usr/share/apache2/
+ mv "${{targets.destdir}}"/usr/share/apache2/error "${{targets.subpkgdir}}"/usr/share/apache2/
+
+test:
+ environment:
+ contents:
+ packages:
+ - curl
+ pipeline:
+ - runs: |
+ httpd -M
+
+ mkdir -p /usr/local/apache2/conf
+ mkdir -p /usr/local/apache2/htdocs
+ mkdir -p /usr/local/apache2/logs
+ mkdir -p /usr/local/apache2/var/run/apache2
+
+ # Set the document root path based on the system
+ DOC_ROOT="/usr/local/apache2/htdocs"
+ CONF_FILE="/usr/local/apache2/conf/httpd.conf"
+
+ # Add the required configuration to allow access for all
+ echo "Modifying Apache configuration to allow access to all..."
+ cat <<EOL >> "$CONF_FILE"
+ ServerRoot "/usr/local/apache2"
+ Listen 80
+ ServerName localhost:8080
+
+ # Load required modules
+ LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so
+ LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so
+ LoadModule log_config_module /usr/lib/apache2/modules/mod_log_config.so
+ LoadModule unixd_module /usr/lib/apache2/modules/mod_unixd.so
+
+ DocumentRoot "/usr/local/apache2/htdocs"
+
+ # Custom configuration to allow access to all
+ <Directory "$DOC_ROOT">
+ Options Indexes FollowSymLinks
+ AllowOverride None
+ Require all granted
+ </Directory>
+
+ EOL
+
+ # Ensure correct permissions on the document root
+ echo "Setting permissions for the document root..."
+ chmod o+rx /usr/local/apache2 "$DOC_ROOT"
+ chown -R $(whoami):$(whoami) "$DOC_ROOT"
+ chmod -R 755 "$DOC_ROOT"
+
+ echo "<html><body><h1>Apache Test Page</h1></body></html>" > /usr/local/apache2/htdocs/test.html
+
+
+ # Start httpd using the custom configuration
+ echo "Starting httpd..."
+ httpd -f "$CONF_FILE" -DFOREGROUND &
+ httpd_pid=$!
+
+ # Give httpd some time to start
+ sleep 5
+
+ # Test if httpd is running
+ if pgrep httpd > /dev/null; then
+ echo "PASS: Apache (httpd) is running."
+ else
+ echo "FAIL: Apache (httpd) is not running."
+ kill "$httpd_pid"
+ exit 1
+ fi
+
+ # Test serving the page using curl
+ echo "Testing the page with curl..."
+ curl -v http://localhost/test.html 2>&1 | tee /tmp/curl_output.log
+
+ if grep "200 OK" /tmp/curl_output.log > /dev/null; then
+ echo "PASS: Page served successfully."
+ else
+ echo "FAIL: Could not retrieve the page. Check curl output:"
+ cat /tmp/curl_output.log
+ fi
+
+ # Stop httpd
+ echo "Stopping httpd..."
+ kill "$httpd_pid"
+
+update:
+ enabled: true
+ github:
+ identifier: apache/httpd
+ use-tag: true

apko.yaml

@@ -1,6 +1,6 @@
 package:
  name: apko
- version: 0.18.1
+ version: 0.19.0
  epoch: 0
  description: Build OCI images using APK directly without Dockerfile
  copyright:
@@ -22,7 +22,7 @@ pipeline:
  with:
  repository: https://github.com/chainguard-dev/apko
  tag: v${{package.version}}
- expected-commit: 1facd1ca7b6dc0b215becb3e018d2860dddbc0a2
+ expected-commit: 7fd722a98a87f25ce376cd6d0915978bd0bf4ff9
 
  - runs: |
  make apko

aws-c-auth.yaml

@@ -1,6 +1,6 @@
 package:
  name: aws-c-auth
- version: 0.7.30
+ version: 0.7.31
  epoch: 0
  description: "C99 library implementation of AWS client-side authentication: standard credentials providers and signing"
  copyright:
@@ -27,7 +27,7 @@ environment:
 pipeline:
  - uses: git-checkout
  with:
- expected-commit: d5e6eb03b5dc36845cc44995c6afbbce19a287af
+ expected-commit: 48d647bf43f8872e4dc5ec6343b0c5974195fbdd
  repository: https://github.com/awslabs/aws-c-auth
  tag: v${{package.version}}
 

aws-cli-v2.yaml

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

aws-ebs-csi-driver.yaml

@@ -1,7 +1,7 @@
 package:
  name: aws-ebs-csi-driver
- version: 1.34.0
- epoch: 1
+ version: 1.35.0
+ epoch: 0
  description: CSI driver for Amazon EBS.
  copyright:
  - license: Apache-2.0
@@ -30,7 +30,7 @@ pipeline:
  with:
  repository: https://github.com/kubernetes-sigs/aws-ebs-csi-driver
  tag: v${{package.version}}
- expected-commit: 34afe61a2f1472210922f8985ab34b2a58bcdfc8
+ expected-commit: 1e4e9081d7c101895037a55e27cec8939016c51e
 
  - runs: |
  # Our global LDFLAGS conflict with a Makefile parameter

aws-load-balancer-controller.yaml

@@ -1,7 +1,7 @@
 package:
  name: aws-load-balancer-controller
- version: 2.8.2
- epoch: 1
+ version: 2.8.3
+ epoch: 0
  description: A Kubernetes controller for Elastic Load Balancers
  copyright:
  - license: Apache-2.0
@@ -20,7 +20,7 @@ pipeline:
  with:
  repository: https://github.com/kubernetes-sigs/aws-load-balancer-controller
  tag: v${{package.version}}
- expected-commit: f39ae43121c3f4de0129dda483c10b17a687491d
+ expected-commit: a1418f94a060043cacb43cc8f0aeb7f4ac1eb94d
 
  - runs: |
  # https://github.com/kubernetes-sigs/aws-load-balancer-controller/blob/main/Dockerfile#L18-L27

bmake.yaml

@@ -1,6 +1,6 @@
 package:
  name: bmake
- version: "20240901"
+ version: "20240909"
  epoch: 0
  description: Portable version of the NetBSD make build tool
  copyright:
@@ -17,7 +17,7 @@ environment:
 pipeline:
  - uses: fetch
  with:
- expected-sha256: b5d753befc42e8a852a38e5cb6137c4e5a91585a6cb3888cf0645725c7759a66
+ expected-sha256: d4e019e26c64cc8ffcf1cae9bb04fbb13da8fa6f41fb30fd26e221f655d4e84d
  uri: https://www.crufty.net/ftp/pub/sjg/bmake-${{package.version}}.tar.gz
  strip-components: 0
 

brew.yaml

@@ -1,6 +1,6 @@
 package:
  name: brew
- version: 4.3.21
+ version: 4.3.23
  epoch: 0
  description: "The homebrew package manager"
  copyright:
@@ -48,7 +48,7 @@ pipeline:
  repository: https://github.com/Homebrew/brew
  tag: ${{package.version}}
  destination: ./brew
- expected-commit: c5d09b411776547bdbc8e0435deaf690ca632413
+ expected-commit: 42c11a4dedf352229271593de831161071603c66
 
  - runs: |
  set -x

cargobump.yaml

@@ -0,0 +1,33 @@
+package:
+ name: cargobump
+ version: 0.0.1
+ epoch: 0
+ description: Rust tool to declaratively bump dependencies using cargo
+ copyright:
+ - license: Apache-2.0
+
+pipeline:
+ - uses: git-checkout
+ with:
+ repository: https://github.com/chainguard-dev/cargobump.git
+ tag: v${{package.version}}
+ expected-commit: d51d6682138403b68f6a8464ffb1b5fa83e90544
+
+ - uses: go/build
+ with:
+ packages: .
+ output: cargobump
+
+ - uses: strip
+
+update:
+ enabled: true
+ github:
+ identifier: chainguard-dev/cargobump
+ strip-prefix: v
+ use-tag: true
+
+test:
+ pipeline:
+ - runs: |
+ cargobump version