softhsm: upgrade 2.6.1 -> 2.7.0

0001-avoid-unnecessary-check-for-sqlite3-binary.patch
removed since it's included in 2.7.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu 2026-01-27 17:43:39 +08:00 committed by Khem Raj
parent c8e0deb564
commit c1f2aeb030
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 1 additions and 42 deletions

View File

@ -1,40 +0,0 @@
From 88d968346184058df18dc69171dcd4fd612c2341 Mon Sep 17 00:00:00 2001
From: Jan Luebbe <sho@stratum0.net>
Date: Mon, 30 Jan 2023 12:48:23 +0100
Subject: [PATCH] avoid unnecessary check for sqlite3 binary
Only the library is used, not the sqlite3 binary. Drop this check to simplify
cross-compilation (as no native sqlite3 binary is needed).
Upstream-Status: Submitted [https://github.com/opendnssec/SoftHSMv2/pull/694]
---
m4/acx_sqlite3.m4 | 6 ------
1 file changed, 6 deletions(-)
diff --git a/m4/acx_sqlite3.m4 b/m4/acx_sqlite3.m4
index fd942a75e1a6..17c126d161f5 100644
--- a/m4/acx_sqlite3.m4
+++ b/m4/acx_sqlite3.m4
@@ -4,19 +4,13 @@ AC_DEFUN([ACX_SQLITE3],[
[
SQLITE3_INCLUDES="-I$withval/include"
SQLITE3_LIBDIRS="-L$withval/lib"
- AC_PATH_PROGS(SQLITE3, sqlite3, sqlite3, $withval/bin)
],[
SQLITE3_INCLUDES=""
SQLITE3_LIBDIRS=""
- AC_PATH_PROGS(SQLITE3, sqlite3, sqlite3, $PATH)
])
- if ! test -x "$SQLITE3"; then
- AC_MSG_ERROR([sqlite3 command not found])
- fi
-
AC_MSG_CHECKING(what are the SQLite3 includes)
AC_MSG_RESULT($SQLITE3_INCLUDES)
--
2.30.2

View File

@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210"
DEPENDS = "sqlite3"
SRC_URI = "git://github.com/softhsm/SoftHSMv2.git;protocol=https;branch=main;tag=${PV} \
file://0001-avoid-unnecessary-check-for-sqlite3-binary.patch \
file://0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch \
"
SRCREV = "7f99bedae002f0dd04ceeb8d86d59fc4a68a69a0"
SRCREV = "13e6e86b83748fef74046dbf0c91f664b7acc1c3"
inherit autotools pkgconfig siteinfo