diff options
author | José Bollo <jose.bollo@open.eurogiciel.org> | 2014-12-17 12:47:49 +0100 |
---|---|---|
committer | José Bollo <jose.bollo@open.eurogiciel.org> | 2014-12-17 12:47:49 +0100 |
commit | 0333a2cd544783a3c081e99086fa6f5f8c86eb17 (patch) | |
tree | ff6532e6475958dac6655bf6baeb63cfb16c9dba | |
parent | 791cc91d8ee4529f322bc152d60afc13c1f858da (diff) | |
download | key-manager-tizen_3.0.2015.q1_common.tar.gz key-manager-tizen_3.0.2015.q1_common.tar.bz2 key-manager-tizen_3.0.2015.q1_common.zip |
Fix packaging issues and warningstizen_3.0_ivi_releasesubmit/tizen_wearable/20150127.000000submit/tizen_tv/20150320.000001submit/tizen_tv/20150130.050505submit/tizen_tv/20150130.000000submit/tizen_mobile/20150325.000000submit/tizen_mobile/20150223.000000submit/tizen_mobile/20150213.000000submit/tizen_mobile/20150129.000000submit/tizen_ivi/20141225.222222submit/tizen_common/20141218.170927accepted/tizen/wearable/20150128.040554accepted/tizen/tv/20150324.014506accepted/tizen/mobile/20150326.005109accepted/tizen/ivi/20141225.103510accepted/tizen/common/20141218.172516tizen_3.0_ivitizen_3.0.2015.q1_commontizen_3.0.2014.q4_common
The packaging was broken in 64 bits. To correct,
the use of %_unitdir is introduced.
Also, the new compiling flags was pointing out that
some variables was potentially not initialized. It is
wrong but now variables are initialized and the compiler
is muted.
Change-Id: Ib44390b1c548d6ddfb9b17acaa10ee5bbb3fe7f9
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
-rw-r--r-- | packaging/key-manager.spec | 44 | ||||
-rw-r--r-- | src/manager/sqlcipher/sqlcipher.c | 4 |
2 files changed, 26 insertions, 22 deletions
diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec index 3ceaa289..3541a92b 100644 --- a/packaging/key-manager.spec +++ b/packaging/key-manager.spec @@ -68,13 +68,13 @@ Requires: libkey-manager-client = %{version}-%{release} Central Key Manager package (client-devel) %package -n key-manager-tests -Summary: internal test for key-manager +Summary: Internal test for key-manager Group: Development Requires: boost-test Requires: key-manager = %{version}-%{release} %description -n key-manager-tests -Internal test for key-manager +Internal test for key-manager packages %prep %setup -q @@ -107,13 +107,13 @@ cp LICENSE %{buildroot}/usr/share/license/libkey-manager-control-client mkdir -p %{buildroot}/etc/security/ %make_install -mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants -mkdir -p %{buildroot}/usr/lib/systemd/system/sockets.target.wants -ln -s ../central-key-manager.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/central-key-manager.service -ln -s ../central-key-manager-listener.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/central-key-manager-listener.service -ln -s ../central-key-manager-api-control.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/central-key-manager-api-control.socket -ln -s ../central-key-manager-api-storage.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/central-key-manager-api-storage.socket -ln -s ../central-key-manager-api-ocsp.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/central-key-manager-api-ocsp.socket +mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants +mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants +ln -s ../central-key-manager.service %{buildroot}%{_unitdir}/multi-user.target.wants/central-key-manager.service +ln -s ../central-key-manager-listener.service %{buildroot}%{_unitdir}/multi-user.target.wants/central-key-manager-listener.service +ln -s ../central-key-manager-api-control.socket %{buildroot}%{_unitdir}/sockets.target.wants/central-key-manager-api-control.socket +ln -s ../central-key-manager-api-storage.socket %{buildroot}%{_unitdir}/sockets.target.wants/central-key-manager-api-storage.socket +ln -s ../central-key-manager-api-ocsp.socket %{buildroot}%{_unitdir}/sockets.target.wants/central-key-manager-api-ocsp.socket %clean rm -rf %{buildroot} @@ -143,6 +143,10 @@ if [ $1 = 0 ]; then systemctl daemon-reload fi +%post -n libkey-manager-common -p /sbin/ldconfig + +%postun -n libkey-manager-common -p /sbin/ldconfig + %post -n libkey-manager-client -p /sbin/ldconfig %postun -n libkey-manager-client -p /sbin/ldconfig @@ -173,22 +177,22 @@ fi %files -n key-manager %manifest key-manager.manifest %{_bindir}/key-manager -%{_libdir}/systemd/system/multi-user.target.wants/central-key-manager.service -%{_libdir}/systemd/system/central-key-manager.service -%{_libdir}/systemd/system/central-key-manager.target -%{_libdir}/systemd/system/sockets.target.wants/central-key-manager-api-control.socket -%{_libdir}/systemd/system/central-key-manager-api-control.socket -%{_libdir}/systemd/system/sockets.target.wants/central-key-manager-api-storage.socket -%{_libdir}/systemd/system/central-key-manager-api-storage.socket -%{_libdir}/systemd/system/sockets.target.wants/central-key-manager-api-ocsp.socket -%{_libdir}/systemd/system/central-key-manager-api-ocsp.socket +%{_unitdir}/multi-user.target.wants/central-key-manager.service +%{_unitdir}/central-key-manager.service +%{_unitdir}/central-key-manager.target +%{_unitdir}/sockets.target.wants/central-key-manager-api-control.socket +%{_unitdir}/central-key-manager-api-control.socket +%{_unitdir}/sockets.target.wants/central-key-manager-api-storage.socket +%{_unitdir}/central-key-manager-api-storage.socket +%{_unitdir}/sockets.target.wants/central-key-manager-api-ocsp.socket +%{_unitdir}/central-key-manager-api-ocsp.socket %{_datadir}/license/%{name} %files -n key-manager-listener %manifest key-manager-listener.manifest %{_bindir}/key-manager-listener -%{_libdir}/systemd/system/multi-user.target.wants/central-key-manager-listener.service -%{_libdir}/systemd/system/central-key-manager-listener.service +%{_unitdir}/multi-user.target.wants/central-key-manager-listener.service +%{_unitdir}/central-key-manager-listener.service %files -n libkey-manager-common %manifest libkey-manager-common.manifest diff --git a/src/manager/sqlcipher/sqlcipher.c b/src/manager/sqlcipher/sqlcipher.c index a3a430e1..69e2822e 100644 --- a/src/manager/sqlcipher/sqlcipher.c +++ b/src/manager/sqlcipher/sqlcipher.c @@ -57001,8 +57001,8 @@ static void checkPtrmap( char *zContext /* Context description (used for error msg) */ ){ int rc; - u8 ePtrmapType; - Pgno iPtrmapParent; + u8 ePtrmapType = 0; + Pgno iPtrmapParent = 0; rc = ptrmapGet(pCheck->pBt, iChild, &ePtrmapType, &iPtrmapParent); if( rc!=SQLCIPHER_OK ){ |