diff -pruN 2.6.1-2.2/debian/changelog 2.6.1-2.2ubuntu4/debian/changelog --- 2.6.1-2.2/debian/changelog 2023-10-27 17:35:06.000000000 +0000 +++ 2.6.1-2.2ubuntu4/debian/changelog 2026-01-09 20:51:54.000000000 +0000 @@ -1,3 +1,40 @@ +softhsm2 (2.6.1-2.2ubuntu4) resolute; urgency=medium + + * No-change mass rebuild for Ubuntu 26.04 (LP: #2132257) + + -- Graham Inggs Fri, 09 Jan 2026 20:51:54 +0000 + +softhsm2 (2.6.1-2.2ubuntu3) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- William Grant Mon, 01 Apr 2024 15:47:06 +1100 + +softhsm2 (2.6.1-2.2ubuntu2) noble; urgency=medium + + * debian/patches/0004-fix-uaf-in-softhsm-dtor.patch: Fix an use-after- + free issue in SoftHSM class. Closes LP: #2059340. + + -- Zixing Liu Wed, 27 Mar 2024 18:30:39 -0600 + +softhsm2 (2.6.1-2.2ubuntu1) noble; urgency=medium + + * debian/patches/64-bit-time-t-compat.patch: long != time_t. + + -- Steve Langasek Tue, 26 Mar 2024 15:42:43 +0000 + +softhsm2 (2.6.1-2.2build2) noble; urgency=medium + + * Ignore test results for a first build with libssl3t64. + + -- Matthias Klose Tue, 05 Mar 2024 17:12:00 +0100 + +softhsm2 (2.6.1-2.2build1) noble; urgency=medium + + * No-change rebuild against libssl3t64 + + -- Steve Langasek Mon, 04 Mar 2024 21:23:53 +0000 + softhsm2 (2.6.1-2.2) unstable; urgency=medium * Non-maintainer upload diff -pruN 2.6.1-2.2/debian/control 2.6.1-2.2ubuntu4/debian/control --- 2.6.1-2.2/debian/control 2023-10-27 17:31:49.000000000 +0000 +++ 2.6.1-2.2ubuntu4/debian/control 2024-03-28 00:30:39.000000000 +0000 @@ -1,7 +1,8 @@ Source: softhsm2 Section: admin Priority: optional -Maintainer: Debian DNS Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian DNS Team Uploaders: Ondřej Surý Build-Depends: debhelper (>= 10), libcppunit-dev, diff -pruN 2.6.1-2.2/debian/patches/0004-fix-uaf-in-softhsm-dtor.patch 2.6.1-2.2ubuntu4/debian/patches/0004-fix-uaf-in-softhsm-dtor.patch --- 2.6.1-2.2/debian/patches/0004-fix-uaf-in-softhsm-dtor.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.6.1-2.2ubuntu4/debian/patches/0004-fix-uaf-in-softhsm-dtor.patch 2024-03-28 00:30:39.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Fix an use-after-free issue in SoftHSM class + This causes a crash on armhf due to unwind behavior is slightly different + than other architectures +Author: Zixing Liu +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/softhsm2/+bug/2059340 +Forwarded: no +Last-Update: 2024-03-28 + +--- softhsm2-2.6.1.orig/src/lib/SoftHSM.cpp ++++ softhsm2-2.6.1/src/lib/SoftHSM.cpp +@@ -407,6 +407,9 @@ SoftHSM::~SoftHSM() + isInitialised = false; + + resetMutexFactoryCallbacks(); ++ // dis-own and leak the object, since we are currently ++ // in the dtor of the containing object ++ static_cast(SoftHSM::instance.release()); + } + + /***************************************************************************** diff -pruN 2.6.1-2.2/debian/patches/64-bit-time-t-compat.patch 2.6.1-2.2ubuntu4/debian/patches/64-bit-time-t-compat.patch --- 2.6.1-2.2/debian/patches/64-bit-time-t-compat.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.6.1-2.2ubuntu4/debian/patches/64-bit-time-t-compat.patch 2024-03-28 00:30:39.000000000 +0000 @@ -0,0 +1,18 @@ +Description: long != time_t +Author: Steve Langasek +Forwarded: no +Last-Update: 2024-03-26 + +Index: softhsm2-2.6.1/src/lib/object_store/DB.cpp +=================================================================== +--- softhsm2-2.6.1.orig/src/lib/object_store/DB.cpp ++++ softhsm2-2.6.1/src/lib/object_store/DB.cpp +@@ -154,7 +154,7 @@ + // the time (under the assumption that we are 1 hour ahead of UTC). + // We can now use this to determine how much local time differred + // from UTC time on january the 10th 1970 +- long diff_time = posix_time - mktime(&ref_tm); ++ time_t diff_time = posix_time - mktime(&ref_tm); + + // We explicitly set tm_isdst to zero to prevent errors + // when the time we are trying to convert is occuring at diff -pruN 2.6.1-2.2/debian/patches/series 2.6.1-2.2ubuntu4/debian/patches/series --- 2.6.1-2.2/debian/patches/series 2022-05-20 21:14:03.000000000 +0000 +++ 2.6.1-2.2ubuntu4/debian/patches/series 2024-03-28 00:30:39.000000000 +0000 @@ -1,3 +1,5 @@ 0001-Issue-548-Don-t-clean-up-engines-after-OpenSSL-has-a.patch 0002-Fix-OPENSSL_cleanup-detection-without-using-our-own-.patch 0003-fix-ftbfs-with-opensslv3.patch +64-bit-time-t-compat.patch +0004-fix-uaf-in-softhsm-dtor.patch diff -pruN 2.6.1-2.2/debian/rules 2.6.1-2.2ubuntu4/debian/rules --- 2.6.1-2.2/debian/rules 2020-05-15 09:41:43.000000000 +0000 +++ 2.6.1-2.2ubuntu4/debian/rules 2024-03-28 00:30:39.000000000 +0000 @@ -30,6 +30,9 @@ endif %: dh $@ --with autoreconf +override_dh_auto_test: + -dh_auto_test + override_dh_auto_configure: dh_auto_configure -- \ --sysconfdir=/etc/softhsm \