Control: tags -1 +patch
Dear Ondřej,
The failure with OpenSSL 1.1 appears to be related only to the configure part
of the build system trying (and failing) to find OpenSSL. This is because the
HMAC_CTX_init function has been replaced with HMAC_CTX_new.
The attached patch changes what configure searches for and the package seems to
then build OK. (Please note that I have not been able to test that the
compiled package works OK!)
cheers
Stuart
--
Stuart Prescott http://www.nanonanonano.net/ [email protected]
Debian Developer http://www.debian.org/ [email protected]
GPG fingerprint 90E2 D2C1 AD14 6A1B 7EBB 891D BBC1 7EBB 1396 F2F7
diff -Nru dnssec-trigger-0.13~svn685/debian/changelog dnssec-trigger-0.13~svn685/debian/changelog
--- dnssec-trigger-0.13~svn685/debian/changelog 2016-03-25 09:14:40.000000000 +1100
+++ dnssec-trigger-0.13~svn685/debian/changelog 2016-11-06 23:53:15.000000000 +1100
@@ -1,3 +1,10 @@
+dnssec-trigger (0.13~svn685-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Tweak detection of OpenSSL to build with version 1.1 (Closes: #828283).
+
+ -- Stuart Prescott <[email protected]> Sun, 06 Nov 2016 23:42:06 +1100
+
dnssec-trigger (0.13~svn685-5) unstable; urgency=medium
* Add patch to support network-manager (>= 1.1.90) (Closes: #815880)
diff -Nru dnssec-trigger-0.13~svn685/debian/patches/openssl-finding.patch dnssec-trigger-0.13~svn685/debian/patches/openssl-finding.patch
--- dnssec-trigger-0.13~svn685/debian/patches/openssl-finding.patch 1970-01-01 10:00:00.000000000 +1000
+++ dnssec-trigger-0.13~svn685/debian/patches/openssl-finding.patch 2016-11-06 23:52:30.000000000 +1100
@@ -0,0 +1,61 @@
+Description: tweak openssl finding code
+ * Tweak detection of OpenSSL to build with version 1.1 (Closes: #828283).
+Author: Stuart Prescott <[email protected]>
+Bug-Debian: https://bugs.debian.org/828283
+
+--- a/acx_nlnetlabs.m4
++++ b/acx_nlnetlabs.m4
+@@ -657,16 +657,16 @@
+ ACX_RUNTIME_PATH_ADD([$ssldir/lib])
+ fi
+
+- AC_MSG_CHECKING([for HMAC_CTX_init in -lcrypto])
++ AC_MSG_CHECKING([for HMAC_CTX_new in -lcrypto])
+ LIBS="$LIBS -lcrypto"
+ LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto"
+ AC_TRY_LINK(, [
+- int HMAC_CTX_init(void);
+- (void)HMAC_CTX_init();
++ int HMAC_CTX_new(void);
++ (void)HMAC_CTX_new();
+ ], [
+ AC_MSG_RESULT(yes)
+- AC_DEFINE([HAVE_HMAC_CTX_INIT], 1,
+- [If you have HMAC_CTX_init])
++ AC_DEFINE([HAVE_HMAC_CTX_NEW], 1,
++ [If you have HMAC_CTX_new])
+ ], [
+ AC_MSG_RESULT(no)
+ # check if -lwsock32 or -lgdi32 are needed.
+@@ -676,11 +676,11 @@
+ LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32"
+ AC_MSG_CHECKING([if -lcrypto needs -lgdi32])
+ AC_TRY_LINK([], [
+- int HMAC_CTX_init(void);
+- (void)HMAC_CTX_init();
++ int HMAC_CTX_new(void);
++ (void)HMAC_CTX_new();
+ ],[
+- AC_DEFINE([HAVE_HMAC_CTX_INIT], 1,
+- [If you have HMAC_CTX_init])
++ AC_DEFINE([HAVE_HMAC_CTX_NEW], 1,
++ [If you have HMAC_CTX_new])
+ AC_MSG_RESULT(yes)
+ ],[
+ AC_MSG_RESULT(no)
+@@ -690,11 +690,11 @@
+ LIBSSL_LIBS="$LIBSSL_LIBS -ldl"
+ AC_MSG_CHECKING([if -lcrypto needs -ldl])
+ AC_TRY_LINK([], [
+- int HMAC_CTX_init(void);
+- (void)HMAC_CTX_init();
++ int HMAC_CTX_new(void);
++ (void)HMAC_CTX_new();
+ ],[
+- AC_DEFINE([HAVE_HMAC_CTX_INIT], 1,
+- [If you have HMAC_CTX_init])
++ AC_DEFINE([HAVE_HMAC_CTX_NEW], 1,
++ [If you have HMAC_CTX_new])
+ AC_MSG_RESULT(yes)
+ ],[
+ AC_MSG_RESULT(no)
diff -Nru dnssec-trigger-0.13~svn685/debian/patches/series dnssec-trigger-0.13~svn685/debian/patches/series
--- dnssec-trigger-0.13~svn685/debian/patches/series 2016-03-25 09:14:40.000000000 +1100
+++ dnssec-trigger-0.13~svn685/debian/patches/series 2016-11-06 23:47:00.000000000 +1100
@@ -4,3 +4,4 @@
strip-version-number-from-config.patch
fix-desktop-file-dirs.patch
dnssec-trigger-nm-1.1.90.patch
+openssl-finding.patch
