import-chacha: fix several additional symbol clashes

Fix sed script used to rename symbols to remove few additional symbols
sitting in _nettle_FOO namespace.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>

diff --git a/devel/import-chacha-from-nettle.sh b/devel/import-chacha-from-nettle.sh
index c79f8b8c327d7313215caca9e5a83ac4d76a01c1..bd570b8b2536375a2bf6497527cd249066db09b0 100755 (executable)
--- a/devel/import-chacha-from-nettle.sh
+++ b/devel/import-chacha-from-nettle.sh
@@ -72,7 +72,9 @@ for f in $IMPORTS; do
       *.h)
        # Add prefix to function symbols avoid clashing with the public ones.
        sed -e 's/^#define \(.*\) nettle_\1/#define \1 gnutls_nettle_chacha_\1/' \
-           -e 's/^#define \(.*\) _nettle_\1/#define \1 _gnutls_nettle_chacha_\1/' $dst > $dst-t && \
+           -e 's/^#define _\(.*\) _nettle_\1/#define _\1 _gnutls_nettle_chacha_\1/' \
+           -e 's/^#define \(.*\) _nettle_\1/#define \1 _gnutls_nettle_chacha_\1/' \
+           $dst > $dst-t && \
          mv $dst-t $dst
       ;;
     esac