9.0.43-1

5 files changed, 63 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe185dc25b26..40ee44cd276a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by makepkg 4.2.1
+# Mon Jan 18 10:13:48 UTC 2016
 pkgbase = sac-core
 	pkgdesc = Safenet Authentication Client for Alladin eToken
 	pkgver = 9.0.43
-	pkgrel = 0
+	pkgrel = 1
 	arch = i686
 	arch = x86_64
 	license = custom
@@ -10,10 +12,16 @@ pkgbase = sac-core
 	depends = pcsc-tools
 	depends = libusb-compat
 	depends = openssh
-	source = https://bitbucket.org/s3rj1k/etoken/raw/61f30bfcd0e0dbede3b888de09602a61a3653d64/Linux/Core/SafenetAuthenticationClient-core-9.0.43-0_i386.deb
-	source = https://bitbucket.org/s3rj1k/etoken/raw/61f30bfcd0e0dbede3b888de09602a61a3653d64/Linux/Core/SafenetAuthenticationClient-core-9.0.43-0_amd64.deb
-	sha256sums = 665cf6b1b1acdefdb6a3eca2845305c2ca03146e27fdf3c446ddcc0b5fe9d7da
-	sha256sums = 43c0ddb2e4e7eaa2de530e5236661bef748401316679bc231a0620d89badbfdc
+	source = eToken.conf
+	source = etoken.service
+	source = etoken.module
+	sha256sums = 85b850b820610e029428e577ca0e48f6fb7b4148ae8d702ca20b191963046c6c
+	sha256sums = a45c4456fdfb397bf5483bd0cdb6d30cc0ad5a7cde633c31784007b0d5e26974
+	sha256sums = eb3b127fdd4f2e5b41f8b8e9f155343e525e6c7121c21758e856422a7e67d2b2
+	source_i686 = https://bitbucket.org/s3rj1k/etoken/raw/61f30bfcd0e0dbede3b888de09602a61a3653d64/Linux/Core/SafenetAuthenticationClient-core-9.0.43-0_i386.deb
+	sha256sums_i686 = 665cf6b1b1acdefdb6a3eca2845305c2ca03146e27fdf3c446ddcc0b5fe9d7da
+	source_x86_64 = https://bitbucket.org/s3rj1k/etoken/raw/61f30bfcd0e0dbede3b888de09602a61a3653d64/Linux/Core/SafenetAuthenticationClient-core-9.0.43-0_amd64.deb
+	sha256sums_x86_64 = 43c0ddb2e4e7eaa2de530e5236661bef748401316679bc231a0620d89badbfdc
 
 pkgname = sac-core
 
diff --git a/PKGBUILD b/PKGBUILD
index f70bd5afc16b..2b7b204c5aaf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,23 @@
 pkgname='sac-core'
 pkgver='9.0.43'
-pkgrel='0'
+pkgrel='1'
 pkgdesc='Safenet Authentication Client for Alladin eToken'
 arch=('i686' 'x86_64')
 depends=('pcsclite' 'pcsc-tools' 'libusb-compat' 'openssh')
 makedepends=('libarchive')
 license='custom'
-source=(
-    'https://bitbucket.org/s3rj1k/etoken/raw/61f30bfcd0e0dbede3b888de09602a61a3653d64/Linux/Core/SafenetAuthenticationClient-core-9.0.43-0_i386.deb'
-    'https://bitbucket.org/s3rj1k/etoken/raw/61f30bfcd0e0dbede3b888de09602a61a3653d64/Linux/Core/SafenetAuthenticationClient-core-9.0.43-0_amd64.deb'
-  )
-sha256sums=(
-    '665cf6b1b1acdefdb6a3eca2845305c2ca03146e27fdf3c446ddcc0b5fe9d7da'
-    '43c0ddb2e4e7eaa2de530e5236661bef748401316679bc231a0620d89badbfdc'
-  )
-
-if [[ "$CARCH" == 'i686' ]];   then myarch="i386" ; fi
-if [[ "$CARCH" == 'x86_64' ]]; then myarch="amd64"; fi
-
+source_i686=('https://bitbucket.org/s3rj1k/etoken/raw/61f30bfcd0e0dbede3b888de09602a61a3653d64/Linux/Core/SafenetAuthenticationClient-core-9.0.43-0_i386.deb')
+source_x86_64=('https://bitbucket.org/s3rj1k/etoken/raw/61f30bfcd0e0dbede3b888de09602a61a3653d64/Linux/Core/SafenetAuthenticationClient-core-9.0.43-0_amd64.deb')
+sha256sums_i686=('665cf6b1b1acdefdb6a3eca2845305c2ca03146e27fdf3c446ddcc0b5fe9d7da')
+sha256sums_x86_64=('43c0ddb2e4e7eaa2de530e5236661bef748401316679bc231a0620d89badbfdc')
+source+=('eToken.conf' 
+         'etoken.service'
+         'etoken.module')
+sha256sums+=('85b850b820610e029428e577ca0e48f6fb7b4148ae8d702ca20b191963046c6c'
+             'a45c4456fdfb397bf5483bd0cdb6d30cc0ad5a7cde633c31784007b0d5e26974'
+             'eb3b127fdd4f2e5b41f8b8e9f155343e525e6c7121c21758e856422a7e67d2b2')
 build() {
-    bsdtar xf "$srcdir/SafenetAuthenticationClient-core-"$pkgver"-0_"${myarch}".deb" && bsdtar xf "$srcdir/data.tar.gz"
+    bsdtar -xf "$srcdir/data.tar.gz"
 }
 
 package() {
@@ -31,24 +29,17 @@ package() {
     rm "$pkgdir/usr/lib/pcsc/drivers/aks-ifdh.bundle/Contents/Linux/readme.txt"
 
     mkdir -p "$pkgdir/etc"
-    echo "[GENERAL]" > "$pkgdir/etc/eToken.conf"
-    echo "PcscSlots=1" >> "$pkgdir/etc/eToken.conf"
-    echo "SoftwareSlots=1" >> "$pkgdir/etc/eToken.conf"
+    cp "$srcdir/eToken.conf" "$pkgdir/etc/eToken.conf"
 
     mkdir -p "$pkgdir/usr/lib/systemd/system/"
-    echo "[Unit]" > "$pkgdir/usr/lib/systemd/system/etoken.service"
-    echo "Description=Aladdin eToken service" >> "$pkgdir/usr/lib/systemd/system/etoken.service"
-    echo "" >> "$pkgdir/usr/lib/systemd/system/etoken.service"
-    echo "[Service]" >> "$pkgdir/usr/lib/systemd/system/etoken.service"
-    echo "ExecStart=/usr/bin/SACSrv" >> "$pkgdir/usr/lib/systemd/system/etoken.service"
-    echo "ExecReload=/bin/kill -HUP $MAINPID" >> "$pkgdir/usr/lib/systemd/system/etoken.service"
-    echo "StandardOutput=null" >> "$pkgdir/usr/lib/systemd/system/etoken.service"
-    echo "" >> "$pkgdir/usr/lib/systemd/system/etoken.service"
-    echo "[Install]" >> "$pkgdir/usr/lib/systemd/system/etoken.service"
-    echo "WantedBy=multi-user.target" >> "$pkgdir/usr/lib/systemd/system/etoken.service"
+    cp "$srcdir/etoken.service" "$pkgdir/usr/lib/systemd/system/etoken.service"
+
+    mkdir -p "$pkgdir/usr/share/p11-kit/modules/"
+    cp "$srcdir/etoken.module" "$pkgdir/usr/share/p11-kit/modules/etoken.module"
 
     cd "$pkgdir/usr/lib/pcsc/drivers/aks-ifdh.bundle/Contents/Linux/"
     ln -sf libAksIfdh.so.9.0 libAksIfdh.so
+
     cd "$pkgdir/usr/lib/"
     ln -sf libeToken.so.9.0.43 libeTPkcs11.so
     ln -sf libeToken.so.9.0.43 libeToken.so
@@ -57,4 +48,22 @@ package() {
     ln -sf libetvTokenEngine.so.9.0.43 libetvTokenEngine.so
     ln -sf libiKeyTokenEngine.so.9.0.43 libiKeyTokenEngine.so
     ln -sf libSACLog.so.9.0.43 libSACLog.so
+
+    mkdir -p "$pkgdir/usr/lib/pkcs11/"
+    cd "$pkgdir/usr/lib/pkcs11/"
+    ln -sf /usr/lib/libeTPkcs11.so libeTPkcs11.so
+}
+
+post_install() {
+    echo "Enabling systemd services"
+    systemctl enable pcscd.service
+    systemctl enable etoken.service
+    echo "Starting systemd services"
+    systemctl start pcscd.service
+    systemctl start etoken.service
+}
+
+post_upgrade() {
+    echo "Reloading systemd"
+    systemctl daemon-reload
 }
diff --git a/eToken.conf b/eToken.conf
new file mode 100644
index 000000000000..0bd4174777ff
--- /dev/null
+++ b/eToken.conf
@@ -0,0 +1,3 @@
+[GENERAL]
+PcscSlots=1
+SoftwareSlots=1
diff --git a/etoken.module b/etoken.module
new file mode 100644
index 000000000000..3b3440990bae
--- /dev/null
+++ b/etoken.module
@@ -0,0 +1 @@
+module: libeTPkcs11.so
diff --git a/etoken.service b/etoken.service
new file mode 100644
index 000000000000..838ed60171cc
--- /dev/null
+++ b/etoken.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Aladdin eToken service
+
+[Service]
+ExecStart=/usr/bin/SACSrv
+ExecReload=/bin/kill -HUP $MAINPID
+StandardOutput=null
+
+[Install]
+WantedBy=multi-user.target