From ed5ba4506750e16c4d15c6c23008804eab6fc4c9 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 13 Nov 2016 12:48:27 +0200
Subject: [PATCH] reported motion version fix

---
 package/motion/0001-version.patch | 16 ++++++++++++++++
 package/motioneye/update.py       | 14 ++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 package/motion/0001-version.patch

diff --git a/package/motion/0001-version.patch b/package/motion/0001-version.patch
new file mode 100644
index 0000000000..610a7c7e2b
--- /dev/null
+++ b/package/motion/0001-version.patch
@@ -0,0 +1,16 @@
+diff -uNr motion/version.sh motion.new/version.sh
+--- motion/version.sh	2016-11-13 12:45:14.143548855 +0200
++++ motion.new/version.sh	2016-11-13 12:45:31.683635991 +0200
+@@ -1,8 +1,9 @@
+ #!/bin/sh
+ BASE_VERSION="4.0.1"
+ if [ -d .git ]; then
+-	GIT_COMMIT=`git show -s --format=%h`
+-	printf "$BASE_VERSION+git$GIT_COMMIT"
++        GIT_COMMIT=`git show -s --format=%h`
++        printf "$BASE_VERSION+git$GIT_COMMIT"
+ else
+-	printf "$BASE_VERSION+gitUNKNOWN"
++        printf "$BASE_VERSION+git$(basename $(pwd) | cut -d '-' -f 2)"
+ fi
++
diff --git a/package/motioneye/update.py b/package/motioneye/update.py
index 9a78130d4c..e9fd184b4b 100644
--- a/package/motioneye/update.py
+++ b/package/motioneye/update.py
@@ -83,8 +83,18 @@ def get_all_versions():
 
 
 def compare_versions(version1, version2):
-    version1 = [int(n) for n in version1.split('.')]
-    version2 = [int(n) for n in version2.split('.')]
+    version1 = re.sub('[^0-9.]', '', version1)
+    version2 = re.sub('[^0-9.]', '', version2)
+    
+    def int_or_0(n):
+        try:
+            return int(n)
+        
+        except:
+            return 0
+
+    version1 = [int_or_0(n) for n in version1.split('.')]
+    version2 = [int_or_0(n) for n in version2.split('.')]
     
     len1 = len(version1)
     len2 = len(version2)