Merge branch 'main' into cve-management-api-for-apache-cassandra-5.0-…

…aae6647fcfc8585ec1f565eb1891bc20

CODEOWNERS

@@ -10,3 +10,4 @@ abseil-cpp.yaml      @wolfi-dev/foundations-squad
 ca-certificates.yaml @wolfi-dev/foundations-squad
 glibc.yaml           @wolfi-dev/foundations-squad
 openssh.yaml         @wolfi-dev/foundations-squad
+openssl.yaml         @wolfi-dev/foundations-squad

Makefile

@@ -81,13 +81,11 @@ fetch-kernel:
 	export QEMU_KERNEL_MODULES=/tmp/kernel/lib/modules/
 	export MELANGE_OPTS="--runner=qemu"
 
-package/%:
+yamls := $(wildcard *.yaml)
+pkgs := $(subst .yaml,,$(yamls))
+pkg_targets = $(foreach name,$(pkgs),package/$(name))
+$(pkg_targets): package/%:
 	$(eval yamlfile := $*.yaml)
-	@if [ -z "$(yamlfile)" ]; then \
-		echo "Error: could not find yaml file for $*"; exit 1; \
-	else \
-		echo "yamlfile is $(yamlfile)"; \
-	fi
 	$(eval pkgver := $(shell $(MELANGE) package-version $(yamlfile)))
 	@printf "Building package $* with version $(pkgver) from file $(yamlfile)\n"
 	$(MAKE) yamlfile=$(yamlfile) pkgname=$* packages/$(ARCH)/$(pkgver).apk
@@ -98,40 +96,28 @@ packages/$(ARCH)/%.apk: $(KEY)
 	$(info @SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) $(MELANGE) build $(yamlfile) $(MELANGE_OPTS) --source-dir ./$(pkgname)/)
 	@SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) $(MELANGE) build $(yamlfile) $(MELANGE_OPTS) --source-dir ./$(pkgname)/
 
-debug/%: $(KEY)
+dbg_targets = $(foreach name,$(pkgs),debug/$(name))
+$(dbg_targets): debug/%: $(KEY)
 	$(eval yamlfile := $*.yaml)
-	@if [ -z "$(yamlfile)" ]; then \
-		echo "Error: could not find yaml file for $*"; exit 1; \
-	else \
-		echo "yamlfile is $(yamlfile)"; \
-	fi
 	$(eval pkgver := $(shell $(MELANGE) package-version $(yamlfile)))
 	@printf "Building package $* with version $(pkgver) from file $(yamlfile)\n"
 	@mkdir -p ./"$*"/
 	$(eval SOURCE_DATE_EPOCH ?= $(shell git log -1 --pretty=%ct --follow $(yamlfile)))
 	$(info @SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) $(MELANGE) build $(yamlfile) $(MELANGE_DEBUG_OPTS) --source-dir ./$(*)/)
 	@SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) $(MELANGE) build $(yamlfile) $(MELANGE_DEBUG_OPTS) --source-dir ./$(*)/
 
-test/%:
+test_targets = $(foreach name,$(pkgs),test/$(name))
+$(test_targets): test/%: $(KEY)
 	@mkdir -p ./$(*)/
 	$(eval yamlfile := $*.yaml)
-	@if [ -z "$(yamlfile)" ]; then \
-		echo "Error: could not find yaml file for $*"; exit 1; \
-	else \
-		echo "yamlfile is $(yamlfile)"; \
-	fi
 	$(eval pkgver := $(shell $(MELANGE) package-version $(yamlfile)))
 	@printf "Testing package $* with version $(pkgver) from file $(yamlfile)\n"
 	$(MELANGE) test $(yamlfile) $(MELANGE_TEST_OPTS) --source-dir ./$(*)/
 
-test-debug/%:
+testdbg_targets = $(foreach name,$(pkgs),test-debug/$(name))
+$(testdbg_targets): test-debug/%: $(KEY)
 	@mkdir -p ./$(*)/
 	$(eval yamlfile := $*.yaml)
-	@if [ -z "$(yamlfile)" ]; then \
-		echo "Error: could not find yaml file for $*"; exit 1; \
-	else \
-		echo "yamlfile is $(yamlfile)"; \
-	fi
 	$(eval pkgver := $(shell $(MELANGE) package-version $(yamlfile)))
 	@printf "Testing package $* with version $(pkgver) from file $(yamlfile)\n"
 	$(MELANGE) test $(yamlfile) $(MELANGE_TEST_OPTS) $(MELANGE_DEBUG_TEST_OPTS) --source-dir ./$(*)/

R-DBI.yaml

@@ -1,7 +1,7 @@
 package:
   name: R-DBI
   version: 1.2.3
-  epoch: 0
+  epoch: 1
   description: A database interface (DBI) definition for communication between R and RDBMSs
   copyright:
     - license: LGPL-2.1-only

R-magrittr.yaml

@@ -1,7 +1,7 @@
 package:
   name: R-magrittr
   version: 2.0.3
-  epoch: 0
+  epoch: 1
   description: Improve the readability of R code with the pipe
   copyright:
     - license: MIT

R-proxy.yaml

@@ -1,7 +1,7 @@
 package:
   name: R-proxy
   version: 0.4.27
-  epoch: 0
+  epoch: 1
   description: Distance and similarity measures
   copyright:
     - license: GPL-2.0-or-later

R-showtext.yaml

@@ -1,7 +1,7 @@
 package:
   name: R-showtext
   version: 0.9.7
-  epoch: 0
+  epoch: 1
   description: Using Fonts More Easily in R Graphs
   copyright:
     - license: Apache-2.0

R-showtextdb.yaml

@@ -1,7 +1,7 @@
 package:
   name: R-showtextdb
   version: 3.0
-  epoch: 0
+  epoch: 1
   description: Providing font files that can be used by the showtext package
   copyright:
     - license: Apache-2.0

R-sysfonts.yaml

@@ -1,7 +1,7 @@
 package:
   name: R-sysfonts
   version: 0.8.9
-  epoch: 0
+  epoch: 1
   description: Loading Fonts into R
   copyright:
     - license: GPL-2.0-only

R-units.yaml

@@ -1,7 +1,7 @@
 package:
   name: R-units
   version: 0.8.5
-  epoch: 0
+  epoch: 1
   description: Measurement Units for R Vectors
   copyright:
     - license: GPL-2.0-or-later

abseil-cpp.yaml

@@ -6,7 +6,7 @@
 # to this file from the OS team.
 package:
   name: abseil-cpp
-  version: "20240722.0" # On update, please check if -fdelete-null-pointer-checks is still required
+  version: "20250127.0" # On update, please check if -fdelete-null-pointer-checks is still required
   epoch: 0
   description: Abseil Common Libraries (C++)
   copyright:
@@ -32,7 +32,7 @@ pipeline:
     with:
       repository: https://github.com/abseil/abseil-cpp
       tag: ${{package.version}}
-      expected-commit: 4447c7562e3bc702ade25105912dce503f0c4010
+      expected-commit: 9ac7062b1860d895fb5a8cbf58c3e9ef8f674b5f
 
   - runs: |
       cmake -B build -G Ninja \
@@ -54,123 +54,7 @@ pipeline:
 
   - uses: strip
 
-data:
-  - name: _libs
-    items:
-      atomic-hook-test-helper:
-      bad-any-cast-impl:
-      bad-optional-access:
-      bad-variant-access:
-      base:
-      city:
-      civil-time:
-      cord:
-      cord-internal:
-      cordz-functions:
-      cordz-handle:
-      cordz-info:
-      cordz-sample-token:
-      crc32c:
-      crc-cord-state:
-      crc-cpu-detect:
-      crc-internal:
-      debugging-internal:
-      demangle-internal:
-      die-if-null:
-      examine-stack:
-      exception-safety-testing:
-      exponential-biased:
-      failure-signal-handler:
-      flags-commandlineflag:
-      flags-commandlineflag-internal:
-      flags-config:
-      flags-internal:
-      flags-marshalling:
-      flags-parse:
-      flags-private-handle-accessor:
-      flags-program-name:
-      flags-reflection:
-      flags-usage:
-      flags-usage-internal:
-      graphcycles-internal:
-      hash:
-      hash-generator-testing:
-      hashtablez-sampler:
-      int128:
-      kernel-timeout-internal:
-      leak-check:
-      log-entry:
-      log-flags:
-      log-globals:
-      log-initialize:
-      log-internal-check-op:
-      log-internal-conditions:
-      log-internal-format:
-      log-internal-globals:
-      log-internal-log-sink-set:
-      log-internal-message:
-      log-internal-nullguard:
-      log-internal-proto:
-      log-internal-test-actions:
-      log-internal-test-helpers:
-      log-internal-test-matchers:
-      log-severity:
-      log-sink:
-      low-level-hash:
-      malloc-internal:
-      per-thread-sem-test-common:
-      periodic-sampler:
-      pow10-helper:
-      random-distributions:
-      random-internal-distribution-test-util:
-      random-internal-platform:
-      random-internal-pool-urbg:
-      random-internal-randen:
-      random-internal-randen-hwaes:
-      random-internal-randen-hwaes-impl:
-      random-internal-randen-slow:
-      random-internal-seed-material:
-      random-seed-gen-exception:
-      random-seed-sequences:
-      raw-hash-set:
-      raw-logging-internal:
-      scoped-mock-log:
-      scoped-set-env:
-      spinlock-test-common:
-      spinlock-wait:
-      stack-consumption:
-      stacktrace:
-      status:
-      statusor:
-      str-format-internal:
-      strerror:
-      string-view:
-      strings:
-      strings-internal:
-      symbolize:
-      synchronization:
-      test-instance-tracker:
-      throw-delegate:
-      time:
-      time-internal-test-util:
-      time-zone:
-
 subpackages:
-  - range: _libs
-    name: abseil-cpp-${{range.key}}
-    description: Abseil Common C++ library
-    pipeline:
-      - runs: |
-          mkdir -p ${{targets.subpkgdir}}/usr/lib
-          libname="${{range.key}}"
-          echo "libname: $libname"
-
-          # Replacing hyphens with underscores in libname
-          libname_with_underscore="${libname//-/_}"
-          echo "libname_with_underscore: $libname_with_underscore"
-          ls -latr ${{targets.destdir}}/usr/lib
-          mv ${{targets.destdir}}/usr/lib/libabsl_${libname_with_underscore}.so.* ${{targets.subpkgdir}}/usr/lib/
-
   - name: abseil-cpp-dev
     pipeline:
       - uses: split/dev

aerospike-7.yaml

@@ -1,6 +1,6 @@
 package:
   name: aerospike-7
-  version: "7.2.0.7"
+  version: "7.2.0.8"
   epoch: 0
   description: Aerospike Database Server - flash-optimized, in-memory, nosql database
   copyright:
@@ -27,7 +27,7 @@ pipeline:
     with:
       repository: https://github.com/aerospike/aerospike-server
       tag: ${{package.version}}
-      expected-commit: 5eeff97b7be7f43ce14de38c0c5656cfa6c689ac
+      expected-commit: 71e04b692f323d7bd579d5c8023cdbbe86555a3c
       recurse-submodules: true
 
   - runs: |

aerospike.yaml

@@ -1,6 +1,6 @@
 package:
   name: aerospike
-  version: "6.4.0.29"
+  version: "6.4.0.30"
   epoch: 0
   description: Aerospike Database Server - flash-optimized, in-memory, nosql database
   copyright:
@@ -27,7 +27,7 @@ pipeline:
     with:
       repository: https://github.com/aerospike/aerospike-server
       tag: ${{package.version}}
-      expected-commit: 4bd65247bec514aa14e5b119b276674899388f18
+      expected-commit: dc15145432fa6d8dcad8f26e704d691e874bc9df
 
   - runs: git submodule update --init
 

akhq.yaml

@@ -1,7 +1,7 @@
 package:
   name: akhq
   version: 0.25.1
-  epoch: 2
+  epoch: 3
   description: "Kafka GUI for Apache Kafka to manage topics, topics data, consumers group, schema registry, connect and more"
   copyright:
     - license: Apache-2.0
@@ -28,7 +28,8 @@ pipeline:
 
   - uses: patch
     with:
-      patches: logback-cves.patch
+      patches: |
+        cves-20250220.patch
 
   - runs: |
       ./gradlew build -x test -x startTestKafkaCluster --parallel --no-daemon