From 13ae6f4efd680d5ea4ca5f19b86c2fd036df58c6 Mon Sep 17 00:00:00 2001 From: Paul Fariello Date: Fri, 12 Apr 2019 20:16:03 +0320 Subject: [PATCH 1/5] Add manual build of libsignal in travis --- .travis.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 533ea98c..4e270882 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ install: - lsb_release -a - uname -a - sudo apt-get update - - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libgpgme11-dev autoconf-archive expect-dev tcl-dev libtool python-dev libgtk2.0-dev libgcrypt20-dev libsignal-protocol-c-dev + - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libgpgme11-dev autoconf-archive expect-dev tcl-dev libtool python-dev libgtk2.0-dev libgcrypt20-dev - git clone git://github.com/boothj5/libmesode.git - cd libmesode - mkdir m4 @@ -34,4 +34,14 @@ install: - sudo make install - cd .. - rm -rf stabber + - git clone https://github.com/signalapp/libsignal-protocol-c.git + - cd libsignal-protocol-c + - git checkout v2.3.2 + - mkdir build + - cd build + - cmake -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ../ + - make + - sudo make install + - cd ../../ + - rm -rf libsignal-protocol-c script: ./travis-build.sh From 28334d29556a2a549d5aa9748549d01974ad3b3d Mon Sep 17 00:00:00 2001 From: Paul Fariello Date: Fri, 12 Apr 2019 22:02:50 +0200 Subject: [PATCH 2/5] Build with libcmocka from packages --- .travis.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e270882..35b7e69b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ install: - lsb_release -a - uname -a - sudo apt-get update - - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libgpgme11-dev autoconf-archive expect-dev tcl-dev libtool python-dev libgtk2.0-dev libgcrypt20-dev + - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libgpgme11-dev autoconf-archive expect-dev tcl-dev libtool python-dev libgtk2.0-dev libgcrypt20-dev libcmocka-dev - git clone git://github.com/boothj5/libmesode.git - cd libmesode - mkdir m4 @@ -15,16 +15,6 @@ install: - sudo make install - cd .. - rm -rf libmesode - - wget https://cmocka.org/files/1.0/cmocka-1.0.0.tar.xz - - tar -xvf cmocka-1.0.0.tar.xz - - cd cmocka-1.0.0 - - mkdir build - - cd build - - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug .. - - make - - sudo make install - - cd ../.. - - rm -rf cmocka-1.0.0 - sudo apt-get install libmicrohttpd-dev - git clone git://github.com/boothj5/stabber.git - cd stabber From 991153d8bd01680bdeedcb5590b1470a4662a0f1 Mon Sep 17 00:00:00 2001 From: Paul Fariello Date: Sat, 13 Apr 2019 00:27:10 +0200 Subject: [PATCH 3/5] test --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 35b7e69b..b843d933 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,4 +34,5 @@ install: - sudo make install - cd ../../ - rm -rf libsignal-protocol-c + - cat /usr/include/gcrypt.h script: ./travis-build.sh From c00ab0351d72b23394435782fcd04da81bf0b8e1 Mon Sep 17 00:00:00 2001 From: Paul Fariello Date: Fri, 12 Apr 2019 22:30:39 +0200 Subject: [PATCH 4/5] Look for gcry_md_extract (libgcrypt >= 1.7.0) --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 06daa8d9..097e13f7 100644 --- a/configure.ac +++ b/configure.ac @@ -280,7 +280,7 @@ if test "x$enable_omemo" != xno; then [AC_MSG_ERROR([libsignal-protocol-c is required for OMEMO support])], [AC_MSG_NOTICE([libsignal-protocol-c not found, OMEMO support not enabled])])])]) - AC_CHECK_LIB([gcrypt], [gcry_check_version], + AC_CHECK_LIB([gcrypt], [gcry_md_extract], [LIBS="-lgcrypt $LIBS"], [AM_CONDITIONAL([BUILD_OMEMO], [false]) AS_IF([test "x$enable_omemo" = xyes], From b2dfdc7509416b7c1e8a753347753d04c4daff03 Mon Sep 17 00:00:00 2001 From: Paul Fariello Date: Sat, 13 Apr 2019 00:41:24 +0200 Subject: [PATCH 5/5] Add libgcrypt minimum version in configure error log --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 097e13f7..4f6a6790 100644 --- a/configure.ac +++ b/configure.ac @@ -284,8 +284,8 @@ if test "x$enable_omemo" != xno; then [LIBS="-lgcrypt $LIBS"], [AM_CONDITIONAL([BUILD_OMEMO], [false]) AS_IF([test "x$enable_omemo" = xyes], - [AC_MSG_ERROR([gcrypt is required for OMEMO support])], - [AC_MSG_NOTICE([gcrypt not found, OMEMO support not enabled])])]) + [AC_MSG_ERROR([gcrypt >= 1.7.0 is required for OMEMO support])], + [AC_MSG_NOTICE([gcrypt >= 1.7.0 not found, OMEMO support not enabled])])]) AM_COND_IF([BUILD_OMEMO], [AC_DEFINE([HAVE_OMEMO], [1], [Have OMEMO])]) fi