Merge branch 'master' into systemd

diff --cc packaging/msg-service.spec
index 0628010,3741939..122c6d8
mode 100644,100755..100644
--- 1/packaging/msg-service.spec
--- 2/packaging/msg-service.spec
+++ b/packaging/msg-service.spec
@@@ -207,17 -205,21 +207,22 @@@ chmod 660 /opt/usr/dbspace/.msg_service
  mkdir -p /opt/usr/data/msg-service
  chgrp db_msg_service /opt/usr/data/msg-service
  
+ if [ -f /usr/lib/rpm-plugins/msm.so ]
+ then
+       chsmack -a 'msg-service::db' /opt/usr/dbspace/.msg_service.db*
+ fi
+ 
  ########## Setting Config Value (Internal keys) ##########
 +vcuid=5000
  # Message Server Status
 -vconftool set -t bool memory/msg/ready 0 -i -g 5000
 +vconftool set -t bool memory/msg/ready 0 -i -g 5000 -u $vcuid
  
  # SMS Send Options
 -vconftool set -t int db/msg/network_mode 2
 +vconftool set -t int db/msg/network_mode 2 -u $vcuid
  
  # New Message Count
 -vconftool set -t int db/msg/recv_sms 0
 -vconftool set -t int db/msg/recv_mms 0
 +vconftool set -t int db/msg/recv_sms 0 -u $vcuid
 +vconftool set -t int db/msg/recv_mms 0 -u $vcuid
  
  ########## Setting Config Value (Private keys) ##########
  # General Options