ostree: update to 2025.4.

This commit is contained in:
Duncaen 2025-08-10 22:03:32 +02:00
parent 27a380deac
commit cc6374ebe1
No known key found for this signature in database
GPG key ID: 335C1D17EC3D6E35
2 changed files with 4 additions and 34 deletions

View file

@ -1,30 +0,0 @@
From bd2a9753e5227c97bda737e00a00451d361449f3 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno@redhat.com>
Date: Mon, 24 Mar 2025 21:25:12 +0900
Subject: [PATCH] Fix build error with --with-ed25519-libsodium and
--with-openssl
While libotcore can be configured with those options individually, the
latter is always required for OpenSSL's EVP functions. This splits the
ifdefs to accommodate that.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
---
src/libotcore/otcore.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/libotcore/otcore.h b/src/libotcore/otcore.h
index ceeb1a9265..3ce8f2a39f 100644
--- a/src/libotcore/otcore.h
+++ b/src/libotcore/otcore.h
@@ -25,7 +25,9 @@
#ifdef HAVE_LIBSODIUM
#include <sodium.h>
#define USE_LIBSODIUM
-#elif defined(HAVE_OPENSSL)
+#endif
+
+#if defined(HAVE_OPENSSL)
#include <openssl/evp.h>
#include <openssl/x509.h>
#define USE_OPENSSL

View file

@ -1,7 +1,7 @@
# Template file for 'ostree' # Template file for 'ostree'
pkgname=ostree pkgname=ostree
version=2025.2 version=2025.4
revision=4 revision=1
build_style=gnu-configure build_style=gnu-configure
build_helper="gir" build_helper="gir"
configure_args=" configure_args="
@ -13,14 +13,14 @@ configure_args="
hostmakedepends="bison docbook-xsl glib-devel libxslt pkg-config" hostmakedepends="bison docbook-xsl glib-devel libxslt pkg-config"
makedepends="e2fsprogs-devel fuse-devel glib-devel gpgme-devel libarchive-devel makedepends="e2fsprogs-devel fuse-devel glib-devel gpgme-devel libarchive-devel
libcurl-devel libsodium-devel $(vopt_if gir 'gobject-introspection') libsoup3-devel" libcurl-devel libsodium-devel $(vopt_if gir 'gobject-introspection') libsoup3-devel"
checkdepends="attr-progs cpio elfutils gnupg python3-yaml tar which xz" checkdepends="attr-progs cpio elfutils gnupg python3-yaml tar which xz jq"
short_desc="Operating system and container binary deployment and upgrades" short_desc="Operating system and container binary deployment and upgrades"
maintainer="Duncaen <duncaen@voidlinux.org>" maintainer="Duncaen <duncaen@voidlinux.org>"
license="LGPL-2.0-or-later" license="LGPL-2.0-or-later"
homepage="https://ostreedev.github.io/ostree/" homepage="https://ostreedev.github.io/ostree/"
changelog="https://github.com/ostreedev/ostree/releases" changelog="https://github.com/ostreedev/ostree/releases"
distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz" distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"
checksum=f244a408c909998a778e127fcc22c1b502b4d013f15f26948f47cc72ffe2eef4 checksum=014d12d19ea664fae53fe147d3d2c0b7465a3c37e099c87d289df908adeb5669
build_options="gir" build_options="gir"
build_options_default="gir" build_options_default="gir"