Merge branch 'develop': Fix #375, fix #274, fix #373.

5 files changed, 7 insertions, 6 deletions

diff --git a/pigpio.c b/pigpio.c
index 3c5b05d..92b9bf7 100644
--- a/pigpio.c
+++ b/pigpio.c
@@ -25,7 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <http://unlicense.org/>
 */
 
-/* pigpio version 77 */
+/* pigpio version 78 */
 
 /* include ------------------------------------------------------- */
 
@@ -7335,7 +7335,7 @@ static int initGrabLockFile(void)
 static uint32_t * initMapMem(int fd, uint32_t addr, uint32_t len)
 {
     return (uint32_t *) mmap(0, len,
-       PROT_READ|PROT_WRITE|PROT_EXEC,
+       PROT_READ|PROT_WRITE,
        MAP_SHARED|MAP_LOCKED,
        fd, addr);
 }
@@ -13742,8 +13742,8 @@ unsigned gpioHardwareRevision(void)
             rev = ntohl(tmp);
             rev &= 0xFFFFFF; /* mask out warranty bit */
          }
+         fclose(filp);
       }
-      fclose(filp);
    }
 
    piCores = 0;
diff --git a/pigpio.h b/pigpio.h
index e417b96..40d21fc 100644
--- a/pigpio.h
+++ b/pigpio.h
@@ -30,7 +30,7 @@ For more information, please refer to <http://unlicense.org/>
 #include <stdint.h>
 #include <pthread.h>
 
-#define PIGPIO_VERSION 77
+#define PIGPIO_VERSION 78
 
 /*TEXT
 
diff --git a/pigpio.py b/pigpio.py
index 7fc80a5..edb6734 100644
--- a/pigpio.py
+++ b/pigpio.py
@@ -331,7 +331,7 @@ import threading
 import os
 import atexit
 
-VERSION = "1.46"
+VERSION = "1.78"  # sync minor number to pigpio library version
 
 exceptions = True
 
diff --git a/setup.py b/setup.py
index 023a2c4..4dbb8a9 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from distutils.core import setup
 
 setup(name='pigpio',
-      version='1.46',
+      version='1.78',
       author='joan',
       author_email='joan@abyz.me.uk',
       maintainer='joan',
diff --git a/util/pigpiod.service b/util/pigpiod.service
index a0bb916..f040d38 100644
--- a/util/pigpiod.service
+++ b/util/pigpiod.service
@@ -3,6 +3,7 @@ Description=Pigpio daemon
 
 [Service]
 Type=forking
+PIDFile=pigpio.pid
 ExecStart=/usr/bin/pigpiod
 
 [Install]