Control: tags -1 +patch
And here's tested patch.
Cheers,
--
Ondřej Surý <ond...@sury.org>
Knot DNS (https://www.knot-dns.cz/) – a high-performance DNS server
On Thu, Apr 7, 2016, at 00:23, Ondřej Surý wrote:
> Package: src:mod-gnutls
> Version: 0.7.2-2
> Severity: serious
> Justification: fails to build from source (but built successfully in the
> past)
>
> Daniel,
>
> could you please switch the mod-gnutls to use (lib)softhsm2 (>= 2.1.0-2)?
>
> I am going to kill softhsm(1) from the archive and yours and some
> golang pkcs11 library are the only users of the old softhsm(1) (and
> both just for the tests).
>
> Cheers,
> Ondrej
>
> -- System Information:
> Debian Release: stretch/sid
> APT prefers testing
> APT policy: (900, 'testing'), (800, 'unstable'), (700, 'experimental')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386
>
> Kernel: Linux 4.5.0-rc7-amd64 (SMP w/4 CPU cores)
> Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
> Init: systemd (via /run/systemd/system)
From d9e31a6cc70c64b5f9f3d6fc095a8a36592e679e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ond...@sury.org>
Date: Wed, 6 Apr 2016 21:49:05 -0300
Subject: [PATCH] Use libsofthsm2.so instead of libsofthsm.so
---
debian/control | 2 +-
...e-libsofthsm2.so-instead-of-libsofthsm.so.patch | 41 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/0002-Use-libsofthsm2.so-instead-of-libsofthsm.so.patch
diff --git a/debian/control b/debian/control
index a2a1c59..d1c31f8 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: apache2-bin <!nocheck>,
pandoc,
pkg-config,
procps <!nocheck>,
- softhsm <!nocheck>
+ libsofthsm2 <!nocheck>
Standards-Version: 3.9.6
Homepage: https://mod.gnutls.org/
Vcs-Git: https://mod.gnutls.org/git/mod_gnutls
diff --git a/debian/patches/0002-Use-libsofthsm2.so-instead-of-libsofthsm.so.patch b/debian/patches/0002-Use-libsofthsm2.so-instead-of-libsofthsm.so.patch
new file mode 100644
index 0000000..1783da9
--- /dev/null
+++ b/debian/patches/0002-Use-libsofthsm2.so-instead-of-libsofthsm.so.patch
@@ -0,0 +1,41 @@
+From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ond...@sury.org>
+Date: Wed, 6 Apr 2016 21:48:57 -0300
+Subject: Use libsofthsm2.so instead of libsofthsm.so
+
+---
+ test/softhsm.bash | 5 ++---
+ test/tests/24_pkcs11_cert/apache.conf | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/test/softhsm.bash b/test/softhsm.bash
+index e306ec2..155d599 100755
+--- a/test/softhsm.bash
++++ b/test/softhsm.bash
+@@ -87,12 +87,11 @@ esac
+
+ set -e
+
+-# Guess location of libsofthsm based on softhsm binary. The path
++# Guess location of libsofthsm2 based on softhsm binary. The path
+ # matches SoftHSM upstream, but this might fail if someone changes the
+ # libdir or bindir of the SoftHSM installation independently of its
+ # general prefix.
+-softhsm_prefix="$(realpath $(dirname ${softhsm})/..)"
+-softhsm_lib="${softhsm_prefix}/lib/softhsm/libsofthsm.so"
++softhsm_lib="/usr/lib/softhsm/libsofthsm2.so"
+
+ # fail if SOFTHSM_CONF is not set
+ if [ -z "${SOFTHSM_CONF}" ]; then
+diff --git a/test/tests/24_pkcs11_cert/apache.conf b/test/tests/24_pkcs11_cert/apache.conf
+index 6117c31..6a60b69 100644
+--- a/test/tests/24_pkcs11_cert/apache.conf
++++ b/test/tests/24_pkcs11_cert/apache.conf
+@@ -2,7 +2,7 @@ Include ${srcdir}/base_apache.conf
+
+ GnuTLSCache dbm cache/gnutls_cache
+
+-GnuTLSP11Module /usr/lib/softhsm/libsofthsm.so
++GnuTLSP11Module /usr/lib/softhsm/libsofthsm2.so
+
+ <VirtualHost ${TEST_IP}:${TEST_PORT}>
+ ServerName ${TEST_HOST}
diff --git a/debian/patches/series b/debian/patches/series
index 5ae5469..47d661d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-let-a-failed-diff-be-verbose.patch
+0002-Use-libsofthsm2.so-instead-of-libsofthsm.so.patch
--
2.8.0.rc3
