[pkg-opensc-maint] Bug#846548: patch for #846548

[Luke W Faraone]

On Thu, 11 May 2017 19:45:51 -0700 Luke W Faraone <lfaraone at debian.org>
wrote:
> Attached is a patch to fix the path to the engine directory, and moves
> this library back to libssl-dev. (it isn't clear to me from changelog or
> git log why the move to 1.1 was originally reverted)

And of course, that patch was bogus. Attached is a orrected patch. I
intend to upload this to DELAYED/5 once I have a chance to test on real
hardware. Below from a VM:

# dpkg -L libssl1.1 | grep engine | head -n 1
/usr/lib/x86_64-linux-gnu/engines-1.1
# dpkg -L libengine-pkcs11-openssl | grep /pkcs11.so
/usr/lib/x86_64-linux-gnu/engines-1.1/pkcs11.so

# openssl engine pkcs11 -t
(pkcs11) pkcs11 engine
     [ available ]


>   -- Luke

-------------- next part --------------
diff -Nru libp11-0.4.4/debian/changelog libp11-0.4.4/debian/changelog
--- libp11-0.4.4/debian/changelog	2017-01-28 08:13:56.000000000 +0000
+++ libp11-0.4.4/debian/changelog	2017-05-12 02:20:40.000000000 +0000
@@ -1,3 +1,11 @@
+libp11 (0.4.4-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Link against libssl 1.1, since `openssl` is built against it.
+  * debian/rules: Fix path to OpenSSL engine directory. (Closes: #846548)
+
+ -- Luke Faraone <lfaraone at debian.org>  Thu, 11 May 2017 19:20:40 -0700
+
 libp11 (0.4.4-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru libp11-0.4.4/debian/control libp11-0.4.4/debian/control
--- libp11-0.4.4/debian/control	2017-01-28 08:13:56.000000000 +0000
+++ libp11-0.4.4/debian/control	2017-05-12 02:20:40.000000000 +0000
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 10),
                libltdl3-dev,
                libp11-kit-dev,
-               libssl1.0-dev,
+               libssl-dev,
                pkg-config
 Standards-Version: 3.9.8
 Homepage: https://github.com/OpenSC/libp11
@@ -16,7 +16,7 @@
 Package: libp11-dev
 Architecture: any
 Depends: libp11-2 (= ${binary:Version}),
-         libssl1.0-dev,
+         libssl-dev,
          pkg-config,
          ${misc:Depends}
 Description: pkcs#11 convenience library - development files
diff -Nru libp11-0.4.4/debian/libengine-pkcs11-openssl.install libp11-0.4.4/debian/libengine-pkcs11-openssl.install
--- libp11-0.4.4/debian/libengine-pkcs11-openssl.install	2017-01-28 08:13:56.000000000 +0000
+++ libp11-0.4.4/debian/libengine-pkcs11-openssl.install	2017-05-12 02:20:40.000000000 +0000
@@ -1 +1 @@
-usr/lib/*/openssl-*/engines/*
+usr/lib/*/engines-*/*
diff -Nru libp11-0.4.4/debian/rules libp11-0.4.4/debian/rules
--- libp11-0.4.4/debian/rules	2017-01-28 08:13:56.000000000 +0000
+++ libp11-0.4.4/debian/rules	2017-05-12 02:20:40.000000000 +0000
@@ -2,8 +2,8 @@
 
 include /usr/share/dpkg/architecture.mk
 
-OPENSSL_VERSION := $(shell pkg-config --modversion openssl | sed "s/[a-z]$$//")
-ENGINES_DIR := /usr/lib/$(DEB_HOST_GNU_TYPE)/openssl-$(OPENSSL_VERSION)/engines
+OPENSSL_VERSION := $(shell pkg-config --modversion openssl | sed "s/[a-z]$$//" | cut -d . -f -2)
+ENGINES_DIR := /usr/lib/$(DEB_HOST_GNU_TYPE)/engines-$(OPENSSL_VERSION)/
 
 %:
 	dh $@
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 829 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-opensc-maint/attachments/20170511/d7f29803/attachment.sig>