Am 11.05.20 um 09:05 schrieb Rhonda D'Vine:
> Without libssl-dev installed in
> the building chroot this fails for me. Can you revisit this, and check
> where you might have missed something?
Try this new patch version. It is tested to compile without libssl-dev
installed.
>From 5a04599fa6d10e34df6695bb21adb352f8a1dd7d Mon Sep 17 00:00:00 2001
From: Bastian Germann <bastiangerm...@fishpost.de>
Date: Sun, 1 Mar 2020 11:19:53 +0100
Subject: [PATCH] Replace OpenSSL with wolfSSL
---
debian/control | 2 +-
debian/control.in | 2 +-
debian/patches/01wolfssl-crypto | 16 ++++++++++++++++
debian/patches/04omit-ssleay | 20 ++++++++++++++++++++
debian/patches/series | 2 ++
debian/rules | 2 +-
6 files changed, 41 insertions(+), 3 deletions(-)
create mode 100644 debian/patches/01wolfssl-crypto
create mode 100644 debian/patches/04omit-ssleay
diff --git a/debian/control b/debian/control
index 5e35ef9..1d650a0 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 11~), libsdl2-image-dev (>= 2.0.0),
libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
libboost-serialization-dev, libboost-system-dev, libboost-thread-dev,
libboost-program-options-dev, libboost-filesystem-dev, libboost-locale-dev,
- libboost-random-dev, libpng-dev, libreadline-dev, libssl-dev,
+ libboost-random-dev, libpng-dev, libreadline-dev, libwolfssl-dev,
libpango1.0-dev, libvorbis-dev, cmake (>= 2.6)
Standards-Version: 4.1.4
Uploaders: Rhonda D'Vine <rho...@debian.org>,
diff --git a/debian/control.in b/debian/control.in
index f97ece5..b57f2df 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 11~), libsdl2-image-dev (>= 2.0.0),
libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
libboost-serialization-dev, libboost-system-dev, libboost-thread-dev,
libboost-program-options-dev, libboost-filesystem-dev, libboost-locale-dev,
- libboost-random-dev, libpng-dev, libreadline-dev, libssl-dev,
+ libboost-random-dev, libpng-dev, libreadline-dev, libwolfssl-dev,
libpango1.0-dev, libvorbis-dev, cmake (>= 2.6)
Standards-Version: 4.1.4
Uploaders: Rhonda D'Vine <rho...@debian.org>,
diff --git a/debian/patches/01wolfssl-crypto b/debian/patches/01wolfssl-crypto
new file mode 100644
index 0000000..4b3fa74
--- /dev/null
+++ b/debian/patches/01wolfssl-crypto
@@ -0,0 +1,16 @@
+Author: Bastian Germann vim:ft=diff:
+Description: Link with wolfssl instead of libcrypto.
+
+--- a/cmake/FindCrypto.cmake
++++ b/cmake/FindCrypto.cmake
+@@ -1,8 +1,8 @@
+ # OpenSSL crypto library
+
+-find_path(CRYPTO_INCLUDE_DIR openssl/md5.h)
++find_path(CRYPTO_INCLUDE_DIR openssl/md5.h /usr/include/wolfssl)
+
+-find_library(CRYPTO_LIBRARY crypto)
++find_library(CRYPTO_LIBRARY wolfssl)
+
+ # handle the QUIETLY and REQUIRED arguments and set XXX_FOUND to TRUE if all listed variables are TRUE
+ INCLUDE(FindPackageHandleStandardArgs)
diff --git a/debian/patches/04omit-ssleay b/debian/patches/04omit-ssleay
new file mode 100644
index 0000000..213a253
--- /dev/null
+++ b/debian/patches/04omit-ssleay
@@ -0,0 +1,20 @@
+Author: Bastian Germann vim:ft=diff:
+Description: Omit SSLeay call which has linking problems.
+
+diff --git a/src/build_info.cpp b/src/build_info.cpp
+index 263841e..ef61201 100644
+--- a/src/build_info.cpp
++++ b/src/build_info.cpp
+@@ -239,12 +239,6 @@ version_table_manager::version_table_manager()
+ // OpenSSL/libcrypto
+ //
+
+-#ifndef __APPLE__
+- compiled[LIB_CRYPTO] = format_openssl_version(OPENSSL_VERSION_NUMBER);
+- linked[LIB_CRYPTO] = format_openssl_version(SSLeay());
+- names[LIB_CRYPTO] = "OpenSSL/libcrypto";
+-#endif
+-
+ //
+ // Cairo
+ //
diff --git a/debian/patches/series b/debian/patches/series
index 57b6465..f08ba3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
+01wolfssl-crypto
02wesnoth-nolog-desktop-file
03wesnothd-name
+04omit-ssleay
diff --git a/debian/rules b/debian/rules
index 02ad407..cbec12c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
CXXFLAGSDBG = -g1
endif
-export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) -I/usr/include/wolfssl -DOPENSSL_ALL
export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -std=c++11 -fopenmp
export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) -std=c++11 -fopenmp $(CXXFLAGSDBG)
export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
--
2.26.2
