iodine: Bump to 0.8.0

root-packages/iodine/000-fix-name-clashes.patch

@@ -23,75 +23,11 @@ diff -uNr iodine-0.7.0/src/iodined.c iodine-0.7.0.mod/src/iodined.c
 --- iodine-0.7.0/src/iodined.c	2014-06-16 23:28:43.000000000 +0300
 +++ iodine-0.7.0.mod/src/iodined.c	2019-01-20 16:37:23.255524447 +0200
 @@ -92,7 +92,7 @@
+ static int bind_port;
  static int debug;
  
- #if !defined(BSD) && !defined(__GLIBC__)
--static char *__progname;
-+static char *___progname;
- #endif
- 
- static int read_dns(int, int, struct query *);
-@@ -2199,25 +2199,25 @@
- 
- static void
- usage() {
--	extern char *__progname;
-+	extern char *___progname;
- 
- 	fprintf(stderr, "Usage: %s [-v] [-h] [-c] [-s] [-f] [-D] [-u user] "
- 		"[-t chrootdir] [-d device] [-m mtu] [-z context] "
- 		"[-l ip address to listen on] [-p port] [-n external ip] "
- 		"[-b dnsport] [-P password] [-F pidfile] [-i max idle time] "
--		"tunnel_ip[/netmask] topdomain\n", __progname);
-+		"tunnel_ip[/netmask] topdomain\n", ___progname);
- 	exit(2);
- }
- 
- static void
- help() {
--	extern char *__progname;
-+	extern char *___progname;
- 
- 	fprintf(stderr, "iodine IP over DNS tunneling server\n");
- 	fprintf(stderr, "Usage: %s [-v] [-h] [-c] [-s] [-f] [-D] [-u user] "
- 		"[-t chrootdir] [-d device] [-m mtu] [-z context] "
- 		"[-l ip address to listen on] [-p port] [-n external ip] [-b dnsport] [-P password] "
--		"[-F pidfile] tunnel_ip[/netmask] topdomain\n", __progname);
-+		"[-F pidfile] tunnel_ip[/netmask] topdomain\n", ___progname);
- 	fprintf(stderr, "  -v to print version info and exit\n");
- 	fprintf(stderr, "  -h to print this help and exit\n");
- 	fprintf(stderr, "  -c to disable check of client IP/port on each request\n");
-@@ -2255,7 +2255,7 @@
- int
- main(int argc, char **argv)
- {
--	extern char *__progname;
-+	extern char *___progname;
- 	char *listen_ip;
- 	char *errormsg;
- #ifndef WINDOWS32
-@@ -2324,11 +2324,11 @@
- #endif
- 
- #if !defined(BSD) && !defined(__GLIBC__)
--	__progname = strrchr(argv[0], '/');
--	if (__progname == NULL)
--		__progname = argv[0];
-+	___progname = strrchr(argv[0], '/');
-+	if (___progname == NULL)
-+		___progname = argv[0];
- 	else
--		__progname++;
-+		___progname++;
- #endif
- 
- 	memset(password, 0, sizeof(password));
-@@ -2573,7 +2573,7 @@
- 	tzsetwall();
- #endif
- #ifndef WINDOWS32
--	openlog( __progname, LOG_NDELAY, LOG_DAEMON );
-+	openlog( ___progname, LOG_NDELAY, LOG_DAEMON );
- #endif
- 
- 	if (newroot != NULL)
+-#if !defined(BSD) && !defined(__GLIBC__)
++#if !defined(BSD) && !defined(__GLIBC__) && !defined(__ANDROID__)
+ static char *__progname;
+ #else
+ extern char *__progname;

root-packages/iodine/001-cflags-ldflags.patch

@@ -1,14 +0,0 @@
-diff -uNr iodine-0.7.0/src/Makefile iodine-0.7.0.mod/src/Makefile
---- iodine-0.7.0/src/Makefile	2014-06-16 23:28:43.000000000 +0300
-+++ iodine-0.7.0.mod/src/Makefile	2019-01-20 16:37:52.923519072 +0200
-@@ -8,8 +8,8 @@
- ARCH = `uname -m`
- 
- LIBPATH = -L.
--LDFLAGS +=  -lz `sh osflags $(TARGETOS) link` $(LIBPATH)
--CFLAGS += -std=c99 -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
-+LDFLAGS +=  -lz -llog `sh osflags $(TARGETOS) link` $(LIBPATH)
-+CFLAGS += -DANDROID -std=c99 -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags` -I@TERMUX_PREFIX@/include
- 
- all: stateos $(CLIENT) $(SERVER)
- 

root-packages/iodine/003-no-systemd-selinux.patch

@@ -1,21 +1,23 @@
 diff -uNr iodine-0.7.0/src/osflags iodine-0.7.0.mod/src/osflags
 --- iodine-0.7.0/src/osflags	2014-06-16 23:28:43.000000000 +0300
 +++ iodine-0.7.0.mod/src/osflags	2019-05-02 14:52:08.768570062 +0300
-@@ -18,8 +18,6 @@
+@@ -20,9 +20,6 @@
  		;;
  		Linux)
  			FLAGS="";
 -			[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux";
--			[ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -lsystemd-daemon";
+-			"$PKG_CONFIG" --exists libsystemd-daemon && FLAGS="$FLAGS $($PKG_CONFIG --libs libsystemd-daemon)";
+-			"$PKG_CONFIG" --exists libsystemd && FLAGS="$FLAGS $($PKG_CONFIG --libs libsystemd)";
  			echo $FLAGS;
  		;;
  	esac
-@@ -34,8 +32,6 @@
+@@ -40,9 +37,6 @@
  		;;
  		Linux)
  			FLAGS="-D_GNU_SOURCE"
 -			[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -DHAVE_SETCON";
--			[ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -DHAVE_SYSTEMD";
+-			"$PKG_CONFIG" --exists libsystemd-daemon && FLAGS="$FLAGS -DHAVE_SYSTEMD";
+-			"$PKG_CONFIG" --exists libsystemd && FLAGS="$FLAGS -DHAVE_SYSTEMD";
  			echo $FLAGS;
  		;;
- 	esac
+ 		GNU/kFreeBSD|GNU)

root-packages/iodine/LICENSE.patch

@@ -1,21 +0,0 @@
---- /dev/null	2020-08-12 08:36:38.994597860 +0200
-+++ ./LICENSE	2020-08-12 21:37:55.799137487 +0200
-@@ -0,0 +1,18 @@
-+Copyright (c) 2006-2014 Erik Ekman <yarrick@kryo.se>, 2006-2009 Bjorn
-+Andersson <flex@kryo.se>. Also major contributions by Anne Bezemer.
-+
-+Permission to use, copy, modify, and distribute this software for any purpose
-+with or without fee is hereby granted, provided that the above copyright notice
-+and this permission notice appear in all copies.
-+
-+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+PERFORMANCE OF THIS SOFTWARE.
-+
-+
-+MD5 implementation by L. Peter Deutsch (license and source in src/md5.[ch])
-+Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.

root-packages/iodine/build.sh

@@ -2,10 +2,15 @@ TERMUX_PKG_HOMEPAGE=http://code.kryo.se/iodine
 TERMUX_PKG_DESCRIPTION="Tunnel IPv4 data through a DNS server"
 TERMUX_PKG_LICENSE="ISC"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.7.0
-TERMUX_PKG_REVISION=10
-TERMUX_PKG_SRCURL=http://code.kryo.se/iodine/iodine-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=ad2b40acf1421316ec15800dcde0f587ab31d7d6f891fa8b9967c4ded93c013e
+TERMUX_PKG_VERSION=0.8.0
+TERMUX_PKG_SRCURL=https://code.kryo.se/iodine/iodine-$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=546e92cf8617f7970ea81c850b1063eb189c68c406d0c6a67e02c55e72e714c6
 TERMUX_PKG_DEPENDS="net-tools, zlib"
 TERMUX_PKG_EXTRA_MAKE_ARGS="prefix=$TERMUX_PREFIX"
 TERMUX_PKG_BUILD_IN_SRC=true
+
+termux_step_pre_configure() {
+	CPPFLAGS+=" -DANDROID"
+	CFLAGS+=" $CPPFLAGS"
+	LDFLAGS+=" -lz"
+}