Mangle/hide GNUTLS-built nettle_rsa_compute_root_tr()

Since bfb326f6e ("nettle: plumb RSA-OAEP in the Nettle crypto backend"),
building gnutls statically fails due to a duplicate definition of
nettle_rsa_compute_root_tr (which comes from "rsa_compute_root_tr" being
replaced by a preprocessor macro).

This patch fixes this by renaming the GNUTLS version by redefining the
value of the rsa_compute_root_tr macro.

Signed-off-by: Alyssa Ross <hi@alyssa.is>

diff --git a/devel/import-from-nettle.sh b/devel/import-from-nettle.sh
index 38c3dfffb5ad139fc4f06c7c5432bf2bd628ac93..90a07200d619709f17311b8671d06073bd6c93e8 100755 (executable)
--- a/devel/import-from-nettle.sh
+++ b/devel/import-from-nettle.sh
@@ -108,6 +108,15 @@ for f in $IMPORTS; do
        sed \
          -e '/^#include <nettle\/nettle-types\.h>/a\
 #include "block8.h"
+' \
+         $dst > $dst-t && mv $dst-t $dst
+       ;;
+    esac
+    case $dst in
+      */rsa-sign-tr.c)
+       sed \
+         -e '/^#include <nettle\/rsa\.h>/i\
+#define nettle_rsa_compute_root_tr _gnutls_nettle_backport_rsa_compute_root_tr\
 ' \
          $dst > $dst-t && mv $dst-t $dst
        ;;