Add multi-user support

Certificates have been moved from the user-related location
/opt/usr/share to the global location TZ_SYS_SHARE. Permissions have
been kept to (root,root).

Also set a valid group tag.

Bug-Tizen: PTREL-252
Change-Id: I2b20364e233a9b8d97edb398a42cc202fcda982f
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/packaging/hash-signer.spec b/packaging/hash-signer.spec
index 82aa57c..4fc9a61 100644 (file)
--- a/packaging/hash-signer.spec
+++ b/packaging/hash-signer.spec
@@ -1,11 +1,12 @@
 Name:       hash-signer
 Summary:    Commandline tool for Tizen Signing
 Version:    0.0.1
-Release:    2
-Group:      Productivity/Security
+Release:    0
+Group:      Security/Development
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires: xmlsec1
+BuildRequires: libtzplatform-config-devel
 Requires:   xmlstarlet
 Requires:   xmlsec1
 Requires:   zip
@@ -23,15 +24,15 @@ files in OBS/GBS build time. Refer to signature spec  http://www.w3.org/TR/widge
 %install
 rm -rf %{buildroot}
 
-mkdir -p %{buildroot}/opt/usr/share/certs/signer
-cp -arf certificates/* %{buildroot}/opt/usr/share/certs/signer/
-mkdir -p %{buildroot}/usr/bin
-cp -arf tools/* %{buildroot}/usr/bin/
-mkdir -p %{buildroot}/etc/rpm
-cp -arf macros/* %{buildroot}/etc/rpm/
+mkdir -p %{buildroot}%{TZ_SYS_SHARE}/certs/signer
+cp -arf certificates/* %{buildroot}%{TZ_SYS_SHARE}/certs/signer/
+mkdir -p %{buildroot}%{_bindir}
+cp -arf tools/* %{buildroot}%{_bindir}/
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+cp -arf macros/* %{buildroot}%{_sysconfdir}/rpm/
 
 %files
 %defattr(-,root,root,-)
-/opt/usr/share/certs/signer/*
-/usr/bin/*
-/etc/rpm/*
+%{TZ_SYS_SHARE}/certs/signer/*
+%{_bindir}/*
+%{_sysconfdir}/rpm/*

diff --git a/tools/hash-signer.sh b/tools/hash-signer.sh
index 89b1ad5..f069838 100755 (executable)
--- a/tools/hash-signer.sh
+++ b/tools/hash-signer.sh
@@ -1,10 +1,13 @@
-#/bin/bash
+#!/bin/bash
+
+# Set the TZ_XXX_YYY variables required for multi-user support
+source /etc/tizen-platform.conf
 
 generateAuthorSig=0
 generateDistSig=0
 baseDir="./"
 privilegeLevel="public"
-authSignCert="/opt/usr/share/certs/signer/tizen_author.p12"
+authSignCert="$TZ_SYS_SHARE/certs/signer/tizen_author.p12"
 authSignCertPwd="tizenauthor"
 distSignCertPwd="tizenpkcs12passfordsigner"
 buildRootDir=""
@@ -38,14 +41,14 @@ do
        if [ "$privilegeLevel" == "partner" ]
        then
                echo "Sign as partner level"
-               distSignCert="/opt/usr/share/certs/signer/tizen-distributor-partner-signer.p12"
+               distSignCert="$TZ_SYS_SHARE/certs/signer/tizen-distributor-partner-signer.p12"
        elif [ "$privilegeLevel" == "platform" ]
        then
                echo "Sign as platform level"
-               distSignCert="/opt/usr/share/certs/signer/tizen-distributor-partner-manufacturer-signer.p12"
+               distSignCert="$TZ_SYS_SHARE/certs/signer/tizen-distributor-partner-manufacturer-signer.p12"
        else
                echo "Sign as public level"
-               distSignCert="/opt/usr/share/certs/signer/tizen-distributor-public-signer.p12"
+               distSignCert="$TZ_SYS_SHARE/certs/signer/tizen-distributor-public-signer.p12"
        fi
 
        if test "$generateAuthorSig" != "0"