Use tmpfiles.d/sysusers.d instead of manual commands in .install

6 files changed, 29 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ebc40e792eea..6dea6f0f5a8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = homegear
 	pkgdesc = Interface your HomeMatic BidCoS, HomeMatic Wired, MAX!, INSTEON or Philips hue devices with your home automation software or your own control scripts
 	pkgver = 0.7.10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://homegear.eu
 	install = homegear.install
 	arch = x86_64
@@ -32,14 +32,18 @@ pkgbase = homegear
 	source = https://github.com/Homegear/Homegear/archive/0.7.10.tar.gz
 	source = homegear.service
 	source = homegear.logrotate
+	source = homegear.sysusers
+	source = homegear.tmpfiles
 	source = homegear-gnutls.patch
 	source = homegear-config.patch
 	source = homegear-ssl-optional.patch
 	sha512sums = f494396d58580c8059a8eea5e7b196372b507380af3c48a5036e45bb720b2c2259340bc4853600218ba0722460801fe54edc7e7cebfd6c03e19335153658dc9d
 	sha512sums = 52b7b1b37c1d6b958081c97a733a0b17207a66c5b3c2a51f8abd1659aa1220ee6805f9ee47d241fa63b9124534b3958f04fc41b8b2e8132487d904550af5a26c
 	sha512sums = c58a093cc923551e8482503962bfb9f043ee651b2d9954df6a8bf478715848bdac226dc0f3eb4e4f4aa44cdc9c7ca041560db735e27d6cc89122d02e2ffecc2a
+	sha512sums = 0067d4593d64ec91b4aa15412f09df5c4afc45c8349e33e278cbe80c5d5aa99f25f8f6f14dc14babfa308412bc20d7f4a213da3e61202991bafec871e59451ae
+	sha512sums = 23fb3b1a49f7b3433bd71ca262545aa31d67e7ae88801b41a7c1e306be926a06b7b29389cc63f3342cf8f5e55f908dc0847be6ba7d6b2657018240883a658ce0
 	sha512sums = b55c2e38e3aae22ecd1b3af65aebb7767400cf134f317ffad6f139c4f8681c587fbf7268b098c44796439dc51d9e4c05aadb1fe1d864b8ea1d8902f0409c5127
-	sha512sums = 8bc3908e78f77a496d3c13bee0fa02cad2307b13bc3dc06b05cb5e08c774bc046e58d6c0967ed4216dddf49aac4288b641dc5d5b8006b7c47b9b95abe4fd0cd0
+	sha512sums = fd60fe50bedfc3d60cb93159087927c1f5d4d80a7176ec4c53b01e5c254f339ab6df436342684f0240b75d01d37c72f39af4379c57b13b18826e5997810df4fe
 	sha512sums = 5b25817cbbf5a5fb1d7c8414d36441de18cef3c43693329facb84b4312fd83c92bfcf6100937f3e5c9a7329e4ba80de1418cc0b9374c46d14255a612e8617498
 
 pkgname = homegear
diff --git a/PKGBUILD b/PKGBUILD
index b402f5c71655..dfb9fc3f3a32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname='homegear'
 _gitname='Homegear'
 pkgdesc='Interface your HomeMatic BidCoS, HomeMatic Wired, MAX!, INSTEON or Philips hue devices with your home automation software or your own control scripts'
 pkgver=0.7.10
-pkgrel=1
+pkgrel=2
 arch=('x86_64' 'i686' 'armv6h' 'armv7h' 'aarch64')
 license=('LGPL3')
 url="https://homegear.eu"
@@ -19,14 +19,18 @@ optdepends=('homegear-homematicbidcos: Support for eQ-3 HomeMatic BidCoS (wirele
 source=("https://github.com/Homegear/${_gitname}/archive/${pkgver}.tar.gz"
 	    'homegear.service'
 	    'homegear.logrotate'
+        'homegear.sysusers'
+        'homegear.tmpfiles'
         'homegear-gnutls.patch'
         'homegear-config.patch'
         'homegear-ssl-optional.patch')
 sha512sums=('f494396d58580c8059a8eea5e7b196372b507380af3c48a5036e45bb720b2c2259340bc4853600218ba0722460801fe54edc7e7cebfd6c03e19335153658dc9d'
             '52b7b1b37c1d6b958081c97a733a0b17207a66c5b3c2a51f8abd1659aa1220ee6805f9ee47d241fa63b9124534b3958f04fc41b8b2e8132487d904550af5a26c'
             'c58a093cc923551e8482503962bfb9f043ee651b2d9954df6a8bf478715848bdac226dc0f3eb4e4f4aa44cdc9c7ca041560db735e27d6cc89122d02e2ffecc2a'
+            '0067d4593d64ec91b4aa15412f09df5c4afc45c8349e33e278cbe80c5d5aa99f25f8f6f14dc14babfa308412bc20d7f4a213da3e61202991bafec871e59451ae'
+            '23fb3b1a49f7b3433bd71ca262545aa31d67e7ae88801b41a7c1e306be926a06b7b29389cc63f3342cf8f5e55f908dc0847be6ba7d6b2657018240883a658ce0'
             'b55c2e38e3aae22ecd1b3af65aebb7767400cf134f317ffad6f139c4f8681c587fbf7268b098c44796439dc51d9e4c05aadb1fe1d864b8ea1d8902f0409c5127'
-            '8bc3908e78f77a496d3c13bee0fa02cad2307b13bc3dc06b05cb5e08c774bc046e58d6c0967ed4216dddf49aac4288b641dc5d5b8006b7c47b9b95abe4fd0cd0'
+            'fd60fe50bedfc3d60cb93159087927c1f5d4d80a7176ec4c53b01e5c254f339ab6df436342684f0240b75d01d37c72f39af4379c57b13b18826e5997810df4fe'
             '5b25817cbbf5a5fb1d7c8414d36441de18cef3c43693329facb84b4312fd83c92bfcf6100937f3e5c9a7329e4ba80de1418cc0b9374c46d14255a612e8617498')
 install='homegear.install'
 backup=('etc/homegear/main.conf'
@@ -84,5 +88,7 @@ package() {
     install -Dm755 homegear-miscellaneous/misc/Device\ Description\ Files/Template.xml "${pkgdir}"/etc/homegear/devices/254/template.xml
 
     install -Dm755 "${srcdir}"/homegear.service "${pkgdir}"/usr/lib/systemd/system/homegear.service
+    install -Dm755 "${srcdir}"/homegear.sysusers "${pkgdir}"/usr/lib/sysusers.d/homegear.conf
+    install -Dm755 "${srcdir}"/homegear.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/homegear.conf
     install -Dm755 "${srcdir}"/homegear.logrotate "${pkgdir}"/etc/logrotate.d/homegear
 }
diff --git a/homegear-config.patch b/homegear-config.patch
index 4eaa421bfdae..485fa2f03f40 100644
--- a/homegear-config.patch
+++ b/homegear-config.patch
@@ -1,5 +1,5 @@
 diff --git a/misc/Config Directory/main.conf b/misc/Config Directory/main.conf
-index 9f6716e..bd3eceb 100644
+index 9f6716e..5e3aa16 100644
 --- a/misc/Config Directory/main.conf	
 +++ b/misc/Config Directory/main.conf	
 @@ -2,10 +2,10 @@
@@ -33,7 +33,7 @@ index 9f6716e..bd3eceb 100644
  
  # Default: flowsPathPermissions = 770
  # flowsPathPermissions = 770
-@@ -219,11 +219,11 @@ nodeBlueDebugOutput = true
+@@ -219,21 +219,21 @@ nodeBlueDebugOutput = true
  
  # Path to the family modules.
  # Default: modulePath = /var/lib/homegear/modules
@@ -47,7 +47,10 @@ index 9f6716e..bd3eceb 100644
  
  # Path to a directory where Homegear can store temporary data
  # Default: tempPath = /var/lib/homegear/tmp
-@@ -233,7 +233,7 @@ tempPath = /var/lib/homegear/tmp
+-tempPath = /var/lib/homegear/tmp
++tempPath = /tmp/homegear
+ 
+ # If lockFilePath is empty, the executable path is used. If unset, "/var/lock" is used.
  # Default: lockFilePath = /var/lock
  # /var/run/ is not the correct path for lock files. But as /var/lock is not user-writeable
  # on some systems, we decided to move the lock files to /var/run/homegear.
diff --git a/homegear.install b/homegear.install
index 841289f07879..46bffd9625a8 100644
--- a/homegear.install
+++ b/homegear.install
@@ -1,37 +1,7 @@
-fix_owner_perms() {
-    chown -R homegear:homegear /var/lib/homegear
-    chown homegear:homegear /var/log/homegear
-}
-
 post_install() {
-	result=`id -u homegear 2>/dev/null`
-	if [ "0$result" -eq "0" ]; then
-	    useradd --system --shell /bin/false homegear >/dev/null 2>&1
-        [ $? -ne 0 ] && exit 1
-        usermod -a -G dialout homegear 2>/dev/null
-        usermod -a -G gpio homegear 2>/dev/null
-        usermod -a -G spi homegear 2>/dev/null
-	fi
-
     echo '>>> SSL on ports 2002 and 2003 is disabled by default.'
     echo '>>> Run the following commands and then enable SSL in /etc/homegear/rpcservers.conf:'
     echo '>>> # openssl genrsa -out /etc/homegear/homegear.key 2048'
     echo '>>> # openssl req -new -key /etc/homegear/homegear.key -out /etc/homegear/homegear.csr'
     echo '>>> # openssl x509 -req -in /etc/homegear/homegear.csr -signkey /etc/homegear/homegear.key -out /etc/homegear/homegear.crt'
-
-	fix_owner_perms
-}
-
-post_upgrade() {
-	fix_owner_perms
-}
-
-post_remove() {
-	if test -e /etc/homegear; then
-	    chown -R root:root /etc/homegear
-	fi
-	if test -e /var/lib/homegear; then
-    	chown -R root:root /var/lib/homegear
-	fi
-	userdel homegear > /dev/null 2>&1
 }
diff --git a/homegear.sysusers b/homegear.sysusers
new file mode 100644
index 000000000000..cc7c6ef8754d
--- /dev/null
+++ b/homegear.sysusers
@@ -0,0 +1,4 @@
+u homegear -  "Homegear daemon user" /var/lib/homegear
+m homegear dialout
+m homegear gpio
+m homegear spi
diff --git a/homegear.tmpfiles b/homegear.tmpfiles
new file mode 100644
index 000000000000..b9cc560f2344
--- /dev/null
+++ b/homegear.tmpfiles
@@ -0,0 +1,5 @@
+d /var/lib/homegear 0750 homegear homegear -
+Z /var/lib/homegear -    homegear homegear -
+d /var/log/homegear 0755 homegear homegear -
+d /run/homegear 0755 homegear homegear -
+D /tmp/homegear 0750 homegear homegear 10d