From 5eb5ec452b587e09d7d6523db747292a6b707269 Mon Sep 17 00:00:00 2001
From: Mateusz Piotrowski <mpp302@gmail.com>
Date: Thu, 16 Mar 2017 23:45:57 -0500
Subject: [PATCH 1/2] Fix a bug in a portable relative paths resolver (#483)

It turns out that this `|` was a typo. (See https://unix.stackexchange.com/questions/24293/converting-relative-path-to-absolute-path/24342?noredirect=1#comment623203_24342)
---
 bin/cowrie | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/cowrie b/bin/cowrie
index c3e594d..2c393fa 100755
--- a/bin/cowrie
+++ b/bin/cowrie
@@ -15,7 +15,7 @@ find_cowrie_directory() {
     else
         COWRIEDIR=$(dirname $PWD/$0)/..
     fi
-    COWRIEDIR=$(cd ${COWRIEDIR} && pwd -P 2>/dev/null | pwd)
+    COWRIEDIR=$(cd ${COWRIEDIR} && pwd -P 2>/dev/null || pwd)
 }
 
 activate_venv() {

From 0d3c752f1e0c2f657dad3be30e56bf595de1a356 Mon Sep 17 00:00:00 2001
From: Jan Dorsman <oldskool@users.noreply.github.com>
Date: Sat, 18 Mar 2017 18:28:49 +0100
Subject: [PATCH 2/2] ip field in MySQL may contain hostname (#486)

* Update mysql.sql

IP field may contain hostname

* Create update11.sql
---
 doc/sql/mysql.sql    | 2 +-
 doc/sql/update11.sql | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 doc/sql/update11.sql

diff --git a/doc/sql/mysql.sql b/doc/sql/mysql.sql
index 94348ea..3ca9d12 100644
--- a/doc/sql/mysql.sql
+++ b/doc/sql/mysql.sql
@@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS `input` (
 
 CREATE TABLE IF NOT EXISTS `sensors` (
   `id` int(11) NOT NULL auto_increment,
-  `ip` varchar(15) NOT NULL,
+  `ip` varchar(255) NOT NULL,
   PRIMARY KEY  (`id`)
 ) ;
 
diff --git a/doc/sql/update11.sql b/doc/sql/update11.sql
new file mode 100644
index 0000000..e1c2bff
--- /dev/null
+++ b/doc/sql/update11.sql
@@ -0,0 +1 @@
+ALTER TABLE sensors MODIFY ip VARCHAR(255) NOT NULL;