Install the missing certs since the app doesn't use the system ones.

Also add 2 small fixes for hardcoded paths.

4 files changed, 49 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8db686430b88..6f71191992da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cartaodecidadao
 	pkgdesc = Portuguese Citizen Card Application
 	pkgver = 2.4.0.4973
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.cartaodecidadao.pt/
 	arch = i686
 	arch = x86_64
@@ -21,8 +21,12 @@ pkgbase = cartaodecidadao
 	optdepends = autenticacao-gov-pt: Necessário para autenticações online
 	optdepends = cartaodecidadao-pki: PKI que confirma a validade dos certificados dos CC
 	optdepends = ecce-gov-pt-certificates: Certificados da ECCE (quem assina dos certificados contidos em cartaodecidadao-pki)
-	source = svn+https://svn.gov.pt/projects/ccidadao/repository/middleware-offline/tags/version2.4.0.4973-4973/source/_src/eidmw
+	source = svn+https://svn.gov.pt/projects/ccidadao/repository/middleware-offline/tags/version2.4.0-4973/source/_src/eidmw
+	source = 00-fix_certs_path.patch
+	source = 01-fix_pteiddialogsQTsrv_path.patch
 	sha512sums = SKIP
+	sha512sums = 0c2e434ee00d0b0b3f40d32bd7926d43332d9b1a0adb8d1ef53bd0a357caff92765ab6081207051ef94b7e5ad6800031573bfdb5ed9b45c956414ab6e2f89571
+	sha512sums = f47e75015582fddd0e97995ec27103fd26e5c72e987dc927cbbc0cd152522579115f3853bf727f4090b4689861fc7a9803c00ce1776b701d2a595c692fed1eb2
 
 pkgname = cartaodecidadao
 
diff --git a/00-fix_certs_path.patch b/00-fix_certs_path.patch
new file mode 100644
index 000000000000..bf30566f2806
--- /dev/null
+++ b/00-fix_certs_path.patch
@@ -0,0 +1,17 @@
+--- common/ConfigCommon.cpp	2017-06-07 21:01:25.043207000 +0100
++++ common/ConfigCommon_fixed.cpp	2017-09-22 20:53:16.693678311 +0100
+@@ -30,12 +30,12 @@
+ #ifdef WIN32

+   const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR   = {EIDMW_CNF_SECTION_GENERAL, EIDMW_CNF_GENERAL_CERTSDIR,   L"$home" WDIRSEP L"eidstore" WDIRSEP L"certs"};

+ #else

+-  const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR 	=	{EIDMW_CNF_SECTION_GENERAL,	EIDMW_CNF_GENERAL_CERTSDIR,  WDIRSEP L"usr" WDIRSEP L"local" WDIRSEP L"share" WDIRSEP L"certs" WDIRSEP};

++  const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR 	=	{EIDMW_CNF_SECTION_GENERAL,	EIDMW_CNF_GENERAL_CERTSDIR,  WDIRSEP L"usr" WDIRSEP L"share" WDIRSEP L"cartaodecidadao" WDIRSEP L"certs" WDIRSEP};

+ #endif

+ #ifdef WIN32

+   const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR_TEST  = {EIDMW_CNF_SECTION_GENERAL, EIDMW_CNF_GENERAL_CERTSDIR_TEST,   L"$home" WDIRSEP L"eidstore" WDIRSEP L"certs_test"};

+ #else

+-  const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR_TEST   = {EIDMW_CNF_SECTION_GENERAL, EIDMW_CNF_GENERAL_CERTSDIR_TEST,  WDIRSEP L"usr" WDIRSEP L"local" WDIRSEP L"share" WDIRSEP L"certs_test" WDIRSEP};

++  const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR_TEST   = {EIDMW_CNF_SECTION_GENERAL, EIDMW_CNF_GENERAL_CERTSDIR_TEST,  WDIRSEP L"usr" WDIRSEP L"share" WDIRSEP L"cartaodecidado" WDIRSEP L"certs_test" WDIRSEP};

+ #endif

+ 

+   const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_LANGUAGE	 	=	{EIDMW_CNF_SECTION_GENERAL,	EIDMW_CNF_GENERAL_LANGUAGE,		L"nl"};

diff --git a/01-fix_pteiddialogsQTsrv_path.patch b/01-fix_pteiddialogsQTsrv_path.patch
new file mode 100644
index 000000000000..549a6bc0be24
--- /dev/null
+++ b/01-fix_pteiddialogsQTsrv_path.patch
@@ -0,0 +1,11 @@
+--- dialogs/dialogsQT/dlgs.cpp	2017-06-07 21:01:25.043207000 +0100
++++ dialogs/dialogsQT/dlgs_fixed.cpp	2017-09-22 21:03:43.806012101 +0100
+@@ -431,7 +431,7 @@
+   char csCommand[150];
+   Type_WndGeometry *pWndGeometry = (Type_WndGeometry *)wndGeometry;
+ 
+-  sprintf(csCommand,"%s/%s %i %s", "/usr/local/bin", csServerName.c_str(),index,csFilename );
++  sprintf(csCommand,"%s/%s %i %s", "/usr/bin", csServerName.c_str(),index,csFilename );
+ 
+   if  ( ( pWndGeometry != NULL )
+         && ( pWndGeometry->x >= 0 ) && ( pWndGeometry->y >= 0 )
diff --git a/PKGBUILD b/PKGBUILD
index dd3d792ffff3..17fd93a5955b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,8 @@
 pkgname=cartaodecidadao
 pkgver=2.4.0.4973
 _rev=${pkgver##*.}
-pkgrel=1
+_ver=${pkgver%.*}
+pkgrel=2
 pkgdesc="Portuguese Citizen Card Application"
 arch=('i686' 'x86_64')
 url="http://www.cartaodecidadao.pt/"
@@ -22,9 +23,13 @@ optdepends=('autenticacao-gov-pt: Necessário para autenticações online'
             'cartaodecidadao-pki: PKI que confirma a validade dos certificados dos CC'
             'ecce-gov-pt-certificates: Certificados da ECCE (quem assina dos certificados contidos em cartaodecidadao-pki)')
 
-source=("svn+https://svn.gov.pt/projects/ccidadao/repository/middleware-offline/tags/version${pkgver}-${_rev}/source/_src/eidmw")
+source=("svn+https://svn.gov.pt/projects/ccidadao/repository/middleware-offline/tags/version${_ver}-${_rev}/source/_src/eidmw"
+        "00-fix_certs_path.patch"
+        "01-fix_pteiddialogsQTsrv_path.patch")
 
-sha512sums=('SKIP')
+sha512sums=('SKIP'
+            '0c2e434ee00d0b0b3f40d32bd7926d43332d9b1a0adb8d1ef53bd0a357caff92765ab6081207051ef94b7e5ad6800031573bfdb5ed9b45c956414ab6e2f89571'
+            'f47e75015582fddd0e97995ec27103fd26e5c72e987dc927cbbc0cd152522579115f3853bf727f4090b4689861fc7a9803c00ce1776b701d2a595c692fed1eb2')
 
 prepare() {
 	chmod +x ${srcdir}/eidmw/configure
@@ -36,6 +41,10 @@ prepare() {
 	sed -i -e "s|local/||g" ${srcdir}/eidmw/pteid-poppler/poppler/Makefile
 
 	sed -i -e "/^INSTALLS/d" ${srcdir}/eidmw/eidmw.pro
+
+	cd ${srcdir}/eidmw
+	patch -p0 < ${srcdir}/00-fix_certs_path.patch
+	patch -p0 < ${srcdir}/01-fix_pteiddialogsQTsrv_path.patch
 }
 
 build() {
@@ -71,4 +80,7 @@ package() {
 
 	# Install MIME Types
 	install -Dm644 ${srcdir}/eidmw/debian/pteid-mw.sharedmimeinfo ${pkgdir}/usr/share/mime/packages/pteid-mw.xml
+
+	# Install certificates
+	install -Dm644 -t ${pkgdir}/usr/share/${pkgname}/certs/ ${srcdir}/eidmw/misc/certs/*
 }