Package: opencryptoki
Version: 3.8.1+dfsg-3.1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for opencryptoki (versioned as 3.8.1+dfsg-3.2) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru opencryptoki-3.8.1+dfsg/debian/changelog
opencryptoki-3.8.1+dfsg/debian/changelog
--- opencryptoki-3.8.1+dfsg/debian/changelog 2018-08-11 15:27:36.000000000
+0200
+++ opencryptoki-3.8.1+dfsg/debian/changelog 2021-06-07 15:35:32.000000000
+0200
@@ -1,3 +1,11 @@
+opencryptoki (3.8.1+dfsg-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build again on architectures where libitm and transactional memory are not
+ available, use locks instead
+
+ -- Laurent Bigonville <bi...@debian.org> Mon, 07 Jun 2021 15:35:32 +0200
+
opencryptoki (3.8.1+dfsg-3.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru opencryptoki-3.8.1+dfsg/debian/control
opencryptoki-3.8.1+dfsg/debian/control
--- opencryptoki-3.8.1+dfsg/debian/control 2017-10-31 15:26:51.000000000
+0100
+++ opencryptoki-3.8.1+dfsg/debian/control 2021-06-07 15:35:32.000000000
+0200
@@ -10,7 +10,7 @@
libtspi-dev,
bison,
flex,
- libitm1,
+ libitm1 [alpha amd64 arm64 i386 x32 ppc64 ppc64el s390x sh4 sparc64],
libica-dev [s390x],
libldap2-dev
Standards-Version: 4.1.1
diff -Nru opencryptoki-3.8.1+dfsg/debian/rules
opencryptoki-3.8.1+dfsg/debian/rules
--- opencryptoki-3.8.1+dfsg/debian/rules 2017-11-09 12:52:15.000000000
+0100
+++ opencryptoki-3.8.1+dfsg/debian/rules 2021-06-07 15:34:50.000000000
+0200
@@ -4,6 +4,11 @@
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# Use locks instead of transactional memory in architectures where libitm is
not available
+ifeq (,$(filter $(DEB_HOST_ARCH), alpha amd64 arm64 i386 x32 ppc64 ppc64el
s390x sh4 sparc64))
+ENABLE_LOCKS=--enable-locks
+endif
+
%:
dh ${@}
@@ -12,7 +17,7 @@
rm -f usr/lib/pkcs11/api/pkcs11
override_dh_auto_configure:
- dh_auto_configure -- --enable-tpmtok --with-systemd=/lib/systemd/system
ac_cv_path_CHGRP=true
+ dh_auto_configure -- --enable-tpmtok --with-systemd=/lib/systemd/system
ac_cv_path_CHGRP=true $(ENABLE_LOCKS)
override_dh_auto_install:
dh_auto_install
