From 6828ea2d1ff12be274c0820155d3112f2ff2bd1c Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Tue, 23 Oct 2018 07:45:14 -0400
Subject: [PATCH] add more stuff from builder repo

---
 CMakeLists.txt                                |  47 +++--
 android/.gitignore                            |  18 ++
 android/AndroidManifest.xml                   |  59 ++++++
 android/build.gradle                          |  75 ++++++++
 android/build.xml                             |  96 +++++++++
 android/proguard-project.txt                  |  20 ++
 android/project.properties                    |  14 ++
 android/res/drawable/icon.png                 | Bin 0 -> 6565 bytes
 android/res/layout/activity_perms_asker.xml   |  27 +++
 .../res/layout/activity_perms_explanation.xml |  27 +++
 android/res/menu/options_main.xml             |  11 ++
 android/res/values/strings.xml                |  14 ++
 android/res/values/template-dimens.xml        |  16 ++
 android/settings.gradle                       |   1 +
 .../network/loki/lokinet/LokiNetActivity.java | 182 ++++++++++++++++++
 .../src/network/loki/lokinet/Lokinet_JNI.java |  31 +++
 .../lokinet/NetworkStateChangeReceiver.java   |  30 +++
 .../loki/lokinet/PermsAskerActivity.java      | 171 ++++++++++++++++
 .../lokinet/PermsExplanationActivity.java     |  38 ++++
 debian/changelog                              |  58 ++++++
 debian/compat                                 |   1 +
 debian/control                                |  19 ++
 debian/copyright                              |  27 +++
 debian/lokinet.1                              |  35 ++++
 debian/lokinet.install                        |   3 +
 debian/lokinet.manpages                       |   1 +
 debian/lokinet.service                        |  14 ++
 debian/postinst                               |   3 +
 debian/rules                                  |  21 ++
 debian/source/format                          |   1 +
 30 files changed, 1044 insertions(+), 16 deletions(-)
 create mode 100644 android/.gitignore
 create mode 100755 android/AndroidManifest.xml
 create mode 100644 android/build.gradle
 create mode 100644 android/build.xml
 create mode 100644 android/proguard-project.txt
 create mode 100644 android/project.properties
 create mode 100644 android/res/drawable/icon.png
 create mode 100644 android/res/layout/activity_perms_asker.xml
 create mode 100644 android/res/layout/activity_perms_explanation.xml
 create mode 100644 android/res/menu/options_main.xml
 create mode 100755 android/res/values/strings.xml
 create mode 100644 android/res/values/template-dimens.xml
 create mode 100644 android/settings.gradle
 create mode 100755 android/src/network/loki/lokinet/LokiNetActivity.java
 create mode 100644 android/src/network/loki/lokinet/Lokinet_JNI.java
 create mode 100644 android/src/network/loki/lokinet/NetworkStateChangeReceiver.java
 create mode 100644 android/src/network/loki/lokinet/PermsAskerActivity.java
 create mode 100644 android/src/network/loki/lokinet/PermsExplanationActivity.java
 create mode 100644 debian/changelog
 create mode 100644 debian/compat
 create mode 100644 debian/control
 create mode 100644 debian/copyright
 create mode 100644 debian/lokinet.1
 create mode 100644 debian/lokinet.install
 create mode 100644 debian/lokinet.manpages
 create mode 100644 debian/lokinet.service
 create mode 100644 debian/postinst
 create mode 100755 debian/rules
 create mode 100644 debian/source/format

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c0b15fff..4104a85d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,6 +134,9 @@ set(LIBS ${THREAD_LIB} ${MALLOC_LIB} ${FS_LIB})
 set(LIB lokinet)
 set(SHARED_LIB ${LIB})
 set(STATIC_LIB ${LIB}-static)
+set(CRYPTOGRAPHY_LIB ${LIB}-cryptography)
+set(PLATFORM_LIB ${LIB}-platform)
+set(ANDROID_LIB ${LIB}android)
 
 set(TT_ROOT vendor/libtuntap-master)
 
@@ -192,6 +195,26 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(ISOLATE_PROC_SRC llarp/linux/netns.cpp)
 endif()
 
+
+set(CXX_COMPAT_SRC
+  vendor/cppbackport-master/lib/fs/rename.cpp
+  vendor/cppbackport-master/lib/fs/filestatus.cpp
+  vendor/cppbackport-master/lib/fs/filetype.cpp
+  vendor/cppbackport-master/lib/fs/cleanpath.cpp
+  vendor/cppbackport-master/lib/fs/perms.cpp
+  vendor/cppbackport-master/lib/fs/equivalent.cpp
+  vendor/cppbackport-master/lib/fs/current_path.cpp
+  vendor/cppbackport-master/lib/fs/basename.cpp
+  vendor/cppbackport-master/lib/fs/tempdir.cpp
+  vendor/cppbackport-master/lib/fs/create_directory.cpp
+  vendor/cppbackport-master/lib/fs/path.cpp
+  vendor/cppbackport-master/lib/fs/remove.cpp
+  vendor/cppbackport-master/lib/fs/diriter.cpp
+  vendor/cppbackport-master/lib/fs/copyfile.cpp
+  vendor/cppbackport-master/lib/fs/absolute.cpp
+  vendor/cppbackport-master/lib/fs/direntry.cpp
+)
+
 set(LIB_PLATFORM_SRC
 # string stuff
   llarp/str.cpp
@@ -218,6 +241,8 @@ set(LIB_PLATFORM_SRC
 # win32 inline code
   llarp/win32_inet.c
   llarp/win32_intrnl.c
+# c++17 compat code
+  ${CXX_COMPAT_SRC}
 )
 
 set(NTRU_AVX_SRC
@@ -331,9 +356,10 @@ set(CRYPTOGRAPHY_SRC
   ${CHACHA_SRC}
   ${ED25519_SRC}
   ${X25519_SRC}
-  ${SHA512_SRC})
-
+  ${SHA512_SRC}
+  ${NTRU_SRC})
 
+add_library(${CRYPTOGRAPHY_LIB} ${CRYPTOGRAPHY_SRC})
 
 
 set(UTP_SRC
@@ -352,8 +378,6 @@ endif()
 
 set(LIB_SRC
   ${UTP_SRC}
-  ${NTRU_SRC}
-  ${CRYPTOGRAPHY_SRC}
   llarp/address_info.cpp
   llarp/bencode.cpp
   llarp/buffer.cpp
@@ -458,18 +482,9 @@ foreach(F ${ALL_SRC})
 set_source_files_properties(${F} PROPERTIES COMPILE_FLAGS -DLOG_TAG=\\\"${F}\\\")
 endforeach(F)
 
-set(LIB lokinet)
-set(SHARED_LIB ${LIB})
-set(STATIC_LIB ${LIB}-static)
-set(PLATFORM_LIB ${LIB}-platform)
-set(ANDROID_LIB ${LIB}android)
-
 # TODO: exclude this from includes and expose stuff properly for rcutil
 include_directories(llarp)
 include_directories(include)
-# Neuro Linux box hack:
-include_directories(/usr/local/include)
-include_directories(${sodium_INCLUDE_DIR})
 
 set(RC_EXE rcutil)
 set(DNS_EXE dns)
@@ -489,7 +504,7 @@ set(ABYSS_SRC
 add_library(${ABYSS_LIB} ${ABYSS_SRC})
 
 if(SHADOW)
-add_shadow_plugin(shadow-plugin-${SHARED_LIB} ${EXE_SRC} ${LIB_SRC} ${LIB_PLATFORM_SRC} ${CPP_BACKPORT_SRC} ${ABYSS_SRC})
+add_shadow_plugin(shadow-plugin-${SHARED_LIB} ${EXE_SRC} ${LIB_SRC} ${LIB_PLATFORM_SRC} ${CPP_BACKPORT_SRC} ${ABYSS_SRC} ${CRYPTOGRAPHY_SRC})
 target_link_libraries(shadow-plugin-${SHARED_LIB} ${LIBS})
 install(TARGETS shadow-plugin-${SHARED_LIB} DESTINATION plugins)
 else()
@@ -510,7 +525,7 @@ if(WITH_STATIC)
     if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
       target_link_libraries(${PLATFORM_LIB} -lcap)
     endif()
-    target_link_libraries(${STATIC_LIB} ${LIBS} ${PLATFORM_LIB})
+    target_link_libraries(${STATIC_LIB} ${CRYPTOGRAPHY_LIB} ${LIBS} ${PLATFORM_LIB})
     if(NOT WITH_SHARED)
 
       target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${PLATFORM_LIB})
@@ -535,7 +550,7 @@ if(WITH_STATIC)
   endif()
 
   if(WITH_SHARED)
-    add_library(${SHARED_LIB} SHARED ${LIB_SRC} ${LIB_PLATFORM_SRC})
+    add_library(${SHARED_LIB} SHARED ${LIB_SRC} ${LIB_PLATFORM_SRC} ${CRYPTOGRAPHY_SRC})
     if (WIN32)
       set(${LIBS} ${LIBS} ws2_32 iphlpapi)
     endif(WIN32)
diff --git a/android/.gitignore b/android/.gitignore
new file mode 100644
index 000000000..b8e7e769a
--- /dev/null
+++ b/android/.gitignore
@@ -0,0 +1,18 @@
+gen
+tests
+bin
+libs
+log*
+obj
+.gradle
+.idea
+.externalNativeBuild
+ant.properties
+local.properties
+build.sh
+android.iml
+build
+gradle
+gradlew
+gradlew.bat
+gradle.properties
\ No newline at end of file
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
new file mode 100755
index 000000000..52df9ac8d
--- /dev/null
+++ b/android/AndroidManifest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="network.loki.lokinet"
+    android:installLocation="auto"
+    android:versionCode="1"
+    android:versionName="0.3.2">
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="28" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET" /> <!-- normal perm, per https://developer.android.com/guide/topics/permissions/normal-permissions.html -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- normal perm -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
+        CE
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/icon"
+        android:label="@string/app_name"
+        android:theme="@android:style/Theme.Holo.Light.DarkActionBar"
+        >
+        <receiver android:name=".NetworkStateChangeReceiver">
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+            </intent-filter>
+        </receiver>
+
+        <activity
+            android:name=".PermsAskerActivity"
+            android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".LokiNetActivity"
+            android:label="@string/app_name" />
+
+        <service
+            android:name=".ForegroundService"
+            android:enabled="true" />
+
+        <activity
+            android:name=".PermsExplanationActivity"
+            android:label="@string/title_activity_perms_asker_prompt"
+            android:parentActivityName=".PermsAskerActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="network.loki.lokinet.PermsAskerActivity" />
+        </activity>
+    </application>
+
+</manifest>
diff --git a/android/build.gradle b/android/build.gradle
new file mode 100644
index 000000000..227d93a2b
--- /dev/null
+++ b/android/build.gradle
@@ -0,0 +1,75 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.3'
+    }
+}
+
+apply plugin: 'com.android.application'
+
+
+repositories {
+    jcenter()
+    maven {
+        url 'https://maven.google.com'
+    }
+}
+
+android {
+    compileSdkVersion 28
+    buildToolsVersion "28.0.1"
+    defaultConfig {
+        applicationId "network.loki.lokinet"
+        targetSdkVersion 28
+        minSdkVersion 14
+        versionCode 1
+        versionName "0.3.1"
+        ndk {
+            abiFilters 'x86'
+        }
+        externalNativeBuild {
+            cmake {
+                targets "lokinetandroid"
+                arguments "-DANDROID=ON"
+            }
+        }
+        packagingOptions{
+            doNotStrip "*/armeabi/*.so"
+            doNotStrip "*/armeabi-v7a/*.so"
+            doNotStrip "*/x86/*.so"
+        }
+    }
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            res.srcDirs = ['res']
+            jniLibs.srcDirs = ['libs']
+            assets.srcDirs = ['assets']
+        }
+    }
+    signingConfigs {
+        jeff {
+            storeFile file("jeff-apk.jks")
+            keyAlias "jeff-apk"
+        }
+    }
+    buildTypes {
+        release {
+            minifyEnabled true
+            //signingConfig signingConfigs.jeff
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path lokinetCMake
+            
+        }
+    }
+}
+
+
diff --git a/android/build.xml b/android/build.xml
new file mode 100644
index 000000000..ffe9081c8
--- /dev/null
+++ b/android/build.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="lokinet" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Insert sdk.dir=... into './local.properties'. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <fail
+            message="ndk.dir is missing. Insert ndk.dir=... into './local.properties'."
+            unless="ndk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+</project>
diff --git a/android/proguard-project.txt b/android/proguard-project.txt
new file mode 100644
index 000000000..f2fe1559a
--- /dev/null
+++ b/android/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/android/project.properties b/android/project.properties
new file mode 100644
index 000000000..919ca9c3b
--- /dev/null
+++ b/android/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-28
diff --git a/android/res/drawable/icon.png b/android/res/drawable/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..30ad9ddcb15345bb334ecb0e5c043aeb4b77392c
GIT binary patch
literal 6565
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
XC3j2qkEppr00000NkvXXu0mjfcz{~`

literal 0
HcmV?d00001

diff --git a/android/res/layout/activity_perms_asker.xml b/android/res/layout/activity_perms_asker.xml
new file mode 100644
index 000000000..947436a09
--- /dev/null
+++ b/android/res/layout/activity_perms_asker.xml
@@ -0,0 +1,27 @@
+<LinearLayout android:id="@+id/main_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/vertical_page_margin"
+    android:paddingLeft="@dimen/horizontal_page_margin"
+    android:paddingRight="@dimen/horizontal_page_margin"
+    android:paddingTop="@dimen/vertical_page_margin"
+    tools:context=".PermsAskerActivity">
+
+    <TextView
+        android:id="@+id/textview_retry"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/horizontal_page_margin"
+        android:visibility="gone"
+        />
+
+    <Button
+        android:id="@+id/button_request_write_ext_storage_perms"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Retry requesting the SD card write permissions"
+        android:visibility="gone"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/activity_perms_explanation.xml b/android/res/layout/activity_perms_explanation.xml
new file mode 100644
index 000000000..0713479c0
--- /dev/null
+++ b/android/res/layout/activity_perms_explanation.xml
@@ -0,0 +1,27 @@
+<LinearLayout android:id="@+id/layout_prompt"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/vertical_page_margin"
+    android:paddingLeft="@dimen/horizontal_page_margin"
+    android:paddingRight="@dimen/horizontal_page_margin"
+    android:paddingTop="@dimen/vertical_page_margin"
+    tools:context=".PermsAskerActivity">
+
+    <TextView
+        android:id="@+id/textview_explanation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/horizontal_page_margin"
+        android:text="SD card write access is required to write the keys and other files on an SD card."
+        />
+
+    <Button
+        android:id="@+id/button_ok"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="OK"
+        />
+</LinearLayout>
\ No newline at end of file
diff --git a/android/res/menu/options_main.xml b/android/res/menu/options_main.xml
new file mode 100644
index 000000000..1c96bc277
--- /dev/null
+++ b/android/res/menu/options_main.xml
@@ -0,0 +1,11 @@
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".LokiNetActivity">
+    <item
+        android:id="@+id/action_stop"
+        android:title="@string/action_stop"
+        android:orderInCategory="99"
+        />
+</menu>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
new file mode 100755
index 000000000..a653c60b3
--- /dev/null
+++ b/android/res/values/strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">lokinet</string>
+    <string name="action_stop">Stop</string>
+    <string name="already_stopped">Already stopped</string>
+    <string name="uninitialized">lokinet initializing</string>
+    <string name="starting">lokinet is starting</string>
+    <string name="jniLibraryLoaded">lokinet: loaded JNI libraries</string>
+    <string name="startedOkay">lokinet started</string>
+    <string name="startFailed">lokinet start failed</string>
+    <string name="stopped">lokinet has stopped</string>
+    <string name="remaining">remaining</string>
+    <string name="title_activity_perms_asker_prompt">Prompt</string>
+</resources>
diff --git a/android/res/values/template-dimens.xml b/android/res/values/template-dimens.xml
new file mode 100644
index 000000000..36847c970
--- /dev/null
+++ b/android/res/values/template-dimens.xml
@@ -0,0 +1,16 @@
+<resources>
+
+    <!-- Define standard dimensions to comply with Holo-style grids and rhythm. -->
+
+    <dimen name="margin_tiny">4dp</dimen>
+    <dimen name="margin_small">8dp</dimen>
+    <dimen name="margin_medium">16dp</dimen>
+    <dimen name="margin_large">32dp</dimen>
+    <dimen name="margin_huge">64dp</dimen>
+
+    <!-- Semantic definitions -->
+
+    <dimen name="horizontal_page_margin">@dimen/margin_medium</dimen>
+    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/android/settings.gradle b/android/settings.gradle
new file mode 100644
index 000000000..b2f9a127a
--- /dev/null
+++ b/android/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "lokinet"
diff --git a/android/src/network/loki/lokinet/LokiNetActivity.java b/android/src/network/loki/lokinet/LokiNetActivity.java
new file mode 100755
index 000000000..3094252e5
--- /dev/null
+++ b/android/src/network/loki/lokinet/LokiNetActivity.java
@@ -0,0 +1,182 @@
+package network.loki.lokinet;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.Path;
+import java.util.Timer;
+import java.util.TimerTask;
+
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.res.AssetManager;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.IBinder;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class LokiNetActivity extends Activity {
+	private static final String TAG = "lokinet-activity";
+	private TextView textView;
+	
+	
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		// copy assets
+		String conf = copyFileAsset("daemon.ini");
+		
+		textView = new TextView(this);
+		setContentView(textView);
+		if(conf == null)
+		{
+			Log.e(TAG, "failed to get config");
+			return;
+		}
+		Lokinet_JNI.loadLibraries();
+		Lokinet_JNI.startLokinet(conf);
+	}
+	
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		textView = null;
+	}
+
+	private CharSequence throwableToString(Throwable tr) {
+		StringWriter sw = new StringWriter(8192);
+		PrintWriter pw = new PrintWriter(sw);
+		tr.printStackTrace(pw);
+		pw.close();
+		return sw.toString();
+	}
+	
+	// private LocalService mBoundService;
+	
+	private ServiceConnection mConnection = new ServiceConnection() {
+		public void onServiceConnected(ComponentName className, IBinder service) {
+			// This is called when the connection with the service has been
+			// established, giving us the service object we can use to
+			// interact with the service.  Because we have bound to a explicit
+			// service that we know is running in our own process, we can
+			// cast its IBinder to a concrete class and directly access it.
+			//		mBoundService = ((LocalService.LocalBinder)service).getService();
+			
+			// Tell the user about this for our demo.
+			//		Toast.makeText(Binding.this, R.string.local_service_connected,
+			//		Toast.LENGTH_SHORT).show();
+		}
+		
+		public void onServiceDisconnected(ComponentName className) {
+			// This is called when the connection with the service has been
+			// unexpectedly disconnected -- that is, its process crashed.
+			// Because it is running in our same process, we should never
+			// see this happen.
+			//		mBoundService = null;
+			//		Toast.makeText(Binding.this, R.string.local_service_disconnected,
+			//		Toast.LENGTH_SHORT).show();
+		}
+	};
+	
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		// Inflate the menu; this adds items to the action bar if it is present.
+		getMenuInflater().inflate(R.menu.options_main, menu);
+		return true;
+	}
+	
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		// Handle action bar item clicks here. The action bar will
+		// automatically handle clicks on the Home/Up button, so long
+		// as you specify a parent activity in AndroidManifest.xml.
+		int id = item.getItemId();
+		
+		switch(id){
+			case R.id.action_stop:
+			Lokinet_JNI.stopLokinet();
+			return true;
+		}
+		
+		return super.onOptionsItemSelected(item);
+	}
+	
+	/**
+		* Copy the asset at the specified path to this app's data directory. If the
+		* asset is a directory, its contents are also copied.
+		* 
+		* @param path
+		* Path to asset, relative to app's assets directory.
+	*/
+	private void copyAsset(String path) {
+		AssetManager manager = getAssets();
+		Path dir = Paths.get(Environment.getExternalStorageDirectory().getAbsolutePath(), "lokinet", path);
+		try {
+			String[] contents = manager.list(path);
+			
+			// The documentation suggests that list throws an IOException, but doesn't
+			// say under what conditions. It'd be nice if it did so when the path was
+			// to a file. That doesn't appear to be the case. If the returned array is
+			// null or has 0 length, we assume the path is to a file. This means empty
+			// directories will get turned into files.
+			if (contents == null || contents.length == 0)
+				return;
+			
+			// Make the directory.
+			dir.toFile().mkdirs();
+			
+				// Recurse on the contents.
+			for (String entry : contents) {
+				copyFileAsset(Paths.get(dir.toString(), entry).toString());
+			}
+		}
+		catch(IOException ex)
+		{
+			copyFileAsset(path);
+		}
+	}
+	
+	/**
+		* Copy the asset file specified by path to app's data directory. Assumes
+		* parent directories have already been created.
+		* 
+		* @param path
+		* Path to asset, relative to app's assets directory.
+	*/
+	private String copyFileAsset(String path) {
+		Path p = Paths.get(Environment.getExternalStorageDirectory().getAbsolutePath(), "lokinet", path);
+		try {
+			p.getParent().toFile().mkdirs();
+      InputStream in = getAssets().open(path);
+			OutputStream out = new FileOutputStream(p.toFile());
+			byte[] buffer = new byte[1024];
+      int read = in.read(buffer);
+      while (read != -1) {
+      	out.write(buffer, 0, read);
+        read = in.read(buffer);
+      }
+      out.close();
+      in.close();
+    } catch (IOException e) {
+     	Log.e(TAG, "", e);
+			return null;
+    }
+		return p.toString();
+	}
+}
diff --git a/android/src/network/loki/lokinet/Lokinet_JNI.java b/android/src/network/loki/lokinet/Lokinet_JNI.java
new file mode 100644
index 000000000..7dc443672
--- /dev/null
+++ b/android/src/network/loki/lokinet/Lokinet_JNI.java
@@ -0,0 +1,31 @@
+package network.loki.lokinet;
+
+public class Lokinet_JNI {
+
+    public static final String STATUS_OK = "ok";
+
+    public static native String getABICompiledWith();
+
+	/**
+	 * returns error info if failed
+	 * returns "ok" if daemon initialized and started okay
+	 */
+    public static native String startLokinet(String config);
+    
+    /**
+     * stop daemon if running
+     */
+    public static native void stopLokinet();
+
+    /**
+     * change network status
+     */
+	public static native void onNetworkStateChanged(boolean isConnected);
+
+    /**
+     * load jni libraries
+     */
+	public static void loadLibraries() {
+        System.loadLibrary("lokinetandroid");
+    }
+}
diff --git a/android/src/network/loki/lokinet/NetworkStateChangeReceiver.java b/android/src/network/loki/lokinet/NetworkStateChangeReceiver.java
new file mode 100644
index 000000000..d466e75c9
--- /dev/null
+++ b/android/src/network/loki/lokinet/NetworkStateChangeReceiver.java
@@ -0,0 +1,30 @@
+package network.loki.lokinet;
+
+import android.util.Log;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+
+public class NetworkStateChangeReceiver extends BroadcastReceiver {
+
+    private static final String TAG = "lokinet";
+
+	//api level 1
+    @Override
+    public void onReceive(final Context context, final Intent intent) {
+        Log.d(TAG,"Network state change");
+		try {
+			ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+			NetworkInfo activeNetworkInfo = cm.getActiveNetworkInfo();
+			boolean isConnected = activeNetworkInfo!=null && activeNetworkInfo.isConnected();
+			// https://developer.android.com/training/monitoring-device-state/connectivity-monitoring.html?hl=ru
+			// boolean isWiFi = activeNetworkInfo!=null && (activeNetworkInfo.getType() == ConnectivityManager.TYPE_WIFI);
+
+			Lokinet_JNI.onNetworkStateChanged(isConnected);
+		} catch (Throwable tr) {
+			Log.d(TAG,"",tr);
+		}
+    }
+}
diff --git a/android/src/network/loki/lokinet/PermsAskerActivity.java b/android/src/network/loki/lokinet/PermsAskerActivity.java
new file mode 100644
index 000000000..f560e4617
--- /dev/null
+++ b/android/src/network/loki/lokinet/PermsAskerActivity.java
@@ -0,0 +1,171 @@
+package network.loki.lokinet;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import java.lang.reflect.Method;
+
+//dangerous perms, per https://developer.android.com/guide/topics/permissions/normal-permissions.html :
+//android.permission.WRITE_EXTERNAL_STORAGE
+public class PermsAskerActivity extends Activity {
+
+    private static final int PERMISSION_WRITE_EXTERNAL_STORAGE = 0;
+
+    private Button button_request_write_ext_storage_perms;
+    private TextView textview_retry;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //if less than Android 6, no runtime perms req system present
+        if (android.os.Build.VERSION.SDK_INT < 23) {
+            startMainActivity();
+            return;
+        }
+
+
+        setContentView(R.layout.activity_perms_asker);
+        button_request_write_ext_storage_perms = (Button) findViewById(R.id.button_request_write_ext_storage_perms);
+        textview_retry = (TextView) findViewById(R.id.textview_retry);
+
+        button_request_write_ext_storage_perms.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                request_write_ext_storage_perms();
+            }
+        });
+        request_write_ext_storage_perms();
+    }
+
+    private void request_write_ext_storage_perms() {
+
+        textview_retry.setVisibility(TextView.GONE);
+        button_request_write_ext_storage_perms.setVisibility(Button.GONE);
+
+        Method methodCheckPermission;
+        Method method_shouldShowRequestPermissionRationale;
+        Method method_requestPermissions;
+        try {
+            methodCheckPermission = getClass().getMethod("checkSelfPermission", String.class);
+            method_shouldShowRequestPermissionRationale =
+                    getClass().getMethod("shouldShowRequestPermissionRationale", String.class);
+            method_requestPermissions =
+                    getClass().getMethod("requestPermissions", String[].class, int.class);
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+        Integer resultObj;
+        try {
+            resultObj = (Integer) methodCheckPermission.invoke(
+                    this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+        } catch (Throwable e) {
+            throw new RuntimeException(e);
+        }
+
+        if (resultObj != PackageManager.PERMISSION_GRANTED) {
+
+            // Should we show an explanation?
+            Boolean aBoolean;
+            try {
+                aBoolean = (Boolean) method_shouldShowRequestPermissionRationale.invoke(this,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            if (aBoolean) {
+
+                // Show an explanation to the user *asynchronously* -- don't block
+                // this thread waiting for the user's response! After the user
+                // sees the explanation, try again to request the permission.
+
+                showExplanation();
+
+            } else {
+
+                // No explanation needed, we can request the permission.
+
+                try {
+                    method_requestPermissions.invoke(this,
+                            new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                            PERMISSION_WRITE_EXTERNAL_STORAGE);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        } else startMainActivity();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           String permissions[], int[] grantResults) {
+        switch (requestCode) {
+            case PERMISSION_WRITE_EXTERNAL_STORAGE: {
+                // If request is cancelled, the result arrays are empty.
+                if (grantResults.length > 0
+                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+
+                    // permission was granted, yay! Do the
+                    // contacts-related task you need to do.
+
+                    startMainActivity();
+
+                } else {
+
+                    // permission denied, boo! Disable the
+                    // functionality that depends on this permission.
+                    textview_retry.setText("SD card write permission denied, you need to allow this to continue");
+                    textview_retry.setVisibility(TextView.VISIBLE);
+                    button_request_write_ext_storage_perms.setVisibility(Button.VISIBLE);
+                }
+                return;
+            }
+
+            // other 'case' lines to check for other
+            // permissions this app might request.
+        }
+    }
+
+    private void startMainActivity() {
+        startActivity(new Intent(this, LokiNetActivity.class));
+        finish();
+    }
+
+    private static final int SHOW_EXPLANATION_REQUEST = 1;  // The request code
+    private void showExplanation() {
+        Intent intent = new Intent(this, PermsExplanationActivity.class);
+        startActivityForResult(intent, SHOW_EXPLANATION_REQUEST);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        // Check which request we're responding to
+        if (requestCode == SHOW_EXPLANATION_REQUEST) {
+            // Make sure the request was successful
+            if (resultCode == RESULT_OK) {
+                // Request the permission
+                Method method_requestPermissions;
+                try {
+                    method_requestPermissions =
+                            getClass().getMethod("requestPermissions", String[].class, int.class);
+                } catch (NoSuchMethodException e) {
+                    throw new RuntimeException(e);
+                }
+                try {
+                    method_requestPermissions.invoke(this,
+                            new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                            PERMISSION_WRITE_EXTERNAL_STORAGE);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            } else {
+                finish(); //close the app
+            }
+        }
+    }
+}
diff --git a/android/src/network/loki/lokinet/PermsExplanationActivity.java b/android/src/network/loki/lokinet/PermsExplanationActivity.java
new file mode 100644
index 000000000..bbea36054
--- /dev/null
+++ b/android/src/network/loki/lokinet/PermsExplanationActivity.java
@@ -0,0 +1,38 @@
+package network.loki.lokinet;
+
+import android.app.ActionBar;
+import android.content.Intent;
+import android.os.Bundle;
+import android.app.Activity;
+import android.view.View;
+import android.widget.Button;
+
+public class PermsExplanationActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_perms_explanation);
+        ActionBar actionBar = getActionBar();
+        if(actionBar!=null)actionBar.setHomeButtonEnabled(false);
+        Button button_ok = (Button) findViewById(R.id.button_ok);
+        button_ok.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                returnFromActivity();
+            }
+        });
+    }
+
+    private void returnFromActivity() {
+        Intent data = new Intent();
+        Activity parent = getParent();
+        if (parent == null) {
+            setResult(Activity.RESULT_OK, data);
+        } else {
+            parent.setResult(Activity.RESULT_OK, data);
+        }
+        finish();
+    }
+
+}
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000000000..925d01bf3
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,58 @@
+lokinet (0.2.3) UNRELEASED; urgency=medium
+
+  [ Jeff Becker (probably not evil) ]
+  * MANDITORY UPGRADE FOR TOYNET
+
+  * remove iwp and replace with utp
+
+  * use sntrup for introset public key (backwards incompatable)
+
+  * hidden service tags (backwards incompatable)
+
+  * add nicknames to RC (backwards incompatable)
+
+  * change kdf for path keys (backwards incompatable)
+
+  * various dht fixes
+
+  * various dns fixes (still unused in lokinet executable)
+
+  * hidden services should sorta work (no client interfacing code yet)
+
+  * initial win32 port (may sorta work)
+
+  * initial android point (should compile)
+
+  * fix shadow testnet
+
+  * moved netloop and logic into same thread
+
+  * update motto
+
+  * debian packaging
+
+  * windows port
+
+  * cross compile targets
+
+  * continous integration
+
+  * android port
+
+  * android glue code ( will be moved later ) 
+
+  * snap network namespace isolation, untested
+
+  [ jeff ]
+
+  * bump versions
+
+  * add lokinet-bootstrap script
+
+  * dns automapping
+
+  * hidden serivce junk
+ 
+  * systemd unit
+
+ -- jeff <jeff@i2p.rocks>  Tue, 25 Sep 2018 09:17:17 -0400
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000000000..b4de39476
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+11
diff --git a/debian/control b/debian/control
new file mode 100644
index 000000000..fe2c059f0
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,19 @@
+Source: lokinet
+Section: net
+Priority: optional
+Maintainer: Jeff Becker (probably not evil) <jeff@i2p.rocks>
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.17.2~), gcc (>= 4.7) | clang (>= 3.3), cmake (>= 3.0), libcap-dev (>= 2.25)
+Standards-Version: 3.9.6
+Homepage: http://loki.network/
+Vcs-Git: git://github.com/loki-project/lokinet-builder.git
+Vcs-Browser: https://github.com/loki-project/lokinet-builder
+
+Package: lokinet
+Architecture: any
+Pre-Depends: adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, libcap2-bin, wget
+Description: Reference implementation for LLARP.
+ Lokinet is a private, decentralized and Market based, Sybil
+ resistant overlay network for the internet.
+ .
+ This package contains the reference implementation of LLARP.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000000000..fc62b2a9f
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,27 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: lokinet
+Source: https://github.com/loki-project/lokinet-builder
+
+Files: *
+Copyright: 2018 Jeff Becker
+License: ZLIB
+
+License: ZLIB
+
+ Copyright (c) 2018 Jeff Becker
+ .
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
diff --git a/debian/lokinet.1 b/debian/lokinet.1
new file mode 100644
index 000000000..c6c7e6ad3
--- /dev/null
+++ b/debian/lokinet.1
@@ -0,0 +1,35 @@
+.TH "lokinet" "1" "Aug 09, 2018"
+
+.SH "NAME"
+lokinet \- Reference implementation for LLARP.
+.SH "SYNOPSIS"
+.B lokinet
+[\fIconfig.ini\fR]
+.SH "DESCRIPTION"
+For a number of years, work has been proceeding in order to bring prefection
+to the crudely concieved idea of a packet based onion routing protocol with a 
+cryptoeconomic insentive sybil resistence that not only would be able to
+provide low latency anonymous internet access but also be capable of 
+automatically tunneling all local network traffic over said mixnet. Such an a
+program would be the turbo encab-, rather, lokinet. Now basically the only new
+principal involved is that now instead of restricting the user to using TCP and 
+exposing a socks proxy or transparent proxy like Tor, an ip tunnel is provided
+with a dns resolver for intercepting lookups for the .loki tld. The original
+implementation was in C but eventually devolved into C++ in such a way that 
+there is a public C api but internally entirely implemented with C++11 wrapped
+with a foriegn function interface. The latter being more rapidly developable,
+but I digres.
+
+.SH "FILES"
+daemon.ini
+.RS 4
+default configuration file (auto generated if not present)
+.RE
+.SH "SEE ALSO"
+Documentation for lokinet configuration with loki service nodes.
+.SH "AUTHOR"
+This manual page was written by Jeff <\m[blue]\fBjeff@i2p\&.rocks\fR\m[]> for ubuntu xenial.
+.PP
+Permission is granted to copy, distribute and/or modify this document under the terms of the same license of lokinet source code.
+.RE
+See the LICENSE file for more information.
\ No newline at end of file
diff --git a/debian/lokinet.install b/debian/lokinet.install
new file mode 100644
index 000000000..34ba43aa7
--- /dev/null
+++ b/debian/lokinet.install
@@ -0,0 +1,3 @@
+lokinet usr/sbin/
+lokinet-rcutil usr/sbin/
+lokinet-bootstrap usr/sbin/
\ No newline at end of file
diff --git a/debian/lokinet.manpages b/debian/lokinet.manpages
new file mode 100644
index 000000000..6a3cd16a1
--- /dev/null
+++ b/debian/lokinet.manpages
@@ -0,0 +1 @@
+debian/lokinet.1
\ No newline at end of file
diff --git a/debian/lokinet.service b/debian/lokinet.service
new file mode 100644
index 000000000..89ff4170e
--- /dev/null
+++ b/debian/lokinet.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=LokiNET: Anonymous Network layer thingydoo.
+Wants=network.target
+After=network.target
+
+[Service]
+User=debian-lokinet
+SyslogIdentifier=lokinet
+ExecStartPre=/bin/bash -c "[ -e /var/lib/lokinet/.lokinet/ ] || ( /usr/sbin/lokinet -g && /usr/sbin/lokinet-bootstrap ) "
+ExecStart=/usr/sbin/lokinet /var/lib/lokinet/.lokinet/lokinet.ini
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 000000000..0fdc62c85
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+setcap cap_net_admin,cap_net_bind_service=+eip /usr/sbin/lokinet || echo "failed to setcap lokinet"
+adduser --quiet --system --home /var/lib/lokinet debian-lokinet
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000000000..377ce7262
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+%:
+	dh $@ --parallel
+
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+    CFLAGS += -O0
+else
+    CFLAGS += -O2
+endif
+ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+    INSTALL_PROGRAM += -s
+endif
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+override_dh_auto_build:
+	$(MAKE) debian
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000000000..46ebe0266
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
\ No newline at end of file