vpn, exit: Add patch from termux for Android in a slightly different way.

Arguable 1st one could just be || and second one be kept as-is.
https://github.com/termux/termux-packages/blob/master/packages/gnunet/no-in6_ifreq-redef.patch

diff --git a/src/exit/gnunet-helper-exit.c b/src/exit/gnunet-helper-exit.c
index d46032662121820eb9887cf4753e9e46fb5eedda..4a6c66debf39565ad7ed574daa1a02f4ef80d5ee 100644 (file)
--- a/src/exit/gnunet-helper-exit.c
+++ b/src/exit/gnunet-helper-exit.c
@@ -85,6 +85,7 @@ static const char *sbin_sysctl;
 static const char *sbin_iptables;
 
 
+#if ! defined(__ANDROID__)
 #if ! defined(_LINUX_IN6_H) && defined(__linux__)
 /**
  * This is in linux/include/net/ipv6.h, but not always exported.
@@ -96,6 +97,7 @@ struct in6_ifreq
   int ifr6_ifindex;
 };
 #endif
+#endif
 
 
 /**

diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c
index 4e35fa2c332d4cf7167e956c240fb45b9ea6a9de..c693d24eabd83628e4229c64cfe6a492fcee571a 100644 (file)
--- a/src/vpn/gnunet-helper-vpn.c
+++ b/src/vpn/gnunet-helper-vpn.c
@@ -59,6 +59,7 @@
  */
 #define MAX_SIZE 65536
 
+#if ! defined(__ANDROID__)
 #ifndef _LINUX_IN6_H
 /**
  * This is in linux/include/net/ipv6.h, but not always exported...
@@ -70,6 +71,7 @@ struct in6_ifreq
   unsigned int ifr6_ifindex;
 };
 #endif
+#endif
 
 
 /**