update 3.13.0.1074

2 files changed, 17 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fdf178f153cd..ee30bc4b196d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = esteidpkcs11loader
 	pkgdesc = Firefox PKCS#11 module loader
-	pkgver = 3.12.0.1068
+	pkgver = 3.13.0.1074
 	pkgrel = 1
 	url = http://www.id.ee/
 	arch = any
@@ -12,8 +12,8 @@ pkgbase = esteidpkcs11loader
 	depends = pcsclite
 	depends = ccid
 	optdepends = chrome-token-signing: signing for firefox 52+
-	source = https://installer.id.ee/media/ubuntu/pool/main/e/esteidpkcs11loader/esteidpkcs11loader_3.12.0.1068.orig.tar.xz
-	sha256sums = 37ae461a5ea5cf138b9607898ff9545f0665ea5da0023514376fba717337ff29
+	source = https://installer.id.ee/media/ubuntu/pool/main/f/firefox-pkcs11-loader/firefox-pkcs11-loader_3.13.0.1074.orig.tar.xz
+	sha256sums = 980349a56fc1b8fc236a571b18b15c2227a6c4ded28aa360368ba9b2038de57f
 
 pkgname = esteidpkcs11loader
 
diff --git a/PKGBUILD b/PKGBUILD
index 81a527c4503e..8386e6ec9c8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: kevku <kevku@gmx.com>
 pkgname=esteidpkcs11loader
+_name=firefox-pkcs11-loader
 _browser=firefox
-pkgver=3.12.0.1068
+pkgver=3.13.0.1074
 pkgrel=1
 pkgdesc="Firefox PKCS#11 module loader"
 arch=('any')
@@ -10,24 +11,18 @@ license=('LGPL')
 depends=('opensc' 'pcsclite' 'ccid')
 optdepends=('chrome-token-signing: signing for firefox 52+')
 makedepends=('cmake' 'unzip' 'zip')
-source=("https://installer.id.ee/media/ubuntu/pool/main/e/$pkgname/${pkgname}_$pkgver.orig.tar.xz")
-sha256sums=('37ae461a5ea5cf138b9607898ff9545f0665ea5da0023514376fba717337ff29')
+source=("https://installer.id.ee/media/ubuntu/pool/main/f/$_name/${_name}_$pkgver.orig.tar.xz")
+sha256sums=('980349a56fc1b8fc236a571b18b15c2227a6c4ded28aa360368ba9b2038de57f')
 
-package() {
-  cd "$srcdir/"
-
-  install -Dm644 "chrome/content/browser.xul" "$pkgdir/usr/share/xul-ext/esteidpkcs11loader/chrome/content/browser.xul"
-  install -Dm644 "chrome/content/id-32.png" "$pkgdir/usr/share/xul-ext/esteidpkcs11loader/chrome/content/id-32.png"
-  install -Dm644 "chrome/content/pkcs11-loader.js" "$pkgdir/usr/share/xul-ext/esteidpkcs11loader/chrome/content/pkcs11-loader.js"
-
-  install -Dm644 "META-INF/manifest.mf" "$pkgdir/usr/share/xul-ext/esteidpkcs11loader/META-INF/manifest.mf"
-  install -Dm644 "META-INF/mozilla.rsa" "$pkgdir/usr/share/xul-ext/esteidpkcs11loader/META-INF/mozilla.rsa"
-  install -Dm644 "META-INF/mozilla.sf" "$pkgdir/usr/share/xul-ext/esteidpkcs11loader/META-INF/mozilla.sf"
-
-  install -Dm644 "chrome.manifest" "$pkgdir/usr/share/xul-ext/esteidpkcs11loader/chrome.manifest"
-  install -Dm644 "install.rdf" "$pkgdir/usr/share/xul-ext/esteidpkcs11loader/install.rdf"
-
-  mkdir -p "$pkgdir/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-  ln -sf "/usr/share/xul-ext/esteidpkcs11loader" "$pkgdir/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{aa84ce40-4253-a00a-8cd6-0800200f9a67}"
+build() {
+  cd "$srcdir"
+  cmake . -DCMAKE_INSTALL_PREFIX="/usr" \
+          -DCMAKE_INSTALL_LIBDIR="lib" \
+          -DCMAKE_INSTALL_SYSCONFDIR="/etc"
+  make
+}
 
+package() {
+  cd "$srcdir"
+  make DESTDIR="$pkgdir/" install
 }