From 607b9d3be12341d4b0a8e25990e2b4a6240346ae Mon Sep 17 00:00:00 2001 From: Erik Ekman Date: Mon, 17 Apr 2023 09:42:48 +0200 Subject: [PATCH] Tag 0.8.0 release --- CHANGELOG | 4 ++-- man/iodine.8 | 2 +- src/Android.16.mk | 4 +--- src/Android.mk | 4 +--- src/Makefile | 3 +-- src/iodine.c | 2 +- src/iodined.c | 2 +- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5e15751..c9b5542 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,7 +5,7 @@ iodine - https://code.kryo.se/iodine CHANGES: -master: +2023-04-17: 0.8.0 "Burning Snowman" - Mac OS X: Support native utun VPN devices. Patch by Peter Sagerson, ported from OpenVPN by Catalin Patulea. - Fix compilation failure on kFreeBSD and Hurd, by Gregor Herrmann @@ -16,7 +16,7 @@ master: - Add support for IPv6 in the server. Raw mode will be with same protocol as used for login. Traffic inside tunnel is still IPv4. - - Update android build to support 5.0 (Lollipop) and newer. + - Update android build to try to support 5.0 (Lollipop) and newer. - Change external IP lookup to using myip.opendns.com via DNS. - Add option to choose IPv4 listen address from external IP lookup. - Add server support for handling multiple domains via wildcard. diff --git a/man/iodine.8 b/man/iodine.8 index 9b0cb81..b724b3a 100644 --- a/man/iodine.8 +++ b/man/iodine.8 @@ -1,5 +1,5 @@ .\" groff -man -Tascii iodine.8 -.TH IODINE 8 "APR 2012" "User Manuals" +.TH IODINE 8 "APR 2023" "User Manuals" .SH NAME iodine, iodined \- tunnel IPv4 over DNS .SH SYNOPSIS diff --git a/src/Android.16.mk b/src/Android.16.mk index d1c686b..e2f97b8 100644 --- a/src/Android.16.mk +++ b/src/Android.16.mk @@ -11,13 +11,11 @@ LOCAL_PATH:= $(call my-dir) -HEAD_COMMIT = `git rev-parse --short HEAD` - include $(CLEAR_VARS) LOCAL_MODULE := iodine LOCAL_SRC_FILES := tun.c dns.c read.c encoding.c login.c base32.c base64.c base64u.c base128.c md5.c common.c iodine.c client.c util.c -LOCAL_CFLAGS := -c -DANDROID -DLINUX -DIFCONFIGPATH=\"/system/bin/\" -Wall -DGITREVISION=\"$(HEAD_COMMIT)\" +LOCAL_CFLAGS := -c -DANDROID -DLINUX -DIFCONFIGPATH=\"/system/bin/\" -Wall LOCAL_LDLIBS := -lz LOCAL_CFLAGS += -fPIE LOCAL_LDFLAGS += -fPIE -pie diff --git a/src/Android.mk b/src/Android.mk index 81136e5..8f7c729 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -11,13 +11,11 @@ LOCAL_PATH:= $(call my-dir) -HEAD_COMMIT = `git rev-parse --short HEAD` - include $(CLEAR_VARS) LOCAL_MODULE := iodine LOCAL_SRC_FILES := tun.c dns.c read.c encoding.c login.c base32.c base64.c base64u.c base128.c md5.c common.c iodine.c client.c util.c -LOCAL_CFLAGS := -c -DANDROID -DLINUX -DIFCONFIGPATH=\"/system/bin/\" -Wall -DGITREVISION=\"$(HEAD_COMMIT)\" +LOCAL_CFLAGS := -c -DANDROID -DLINUX -DIFCONFIGPATH=\"/system/bin/\" -Wall LOCAL_LDLIBS := -lz include $(BUILD_EXECUTABLE) diff --git a/src/Makefile b/src/Makefile index c3f8c28..3c4f7f9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,11 +6,10 @@ SERVER = ../bin/iodined OS = `echo $(TARGETOS) | tr "a-z" "A-Z"` ARCH = `uname -m` -HEAD_COMMIT = `git rev-parse --short HEAD` LIBPATH = -L. LDFLAGS += -lz `sh osflags $(TARGETOS) link` $(LIBPATH) -CFLAGS += -std=c99 -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags` -DGITREVISION=\"$(HEAD_COMMIT)\" +CFLAGS += -std=c99 -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags` CFLAGS += -Wstrict-prototypes -Wtype-limits -Wmissing-declarations -Wmissing-prototypes all: stateos $(CLIENT) $(SERVER) diff --git a/src/iodine.c b/src/iodine.c index fbb6481..357bbee 100644 --- a/src/iodine.c +++ b/src/iodine.c @@ -116,7 +116,7 @@ static inline void usage(void) static void version(void) { fprintf(stderr, "iodine IP over DNS tunneling client\n" - "Git version: %s\n", GITREVISION); + "version 0.8.0 from 2023-04-17\n"); exit(0); } diff --git a/src/iodined.c b/src/iodined.c index f955516..e683d0f 100644 --- a/src/iodined.c +++ b/src/iodined.c @@ -2332,7 +2332,7 @@ static void version(void) { fprintf(stderr, "iodine IP over DNS tunneling server\n" - "Git version: %s\n", GITREVISION); + "version 0.8.0 from 2023-04-17\n"); exit(0); }