4 files changed, 73 insertions, 16 deletions
diff --git a/packaging/non-tz-secure-storage.service b/packaging/non-tz-secure-storage.service
new file mode 100755
index 0000000..066f423
--- /dev/null
+++ b/packaging/non-tz-secure-storage.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Start the Secure Storage server
+After=csa.mount
+Requires=security-server.socket 
+
+[Service]
+ExecStart=/usr/bin/ss-server
+Restart=always
+RestartSec=0
+
+[Install]
+WantedBy=multi-user.target
diff --git a/packaging/secure-storage.service b/packaging/secure-storage.service
new file mode 100755
index 0000000..68f6c92
--- /dev/null
+++ b/packaging/secure-storage.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Start the Secure Storage server
+After=csa.mount samsung-secure-storage.service
+Requires=security-server.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/ss-server
+Sockets=ss-server.socket
+Restart=always
+RestartSec=0
+
+[Install]
+WantedBy=multi-user.target
diff --git a/packaging/secure-storage.spec b/packaging/secure-storage.spec
index 9b3d37b..bae1dc3 100644..100755
--- a/packaging/secure-storage.spec
+++ b/packaging/secure-storage.spec
@@ -1,16 +1,24 @@
 Name:       secure-storage
 Summary:    Secure storage
-Version:    0.12.9
-Release:    4
+Version:    0.12.12
+Release:    1
 Group:      System/Security
-License:    Apache-2.0
+License:    Apache 2.0
 Source0:    secure-storage-%{version}.tar.gz
+Source1:    non-tz-secure-storage.service
+Source2:    ss-server.socket
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  pkgconfig(security-server)
 BuildRequires:  cmake
-BuildRequires:  pkgconfig(dukgenerator)
+BuildRequires:  libcryptsvc-devel
+BuildRequires:	pkgconfig(dukgenerator)
+BuildRequires:  pkgconfig(db-util)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(vconf)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(capi-base-common)
 
 %description
 Secure storage package
@@ -19,7 +27,8 @@ Secure storage package
 Summary:    Secure storage  (client)
 Group:      Development/Libraries
 Provides:   libss-client.so
-Requires:   dukgenerator
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description -n libss-client
 Secure storage package (client)
@@ -40,6 +49,7 @@ Requires(post):  /usr/bin/systemctl
 Requires(postun): /usr/bin/systemctl
 Requires:   systemd
 Requires:   libss-client = %{version}-%{release}
+Requires:   libcryptsvc
 
 %description -n ss-server
 Secure storage package (ss-server)
@@ -49,23 +59,34 @@ Secure storage package (ss-server)
 
 
 %build
-%cmake .
+
+export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
+export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
+export CFLAGS="$CFLAGS -DSECURE_STORAGE_DEBUG_ENABLE"
+export CXXFLAGS="$CXXFLAGS -DSECURE_STORAGE_DEBUG_ENABLE"
+export FFLAGS="$FFLAGS -DSECURE_STORAGE_DEBUG_ENABLE"
+
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 
 
 make %{?jobs:-j%jobs}
 
 %install
+rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants
-mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/sockets.target.wants
-ln -s ../secure-storage.service %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/secure-storage.service
-ln -s ../secure-storage.socket %{buildroot}%{_prefix}/lib/systemd/system/sockets.target.wants/secure-storage.socket
+mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+mkdir -p %{buildroot}%{_libdir}/systemd/system/sockets.target.wants
+
+install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/secure-storage.service
+install -m 0644 %{SOURCE2} %{buildroot}%{_libdir}/systemd/system/
+ln -s ../secure-storage.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/
+ln -s ../ss-server.socket %{buildroot}%{_libdir}/systemd/system/sockets.target.wants/
 
 mkdir -p %{buildroot}/usr/share/license
 cp LICENSE.APLv2 %{buildroot}/usr/share/license/ss-server
 cp LICENSE.APLv2 %{buildroot}/usr/share/license/libss-client
-cp LICENSE.APLv2 %{buildroot}/usr/share/license/libss-client-devel
 
 %preun -n ss-server
 if [ $1 == 0 ]; then
@@ -89,10 +110,10 @@ systemctl daemon-reload
 %manifest ss-server.manifest
 %defattr(-,root,root,-)
 %{_bindir}/ss-server
-%{_prefix}/lib/systemd/system/secure-storage.service
-%{_prefix}/lib/systemd/system/multi-user.target.wants/secure-storage.service
-%{_prefix}/lib/systemd/system/secure-storage.socket
-%{_prefix}/lib/systemd/system/sockets.target.wants/secure-storage.socket
+%{_libdir}/systemd/system/secure-storage.service
+%{_libdir}/systemd/system/ss-server.socket
+%{_libdir}/systemd/system/multi-user.target.wants/secure-storage.service
+%{_libdir}/systemd/system/sockets.target.wants/ss-server.socket
 %{_datadir}/secure-storage/config
 /usr/share/license/ss-server
 
@@ -101,11 +122,11 @@ systemctl daemon-reload
 %defattr(-,root,root)
 %{_libdir}/libss-client.so.*
 /usr/share/license/libss-client
+/opt/share/secure-storage/salt/*
 
 %files -n libss-client-devel
 %defattr(-,root,root,-)
 %{_includedir}/ss_manager.h
 %{_libdir}/pkgconfig/secure-storage.pc
 %{_libdir}/libss-client.so
-/usr/share/license/libss-client-devel
 
diff --git a/packaging/ss-server.socket b/packaging/ss-server.socket
new file mode 100644
index 0000000..893926f
--- /dev/null
+++ b/packaging/ss-server.socket
@@ -0,0 +1,10 @@
+[Socket]
+ListenStream=/tmp/SsSocket
+SocketMode=0777
+SmackLabelIPIn=*
+SmackLabelIPOut=@
+
+Service=secure-storage.service
+
+[Install]
+WantedBy=sockets.target