From 30161c2f55c93151d94acf5afc582b7923ed4d9c Mon Sep 17 00:00:00 2001 From: Teus Benschop Date: Wed, 26 Jun 2024 21:33:11 +0200 Subject: [PATCH] Embed MbedTLS temporarily https://github.com/bibledit/cloud/issues/944 --- tarball-client-sid.sh | 12 ++++++------ tarball-cloud.sh | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tarball-client-sid.sh b/tarball-client-sid.sh index 98ec556..349babf 100755 --- a/tarball-client-sid.sh +++ b/tarball-client-sid.sh @@ -49,17 +49,17 @@ echo Link with the system-provided mbed TLS library. # Fix for lintian error "embedded-library usr/bin/bibledit: mbedtls": # * Remove mbedtls from the list of sources to compile. # * Add -lmbedtls and friends to the linker flags. -sed -i.bak '/mbedtls\//d' Makefile.am -if [ $? -ne 0 ]; then exit; fi -sed -i.bak 's/# debian//g' Makefile.am -if [ $? -ne 0 ]; then exit; fi -rm *.bak +#sed -i.bak '/mbedtls\//d' Makefile.am +#if [ $? -ne 0 ]; then exit; fi +#sed -i.bak 's/# debian//g' Makefile.am +#if [ $? -ne 0 ]; then exit; fi +#rm *.bak # Also remove the embedded *.h files to be sure building does not reference them. # There had been a case that building used the embedded *.h files, # leading to segmentation faults. # For cleanness, remove the whole mbedtls directory, # so all traces of it are gone completely. -rm -rf mbedtls* +#rm -rf mbedtls* echo Link with the system-provided utf8proc library. diff --git a/tarball-cloud.sh b/tarball-cloud.sh index 1e8200c..af62bc5 100755 --- a/tarball-cloud.sh +++ b/tarball-cloud.sh @@ -154,15 +154,15 @@ echo Link with the system-provided mbed TLS library. # Fix for lintian error "embedded-library usr/bin/bibledit: mbedtls": # * Remove mbedtls from the list of sources to compile. # * Add -lmbedtls and friends to the linker flags. -sed -i.bak '/mbedtls\//d' Makefile.am -if [ $? -ne 0 ]; then exit; fi -sed -i.bak 's/# debian//g' Makefile.am -if [ $? -ne 0 ]; then exit; fi -rm *.bak +#sed -i.bak '/mbedtls\//d' Makefile.am +#if [ $? -ne 0 ]; then exit; fi +#sed -i.bak 's/# debian//g' Makefile.am +#if [ $? -ne 0 ]; then exit; fi +#rm *.bak # Also remove the embedded *.h files to be sure building does not reference them. # There had been a case that building used the embedded *.h files, leading to segmentation faults. # For cleanness, remove the whole mbedtls directory, so all traces of it are gone completely. -rm -rf mbedtls* +#rm -rf mbedtls* echo Link with the system-provided utf8proc library.