[med-svn] [Git][med-team/ncbi-vdb][master] 2 commits: There is another really tricky way to reference private mbedtls code copy which is fixed here

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / ncbi-vdb


Commits:
f3f816ec by Andreas Tille at 2020-03-04T21:03:52+01:00
There is another really tricky way to reference private mbedtls code copy which is fixed here

- - - - -
754a0452 by Andreas Tille at 2020-03-04T21:04:06+01:00
Fail in case some vdb_ prefixed code copy names exist in resulting code

- - - - -


4 changed files:

- + debian/patches/redefine_CALL_MBEDTLS.patch
- debian/patches/remove_remaining_vdb_mbedtls_invocations.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/patches/redefine_CALL_MBEDTLS.patch
=====================================
@@ -0,0 +1,15 @@
+Author: Andreas Tille
+Last-Update: 2020-03-04 20:15:10 +0100
+Description: There is another really tricky way to reference private mbedtls code copy which is fixed here
+
+--- a/libs/krypto/rsa-aes-hmac.c
++++ b/libs/krypto/rsa-aes-hmac.c
+@@ -137,7 +137,7 @@ rc_t handle_mbedtls_return ( const char
+ }
+ 
+ #define CALL_MBEDTLS( func_name, params ) \
+-    handle_mbedtls_return ( # func_name, vdb_ ## func_name params )
++    handle_mbedtls_return ( # func_name, func_name params )
+ 
+ typedef struct EncryptStuff EncryptStuff;
+ struct EncryptStuff


=====================================
debian/patches/remove_remaining_vdb_mbedtls_invocations.patch
=====================================
@@ -1,3 +1,7 @@
+Author: Steffen Moeller
+Last-Update: 2020-03-02 01:15:10 +0100
+Description: Avoid further invocation of private code copy of mbedtls
+
 Index: ncbi-vdb/libs/cloud/aws-auth.c
 ===================================================================
 --- ncbi-vdb.orig/libs/cloud/aws-auth.c


=====================================
debian/patches/series
=====================================
@@ -13,3 +13,4 @@ i386-uint64_msbit.patch
 # fix_linking.patch
 fix_path_mbedtls.patch
 remove_remaining_vdb_mbedtls_invocations.patch
+redefine_CALL_MBEDTLS.patch


=====================================
debian/rules
=====================================
@@ -47,6 +47,13 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	dh_auto_build --no-parallel
+	# we need to make really sure that no 'vdb_'-prefixed functions will remain ...
+	if find . \( -name "*.so" -o -name "*.a" \) -exec strings \{\} \; | tee | grep -q vdb_mbedtls ; then \
+	    find . \( -name "*.so" -o -name "*.a" \) -exec strings \{\} \; | tee | grep vdb_mbedtls ; \
+	    grep -Rl vdb_mbedtls  debian/tmp/* ; \
+	    exit 1 ; \
+	    false ; \
+	fi
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))



View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/-/compare/97fcb6f3dedf73de2bf91d17be44b20b5fcd43f5...754a045224fb00738ac3d6ecc7a1c7c9732e9686

-- 
View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/-/compare/97fcb6f3dedf73de2bf91d17be44b20b5fcd43f5...754a045224fb00738ac3d6ecc7a1c7c9732e9686
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200304/6f06b7a1/attachment-0001.html>