upgpkg: autofirma-git r6849.71b0ed32a-1

Fixed build

3 files changed, 13 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49b69af79d74..f46911be30e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = autofirma-git
 	pkgdesc = Cliente de firma electrónica ofrecido por la Administración Pública
-	pkgver = r6411.52b796b29
+	pkgver = r6849.71b0ed32a
 	pkgrel = 1
 	url = https://firmaelectronica.gob.es/
 	arch = any
-	license = GPL
-	license = custom:EUPL
+	license = GPL-2.0-or-later AND EUPL-1.1
 	makedepends = git
 	makedepends = java-environment=11
 	makedepends = maven
@@ -13,16 +12,14 @@ pkgbase = autofirma-git
 	conflicts = autofirma
 	conflicts = autofirma-bin
 	source = clienteafirma::git+https://github.com/ctt-gob-es/clienteafirma.git
-	source = jmulticard::git+https://github.com/ctt-gob-es/jmulticard.git
-	source = jmulticard-73011ff9965d8b45ae1d9cd2f99de3452a0cba47.tar.gz::https://github.com/ctt-gob-es/jmulticard/archive/73011ff9965d8b45ae1d9cd2f99de3452a0cba47.tar.gz
+	source = clienteafirma-external::git+https://github.com/ctt-gob-es/clienteafirma-external.git
 	source = autofirma
 	source = autofirma.desktop
 	source = autofirma.js
 	source = autofirma.svg
-	source = eupl-1.1.txt
+	source = EUPL-1.1.txt
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = c3c42899b3edbfdb0a03990a50d64ab7831c0d0b3e448e79f21083e3b8b3df66941ea165e1fc92adcc5a0990469791dae7b8027c03f83c463a542a4179870db2
 	b2sums = 2eca1245aa7e44228fac9fbb871b90d765402ebdfeaa476fa807e7bdaedb039353980c5fdfaf560ecc943386bbee90d4ae048b85b516b4653bf699328d10fc87
 	b2sums = cbedb1aff6ea64e44569d4a3249bd3707a5bc2fadf956ab27f62a71198cfed3f07170f40965bbbd2b4b9a587d165fe8b6a19c3f85aa87eaf8c5897d899d9b6e8
 	b2sums = 835597fed89382057b48f01537dacc43aeef342372678fbeb6d486c6cded7ee41911b910e200e7c1c34bd1cbb0e25854e6e56dea68115bcde759b84d2d0a6147
diff --git a/eupl-1.1.txt b/EUPL-1.1.txt
index 94264b894105..94264b894105 100644
--- a/eupl-1.1.txt
+++ b/EUPL-1.1.txt
diff --git a/PKGBUILD b/PKGBUILD
index 2a637001cd93..0a5cc72cad28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,25 @@
 # Maintainer: "Amhairghin" Oscar Garcia Amor (https://ogarcia.me)
 
 _pkgname=clienteafirma
-# FIX: https://github.com/ctt-gob-es/clienteafirma/issues/223
-_jmulticard_commit=73011ff9965d8b45ae1d9cd2f99de3452a0cba47
-# FIX: end 223
 pkgname=autofirma-git
-pkgver=r6411.52b796b29
+pkgver=r6849.71b0ed32a
 pkgrel=1
 pkgdesc='Cliente de firma electrónica ofrecido por la Administración Pública'
 arch=('any')
 url='https://firmaelectronica.gob.es/'
-license=('GPL' 'custom:EUPL')
+license=('GPL-2.0-or-later AND EUPL-1.1')
 depends=('java-runtime=11')
 makedepends=('git' 'java-environment=11' 'maven')
 conflicts=('autofirma' 'autofirma-bin')
 source=("${_pkgname}::git+https://github.com/ctt-gob-es/${_pkgname}.git"
-        "jmulticard::git+https://github.com/ctt-gob-es/jmulticard.git"
-        "jmulticard-${_jmulticard_commit}.tar.gz::https://github.com/ctt-gob-es/jmulticard/archive/${_jmulticard_commit}.tar.gz"
+        "${_pkgname}-external::git+https://github.com/ctt-gob-es/${_pkgname}-external.git"
         "autofirma"
         "autofirma.desktop"
         "autofirma.js"
         "autofirma.svg"
-        "eupl-1.1.txt")
+        "EUPL-1.1.txt")
 b2sums=('SKIP'
         'SKIP'
-        'c3c42899b3edbfdb0a03990a50d64ab7831c0d0b3e448e79f21083e3b8b3df66941ea165e1fc92adcc5a0990469791dae7b8027c03f83c463a542a4179870db2'
         '2eca1245aa7e44228fac9fbb871b90d765402ebdfeaa476fa807e7bdaedb039353980c5fdfaf560ecc943386bbee90d4ae048b85b516b4653bf699328d10fc87'
         'cbedb1aff6ea64e44569d4a3249bd3707a5bc2fadf956ab27f62a71198cfed3f07170f40965bbbd2b4b9a587d165fe8b6a19c3f85aa87eaf8c5897d899d9b6e8'
         '835597fed89382057b48f01537dacc43aeef342372678fbeb6d486c6cded7ee41911b910e200e7c1c34bd1cbb0e25854e6e56dea68115bcde759b84d2d0a6147'
@@ -37,13 +32,10 @@ pkgver() {
 }
 
 prepare() {
-  # FIX: https://github.com/ctt-gob-es/clienteafirma/issues/223
+  # FIX: https://github.com/ctt-gob-es/clienteafirma/issues/320
   export PATH="/usr/lib/jvm/java-11-openjdk/bin/:$PATH"
-  # Fist build jmulticard 1.7
-  cd "jmulticard-${_jmulticard_commit}"
-  mvn clean install -Dmaven.test.skip=true
-  # Now build jmulticard 1.8-SNAPSHOT
-  cd "../jmulticard"
+  # Build external libraries
+  cd "${_pkgname}-external"
   mvn clean install -Dmaven.test.skip=true
   # FIX: end 223
 }
@@ -51,10 +43,6 @@ prepare() {
 build() {
   cd "${_pkgname}"
   export PATH="/usr/lib/jvm/java-11-openjdk/bin/:$PATH"
-  # FIX: https://github.com/ctt-gob-es/clienteafirma/issues/222
-  #sed -i '76d' afirma-crypto-cades/src/main/java/es/gob/afirma/signers/cades/CAdESExtraParams.java
-  #sed -i '65d' afirma-crypto-cades/src/main/java/es/gob/afirma/signers/cades/CAdESExtraParams.java
-  # FIX: end 222
   mvn clean install -Dmaven.test.skip=true
   mvn clean install -Denv=install -Dmaven.test.skip=true
 }
@@ -70,6 +58,6 @@ package() {
     "${pkgdir}/usr/share/pixmaps/autofirma.svg"
   install -Dm644 "autofirma.desktop" \
     "${pkgdir}/usr/share/applications/autofirma.desktop"
-  install -Dm644 "eupl-1.1.txt" \
-    "${pkgdir}/usr/share/licenses/autofirma/EUPL"
+  install -Dm644 "EUPL-1.1.txt" \
+    "${pkgdir}/usr/share/licenses/autofirma-git/EUPL-1.1.txt"
 }