summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
-rw-r--r--vrk-mpollux-digisign-client.install21
3 files changed, 13 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2dde10f33310..a39aab93a883 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = vrk-mpollux-digisign-client
pkgdesc = Client program for Finnish chip ID cards
- pkgver = 4.2.6_8401
+ pkgver = 4.2.6b_8414
pkgrel = 1
- epoch = 3
+ epoch = 4
url = https://dvv.fi/linux-versiot
install = vrk-mpollux-digisign-client.install
arch = x86_64
@@ -12,7 +12,7 @@ pkgbase = vrk-mpollux-digisign-client
depends = nss
backup = etc/xdg/autostart/mpollux-digisign-client.desktop
backup = etc/xdg/Fujitsu/CCryptoLib.conf
- source_x86_64 = vrk-mpollux-digisign-client-4.2.6_8401.deb::https://dvv.fi/documents/16079645/165492525/mpollux-digisign-client-for-dvv_4.2.6-8401_amd64.deb
- sha256sums_x86_64 = 5ef54dccf736e9268270720089a0b1334192a210f69bd48488e55b71fe21b72f
+ source_x86_64 = vrk-mpollux-digisign-client-4.2.6b_8414.deb::https://dvv.fi/documents/16079645/169423081/mpollux-digisign-client-for-dvv_4.2.6b-8414_amd64.deb
+ sha256sums_x86_64 = 37b211a5e68f7d0a0b5bb5b64d7a31bc17a097fa7c83bea8b9f2cb17f543c52a
pkgname = vrk-mpollux-digisign-client
diff --git a/PKGBUILD b/PKGBUILD
index 121489c64a6e..327ae6846a4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
# Maintainer: ple <ple21108@gmail.com>
# Contributor: Atte Virtanen <aten.email@gmail.com>
pkgname=vrk-mpollux-digisign-client
-pkgver=4.2.6_8401
+pkgver=4.2.6b_8414
pkgrel=1
-epoch=3
+epoch=4
pkgdesc="Client program for Finnish chip ID cards"
arch=('x86_64')
url="https://dvv.fi/linux-versiot"
@@ -11,10 +11,10 @@ license=('custom')
depends=('pcsclite' 'qt5-base' 'nss')
install=vrk-mpollux-digisign-client.install
-_eevertti_id='165492525'
+_eevertti_id='169423081'
source_x86_64=($pkgname-$pkgver.deb::"https://dvv.fi/documents/16079645/$_eevertti_id/mpollux-digisign-client-for-dvv_${pkgver//_/-}_amd64.deb")
-sha256sums_x86_64=('5ef54dccf736e9268270720089a0b1334192a210f69bd48488e55b71fe21b72f')
+sha256sums_x86_64=('37b211a5e68f7d0a0b5bb5b64d7a31bc17a097fa7c83bea8b9f2cb17f543c52a')
backup=('etc/xdg/autostart/mpollux-digisign-client.desktop'
'etc/xdg/Fujitsu/CCryptoLib.conf')
diff --git a/vrk-mpollux-digisign-client.install b/vrk-mpollux-digisign-client.install
index f527d8afc5f1..29f63f9ad9a6 100644
--- a/vrk-mpollux-digisign-client.install
+++ b/vrk-mpollux-digisign-client.install
@@ -1,21 +1,9 @@
pre_install() {
- ps -ef | grep DigiSignApplication | grep -v grep | awk '{print $2}' | xargs kill -9 > /dev/null 2>&1
- rm -rf $HOME/.digisign
- rm -rf $HOME/.digisign_logs
- mkdir $HOME/.digisign
- mkdir $HOME/.digisign_logs
- chmod 750 $HOME/.digisign
- chmod 750 $HOME/.digisign_logs
+ ps -ef | grep DigiSignApplication | grep -v grep | awk '{print $2}' | xargs -r kill -9 > /dev/null 2>&1
}
pre_upgrade() {
- ps -ef | grep DigiSignApplication | grep -v grep | awk '{print $2}' | xargs kill -9 > /dev/null 2>&1
- rm -rf $HOME/.digisign
- rm -rf $HOME/.digisign_logs
- mkdir $HOME/.digisign
- mkdir $HOME/.digisign_logs
- chmod 750 $HOME/.digisign
- chmod 750 $HOME/.digisign_logs
+ ps -ef | grep DigiSignApplication | grep -v grep | awk '{print $2}' | xargs -r kill -9 > /dev/null 2>&1
}
post_install() {
@@ -37,6 +25,8 @@ post_install() {
}
post_upgrade() {
+ echo 'If a password prompt appears on launch, remove $HOME/.digisign and $HOME/.pki/nssdb'
+
if [ ! -d /tmp/.digisign_logs ]; then
mkdir -p /tmp/.digisign_logs
chmod 777 /tmp/.digisign_logs
@@ -56,14 +46,13 @@ post_upgrade() {
post_rm() {
ldconfig
- ps -ef | grep DigiSignApplication | grep -v grep | awk '{print $2}' | xargs kill -9 > /dev/null 2>&1
+ ps -ef | grep DigiSignApplication | grep -v grep | awk '{print $2}' | xargs -r kill -9 > /dev/null 2>&1
rm /etc/xdg/Fujitsu/Seed.txt
rm /etc/xdg/Fujitsu/SSLCA.cer
rm /etc/xdg/Fujitsu/SSL.p12
rm -rf /tmp/.digisign_logs
rm `find /home -name ds_nssdinstalled.txt`
- rm /usr/share/p11-kit/modules/digisign.module
if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
}