upgpkg: autofirma 1.8-1

upstream release

2 files changed, 25 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 382eea117d31..b3167b4f9da5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = autofirma
 	pkgdesc = Cliente de firma electrónica ofrecido por la Administración Pública
-	pkgver = 1.7.2
+	pkgver = 1.8
 	pkgrel = 1
 	url = https://firmaelectronica.gob.es/
 	arch = any
@@ -11,15 +11,17 @@ pkgbase = autofirma
 	depends = java-runtime=11
 	conflicts = autofirma-bin
 	conflicts = autofirma-git
-	source = autofirma-1.7.2.tar.gz::https://github.com/ctt-gob-es/clienteafirma/archive/v1.7.2.tar.gz
-	source = jmulticard-73011ff9965d8b45ae1d9cd2f99de3452a0cba47.tar.gz::https://github.com/ctt-gob-es/jmulticard/archive/73011ff9965d8b45ae1d9cd2f99de3452a0cba47.tar.gz
+	source = autofirma-1.8.tar.gz::https://github.com/ctt-gob-es/clienteafirma/archive/v1.8.tar.gz
+	source = jmulticard-f35e2e100f1d54a675fe0df3fb67b1b97f78d6ab.tar.gz::https://github.com/ctt-gob-es/jmulticard/archive/f35e2e100f1d54a675fe0df3fb67b1b97f78d6ab.tar.gz
+	source = clienteafirma-external-1.0.4.tar.gz::https://github.com/ctt-gob-es/clienteafirma-external/archive/v1.0.4.tar.gz
 	source = autofirma
 	source = autofirma.desktop
 	source = autofirma.js
 	source = autofirma.svg
 	source = eupl-1.1.txt
-	b2sums = eb99b7da247d57302ee8232d8aabd65ddbb1c529818b08f00437d0c072522a2aa753a8aa17fd879bbfa155d1675af98cd75a1e8a7c631366e9794835fbb79db6
-	b2sums = c3c42899b3edbfdb0a03990a50d64ab7831c0d0b3e448e79f21083e3b8b3df66941ea165e1fc92adcc5a0990469791dae7b8027c03f83c463a542a4179870db2
+	b2sums = e2c007678c05955d101900ea9a9153a346f3b3e4c2cf7f6c0a8f8a2cd5e985860a2a904cca630d1cfde3c2f50acc07ab954b3254323c84f5c461f26760bd9ce9
+	b2sums = 652385cdc2f36083bb93df092a56375eea86726e94bcce21ebddc4fd70e3eeba6080f8415909183d8097464c5006f273a6346926fdf2247e9c2e95efdc8207d6
+	b2sums = c0a7faa5d8d90e87fe40ec6883089d182ffb63c51bc9060da2dfa2a8b51591b105cb8b902194f56eeaa46da020273fb912d1cfc1d54979d1aab6e6ef85bee583
 	b2sums = 2eca1245aa7e44228fac9fbb871b90d765402ebdfeaa476fa807e7bdaedb039353980c5fdfaf560ecc943386bbee90d4ae048b85b516b4653bf699328d10fc87
 	b2sums = cbedb1aff6ea64e44569d4a3249bd3707a5bc2fadf956ab27f62a71198cfed3f07170f40965bbbd2b4b9a587d165fe8b6a19c3f85aa87eaf8c5897d899d9b6e8
 	b2sums = 835597fed89382057b48f01537dacc43aeef342372678fbeb6d486c6cded7ee41911b910e200e7c1c34bd1cbb0e25854e6e56dea68115bcde759b84d2d0a6147
diff --git a/PKGBUILD b/PKGBUILD
index 3df94ef323cc..c44f28b4f677 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,13 @@
 
 _pkgname=clienteafirma
 # FIX: https://github.com/ctt-gob-es/clienteafirma/issues/223
-_jmulticard_commit=73011ff9965d8b45ae1d9cd2f99de3452a0cba47
+_jmulticard_commit=f35e2e100f1d54a675fe0df3fb67b1b97f78d6ab
 # FIX: end 223
+# FIX: https://github.com/ctt-gob-es/clienteafirma/issues/320
+_clienteafirma_external_version=1.0.4
+# FIX: end 320
 pkgname=autofirma
-pkgver=1.7.2
+pkgver=1.8
 pkgrel=1
 pkgdesc='Cliente de firma electrónica ofrecido por la Administración Pública'
 arch=('any')
@@ -18,13 +21,15 @@ makedepends=('java-environment=11' 'maven')
 conflicts=('autofirma-bin' 'autofirma-git')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ctt-gob-es/${_pkgname}/archive/v${pkgver}.tar.gz"
         "jmulticard-${_jmulticard_commit}.tar.gz::https://github.com/ctt-gob-es/jmulticard/archive/${_jmulticard_commit}.tar.gz"
+        "clienteafirma-external-${_clienteafirma_external_version}.tar.gz::https://github.com/ctt-gob-es/clienteafirma-external/archive/v${_clienteafirma_external_version}.tar.gz"
         "autofirma"
         "autofirma.desktop"
         "autofirma.js"
         "autofirma.svg"
         "eupl-1.1.txt")
-b2sums=('eb99b7da247d57302ee8232d8aabd65ddbb1c529818b08f00437d0c072522a2aa753a8aa17fd879bbfa155d1675af98cd75a1e8a7c631366e9794835fbb79db6'
-        'c3c42899b3edbfdb0a03990a50d64ab7831c0d0b3e448e79f21083e3b8b3df66941ea165e1fc92adcc5a0990469791dae7b8027c03f83c463a542a4179870db2'
+b2sums=('e2c007678c05955d101900ea9a9153a346f3b3e4c2cf7f6c0a8f8a2cd5e985860a2a904cca630d1cfde3c2f50acc07ab954b3254323c84f5c461f26760bd9ce9'
+        '652385cdc2f36083bb93df092a56375eea86726e94bcce21ebddc4fd70e3eeba6080f8415909183d8097464c5006f273a6346926fdf2247e9c2e95efdc8207d6'
+        'c0a7faa5d8d90e87fe40ec6883089d182ffb63c51bc9060da2dfa2a8b51591b105cb8b902194f56eeaa46da020273fb912d1cfc1d54979d1aab6e6ef85bee583'
         '2eca1245aa7e44228fac9fbb871b90d765402ebdfeaa476fa807e7bdaedb039353980c5fdfaf560ecc943386bbee90d4ae048b85b516b4653bf699328d10fc87'
         'cbedb1aff6ea64e44569d4a3249bd3707a5bc2fadf956ab27f62a71198cfed3f07170f40965bbbd2b4b9a587d165fe8b6a19c3f85aa87eaf8c5897d899d9b6e8'
         '835597fed89382057b48f01537dacc43aeef342372678fbeb6d486c6cded7ee41911b910e200e7c1c34bd1cbb0e25854e6e56dea68115bcde759b84d2d0a6147'
@@ -32,16 +37,24 @@ b2sums=('eb99b7da247d57302ee8232d8aabd65ddbb1c529818b08f00437d0c072522a2aa753a8a
         '2075fa9b5aba397bbd0e211a3092d21b885f6bd7c881a2ab9d9935ddf2d68d37a0a1b5159762a3cb52fb96ceb1a6cfad0051bd7255dae9b1f8ed0dda1f467674')
 
 prepare() {
+  export PATH="/usr/lib/jvm/java-11-openjdk/bin/:$PATH"
   # FIX: https://github.com/ctt-gob-es/clienteafirma/issues/223
   cd "jmulticard-${_jmulticard_commit}"
-  export PATH="/usr/lib/jvm/java-11-openjdk/bin/:$PATH"
   mvn clean install -Dmaven.test.skip=true
   # FIX: end 223
+  cd ..
+  # FIX: https://github.com/ctt-gob-es/clienteafirma/issues/320
+  cd "clienteafirma-external-${_clienteafirma_external_version}"
+  mvn clean install -Dmaven.test.skip=true
+  # FIX: end 320
 }
 
 build() {
   cd "${_pkgname}-${pkgver}"
   export PATH="/usr/lib/jvm/java-11-openjdk/bin/:$PATH"
+  # FIX: https://github.com/ctt-gob-es/clienteafirma/issues/320
+  mvn clean install -Denv=devel -Dmaven.test.skip=true
+  # FIX: end 320
   mvn clean install -Denv=install -Dmaven.test.skip=true
 }