From 392b8e2be7f64e99d9cb7131d4020daca07b9a1a Mon Sep 17 00:00:00 2001
From: Erik Ekman <erik@kryo.se>
Date: Mon, 16 Jun 2014 21:44:43 +0200
Subject: [PATCH] Release version 0.7.0

---
 CHANGELOG      | 2 +-
 man/iodine.8   | 2 +-
 src/Android.mk | 4 +---
 src/Makefile   | 3 +--
 src/iodine.c   | 2 +-
 src/iodined.c  | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9f3f967..93430d9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,7 @@ iodine - http://code.kryo.se/iodine
 
 CHANGES:
 
-master:
+2014-06-16: 0.7.0 "Kryoptonite"
 	- Partial IPv6 support (#107)
 	   Client can connect to iodined through an relaying IPv6
 	   nameserver. Server only supports IPv4 for now.
diff --git a/man/iodine.8 b/man/iodine.8
index feb8283..1d1e333 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 "JUN 2014" "User Manuals"
 .SH NAME
 iodine, iodined \- tunnel IPv4 over DNS
 .SH SYNOPSIS
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 04cef2e..80bd345 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`
 
 all: stateos $(CLIENT) $(SERVER)
 
diff --git a/src/iodine.c b/src/iodine.c
index 75e9e50..5c19576 100644
--- a/src/iodine.c
+++ b/src/iodine.c
@@ -111,7 +111,7 @@ static void
 version() {
 
 	fprintf(stderr, "iodine IP over DNS tunneling client\n");
-	fprintf(stderr, "Git version: %s\n", GITREVISION);
+	fprintf(stderr, "version: 0.7.0 from 2014-06-16\n");
 
 	exit(0);
 }
diff --git a/src/iodined.c b/src/iodined.c
index cdfc920..1065c33 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -2248,7 +2248,7 @@ help() {
 static void
 version() {
 	fprintf(stderr, "iodine IP over DNS tunneling server\n");
-	fprintf(stderr, "Git version: %s\n", GITREVISION);
+	fprintf(stderr, "version: 0.7.0 from 2014-06-16\n");
 	exit(0);
 }