update 3.11.0.1061

2 files changed, 26 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 939aa4a6b44a..96aa080b4d66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = esteidpkcs11loader
-	pkgdesc = Loads PKCS11 module for web authentication with smart cards
-	pkgver = 3.8.0.1052
+	pkgdesc = Firefox PKCS#11 module loader
+	pkgver = 3.11.0.1061
 	pkgrel = 1
 	url = http://www.id.ee/
 	arch = any
@@ -9,14 +9,12 @@ pkgbase = esteidpkcs11loader
 	makedepends = unzip
 	makedepends = zip
 	depends = opensc
-	depends = esteidcerts
+	depends = pcsclite
 	depends = ccid
 	conflicts = esteid-browser-plugin-svn
 	conflicts = sk-esteidpkcs11loader-svn
-	source = https://installer.id.ee/media/sources/esteidpkcs11loader-3.8.0.1052.tar.gz
-	source = https://installer.id.ee/media/sources/esteidpkcs11loader-3.8.0.1052.tar.gz.asc
-	sha256sums = 331d7fb59554a4cf7c3cce8a263e5248476d994e3124f0b5adc06ba3cad1b091
-	sha256sums = SKIP
+	source = https://installer.id.ee/media/ubuntu/pool/main/e/esteidpkcs11loader/esteidpkcs11loader_3.11.0.1061.orig.tar.xz
+	sha256sums = c06c36f090d4afdf84135792065ca3201d58e6d73732711cc64b4dabc351e168
 
 pkgname = esteidpkcs11loader
 
diff --git a/PKGBUILD b/PKGBUILD
index 58546b6423f7..d4bd3b09a0f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,34 @@
 # Maintainer: kevku <kevku@gmx.com>
 pkgname=esteidpkcs11loader
 _browser=firefox
-pkgver=3.8.0.1052
+pkgver=3.11.0.1061
 pkgrel=1
-pkgdesc="Loads PKCS11 module for web authentication with smart cards"
+pkgdesc="Firefox PKCS#11 module loader"
 arch=('any')
 url="http://www.id.ee/"
 license=('LGPL')
-depends=('opensc' 'esteidcerts' 'ccid')
+depends=('opensc' 'pcsclite' 'ccid')
 makedepends=('cmake' 'unzip' 'zip')
 conflicts=('esteid-browser-plugin-svn' 'sk-esteidpkcs11loader-svn')
-source=("https://installer.id.ee/media/sources/$pkgname-$pkgver.tar.gz"
-	"https://installer.id.ee/media/sources/$pkgname-$pkgver.tar.gz.asc")
-sha256sums=('331d7fb59554a4cf7c3cce8a263e5248476d994e3124f0b5adc06ba3cad1b091'
-            'SKIP')
+source=("https://installer.id.ee/media/ubuntu/pool/main/e/$pkgname/${pkgname}_$pkgver.orig.tar.xz")
+sha256sums=('c06c36f090d4afdf84135792065ca3201d58e6d73732711cc64b4dabc351e168')
 validpgpkeys=('43650273CE9516880D7EB581B339B36D592073D4')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR="lib" -DCMAKE_INSTALL_SYSCONFDIR="/etc"
-  make
-}
-
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mkdir -p "$pkgdir/usr/lib/$_browser/browser/extensions"
-  cp -r "{aa84ce40-4253-a00a-8cd6-0800200f9a66}" "$pkgdir/usr/lib/$_browser/browser/extensions/"
+  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}"
+  
 }