[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#859549: patch



Control: tags -1 + patch

The attached patch fixes the configure script to not check for a removed
symbol. Interestingly, the symbol hasn't really existed for a long, long
time, and its removal isn't even in the changelog; I had to read the
source. `CRYPTO_lock` was its name.

Chris.

commit 324c4c7e78be0e802093294ff24e5d0865fce733
Author: Chris West (Faux) <git@goeswhere.com>
Date:   Thu Jun 1 16:36:59 2017 +0000

    check for a symbol that actually exists

diff --git a/partimage-0.6.9/configure.ac b/partimage-0.6.9/configure.ac
index bb2ff61..267a140 100644
--- a/partimage-0.6.9/configure.ac
+++ b/partimage-0.6.9/configure.ac
@@ -240,7 +240,7 @@ if test "$SSL" = "yes"; then
   AC_CHECKING([ for SSL Library and Header files ... ])
   AC_SEARCH_HEADERS(rsa.h crypto.h x509.h pem.h ssl.h err.h,
     $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include,
-    [  AC_CHECK_LIB(crypto, CRYPTO_lock, [LIBS="$LIBS -lcrypto"],
+    [  AC_CHECK_LIB(crypto, CRYPTO_free, [LIBS="$LIBS -lcrypto"],
         AC_MSG_ERROR([ Required for SSL Crypto Library not found. ])
       )
        AC_CHECK_LIB(ssl, SSL_CTX_new,
diff --git a/partimage-0.6.9/debian/control b/partimage-0.6.9/debian/control
index 928fc98..441bb9b 100644
--- a/partimage-0.6.9/debian/control
+++ b/partimage-0.6.9/debian/control
@@ -4,13 +4,14 @@ Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: cdbs,
  debhelper (>= 8),
+ dh-autoreconf,
  autotools-dev,
  libbz2-dev,
  libnewt-dev,
  zlib1g-dev,
  comerr-dev,
  e2fslibs-dev (>= 1.25),
- libssl1.0-dev | libssl-dev (<< 1.1.0~),
+ libssl-dev,
  libpam0g-dev,
  gettext
 Standards-Version: 3.9.8
diff --git a/partimage-0.6.9/debian/rules b/partimage-0.6.9/debian/rules
index bc179ba..39852f6 100755
--- a/partimage-0.6.9/debian/rules
+++ b/partimage-0.6.9/debian/rules
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --with-log-dir=/var/log/partimage \
                              --with-debug-level=1 \

Reply to: