From 2c7c3b79bdaca393089160dd4fe4579f9027f2a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Mon, 13 Aug 2018 11:24:36 +0200
Subject: [PATCH] SoftHSM 2.4.0 only supports softhsm2.conf now, rewrite GitLab
 CI commands to properly support that

---
 util/copyrights          |  1 +
 util/prepare-softhsm2.sh | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 util/prepare-softhsm2.sh

diff --git a/util/copyrights b/util/copyrights
index 61ea7577f4..5fe1cca045 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -4436,6 +4436,7 @@
 ./util/nanny.pl					PERL	2000,2001,2004,2007,2012,2016,2018
 ./util/new-func					PERL	2005,2007,2012,2016,2018
 ./util/nt-kit					SH	1999,2000,2001,2004,2007,2012,2016,2018
+./util/prepare-softhsm2.sh			X	2018
 ./util/spacewhack.pl				PERL	2000,2001,2004,2007,2012,2016,2018
 ./util/tabify-changes				SH	2004,2007,2012,2016,2018
 ./util/update-drafts.pl				PERL	2000,2001,2004,2007,2012,2016,2018
diff --git a/util/prepare-softhsm2.sh b/util/prepare-softhsm2.sh
new file mode 100644
index 0000000000..24c7f17c1a
--- /dev/null
+++ b/util/prepare-softhsm2.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ -n "${SOFTHSM2_CONF}" ] && command -v softhsm2-util >/dev/null; then
+    SOFTHSM2_DIR=$(dirname "$SOFTHSM2_CONF")
+    mkdir -p "${SOFTHSM2_DIR}/tokens"
+    echo "directories.tokendir = ${SOFTHSM2_DIR}/tokens" > "${SOFTHSM2_CONF}"
+    echo "objectstore.backend = file" >> "${SOFTHSM2_CONF}"
+    echo "log.level = DEBUG" >> "${SOFTHSM2_CONF}"
+    softhsm2-util --init-token --free --pin 0000 --so-pin 0000 --label "softhsm2";
+fi
+exit 0