Rewrote most of the aksusbd PKGBUILD to comply with best practices. Deprecated init script.

4 files changed, 71 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 773d037311d0..7256fd987b39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Aug  7 02:35:27 UTC 2016
+# Sun Aug  7 03:42:35 UTC 2016
 pkgbase = aksusbd
-	pkgdesc = AKSUSB daemon supporting Sentinel HASP, HASP HL, HASP4 and Hardlock keys.
+	pkgdesc = SafeNet Sentinel LDK AKSUSB daemon supporting Sentinel HASP, HASP HL, HASP4 and Hardlock keys.
 	pkgver = 7.40
-	pkgrel = 3
+	pkgrel = 1
 	url = https://safenet.gemalto.com/
 	install = aksusbd.install
 	arch = i686
@@ -14,9 +14,13 @@ pkgbase = aksusbd
 	source = ftp://ftp.cis-app.com/pub/hasp/Sentinel_HASP/Runtime_(Drivers)/7.40/Sentinel_LDK_RedHat_and_SuSE_RPM_Run-time_Installer.tar.gz
 	source = aksusbd.service
 	source = LICENSE
-	md5sums = 4aec76ec03e98ad5f1ade14ee2bb6b40
-	md5sums = 9ee94d29752a32e164af2a539f85ec3b
-	md5sums = 095760c5f93d6b59c337b3a411a479b2
+	source = udev-rules.patch
+	source = aksusbd.install
+	sha256sums = ec579f8a0a6688af00ca74f0c8e32c0298c0b54cd92d4d49c3407d98c0dbd8a3
+	sha256sums = ecbf3d1f0ac57bc3b0235de4280c11dd530b9b45148a0b7370260c1c40c984fa
+	sha256sums = c67d1383c94e2fda4c25a70d5a5d4a90d692586ff7977eb5e9e82139f85e22dd
+	sha256sums = e5b17862fcc959ff48098ffdca04671d0303d290494edfebad495f6e3b82ba68
+	sha256sums = ccdbcaf693ce2dc4e1a9432e17a8d3014925bfb0dc3f177a0c644e668b8b5e78
 
 pkgname = aksusbd
 
diff --git a/PKGBUILD b/PKGBUILD
index 872a462d8c2c..8e1d5024ade2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,67 @@
-# Contributor: Ido Rosen <ido@kernel.org>
-# Contributor: Konarev Alexander <avkonarev@gmail.com.cc>
+# $Id$
+# Maintainer: Ido Rosen (ido) <ido@kernel.org>
+# Contributor: Alexander Konarev (kale-ru) <AVKonarev@gmail.com>
+# Contributor: Alexander Konarev <avkonarev@gmail.com.cc>
+# Contributor: Andre Bartke (andre) <andrew@archlinux.us>
 
 pkgname=aksusbd
 pkgver=7.40
 _pkgrel=1
-pkgrel=3
-pkgdesc="AKSUSB daemon supporting Sentinel HASP, HASP HL, HASP4 and Hardlock keys."
+_tarballname=Sentinel_LDK_RedHat_and_SuSE_RPM_Run-time_Installer
+pkgrel=${_pkgrel}
+pkgdesc="SafeNet Sentinel LDK AKSUSB daemon supporting Sentinel HASP, HASP HL, HASP4 and Hardlock keys."
 arch=('i686' 'x86_64')
 url="https://safenet.gemalto.com/"
 license=('custom')
-source=("ftp://ftp.cis-app.com/pub/hasp/Sentinel_HASP/Runtime_(Drivers)/${pkgver}/Sentinel_LDK_RedHat_and_SuSE_RPM_Run-time_Installer.tar.gz"
+source=("ftp://ftp.cis-app.com/pub/hasp/Sentinel_HASP/Runtime_(Drivers)/${pkgver}/${_tarballname}.tar.gz"
         "aksusbd.service"
-        "LICENSE")
+        "LICENSE"
+        "udev-rules.patch"
+        "${pkgname}.install")
+sha256sums=('ec579f8a0a6688af00ca74f0c8e32c0298c0b54cd92d4d49c3407d98c0dbd8a3'
+            'ecbf3d1f0ac57bc3b0235de4280c11dd530b9b45148a0b7370260c1c40c984fa'
+            'c67d1383c94e2fda4c25a70d5a5d4a90d692586ff7977eb5e9e82139f85e22dd'
+            'e5b17862fcc959ff48098ffdca04671d0303d290494edfebad495f6e3b82ba68'
+            'ccdbcaf693ce2dc4e1a9432e17a8d3014925bfb0dc3f177a0c644e668b8b5e78')
 makedepends=('rpmextract')
 conflicts=('ehaspd')
 install=$pkgname.install
 
 prepare(){
   cd $srcdir
-  rpmextract.sh Sentinel_LDK_RedHat_and_SuSE_RPM_Run-time_Installer/${pkgname}-${pkgver}-${_pkgrel}.i386.rpm
+
+  # Extract RPM into $srcdir:
+  rpmextract.sh ${_tarballname}/${pkgname}-${pkgver}-${_pkgrel}.i386.rpm
+
+  # Comment out redundant legacy udev rules:
+  patch -p1 < udev-rules.patch
 }
 
 package() {
   cd $srcdir
-  # copy package
-  mkdir -p $pkgdir/usr/bin
-  #install -dm755 "$pkgdir"/{usr/{bin,share}}
-  cp -r $srcdir/usr/sbin/* $pkgdir/usr/bin
-  cp -r $srcdir/etc $pkgdir/etc
 
-  find $pkgdir/usr -type f -exec chmod 755 {} \;
-  find $pkgdir/etc -type f -exec chmod 644 {} \;
-  chmod 755 $pkgdir/etc/init.d/aksusbd
+  # Binaries:
+  install -dm755 ${pkgdir}/usr/bin
+  install -Dm755 ${srcdir}/usr/sbin/* \
+      ${pkgdir}/usr/bin/
+
+  # (patched) udev rules:
+  install -dm755 ${pkgdir}/usr/lib/udev/rules.d
+  install -m644 ${srcdir}/etc/udev/rules.d/* \
+      ${pkgdir}/usr/lib/udev/rules.d/
+
+  # Legacy init scripts (for posterity):
+  install -Dm644 ${srcdir}/etc/init.d/${pkgname} \
+      ${pkgdir}/usr/share/${pkgname}/${pkgname}.init
 
+  # systemd service (based on etc/init.d/aksusbd):
+  install -Dm644 ${srcdir}/${pkgname}.service \
+      ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
 
-  install -Dm644 ${srcdir}/${pkgname}.service ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  # copy license
-  install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  # LICENSE and readme.html:
+  install -Dm644 ${srcdir}/${_tarballname}/readme.html \
+      ${pkgdir}/usr/share/${pkgname}/readme.html
+  install -Dm644 ${srcdir}/LICENSE \
+      ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
-md5sums=('4aec76ec03e98ad5f1ade14ee2bb6b40'
-         '9ee94d29752a32e164af2a539f85ec3b'
-         '095760c5f93d6b59c337b3a411a479b2')
diff --git a/aksusbd.service b/aksusbd.service
index 7676b2f23f76..fe2e28737950 100644
--- a/aksusbd.service
+++ b/aksusbd.service
@@ -5,14 +5,12 @@ After=syslog.target
 
 [Service]
 Type=forking
-ExecStart=/etc/init.d/aksusbd start
-TimeoutSec=0
 StandardOutput=tty
-RemainAfterExit=yes
+TimeoutStopSec=10s
 
-ExecReload=/etc/init.d/aksusbd restart
-
-ExecStop=/etc/init.d/aksusbd stop
+ExecStart=/usr/bin/aksusbd
+ExecStart=/usr/bin/winehasp
+ExecStart=/usr/bin/hasplmd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/udev-rules.patch b/udev-rules.patch
new file mode 100644
index 000000000000..bcdcc27ede77
--- /dev/null
+++ b/udev-rules.patch
@@ -0,0 +1,13 @@
+diff -rupN old/etc/udev/rules.d/80-hasp.rules new/etc/udev/rules.d/80-hasp.rules
+--- old/etc/udev/rules.d/80-hasp.rules	2015-08-20 09:15:07.000000000 -0400
++++ new/etc/udev/rules.d/80-hasp.rules	2016-08-06 22:46:36.632611545 -0400
+@@ -6,7 +6,7 @@ ACTION=="remove", ENV{HASP}=="1", RUN+="
+ ACTION=="add|change", SUBSYSTEM=="usb", ATTRS{idVendor}=="0529", ATTRS{idProduct}=="0003", KERNEL!="hiddev*", MODE="666", ENV{SENTINELHID}="1", SYMLINK+="aks/sentinelhid/%k"
+ 
+ # Compatibility rules for kernel older than 2.6.22 (RedHat 5.x)
+-ACTION=="add", SUBSYSTEM=="usb_device", PHYSDEVBUS=="usb", SYSFS{idVendor}=="0529", SYSFS{idProduct}=="0001", MODE="664", ENV{HASP}="1", SYMLINK+="aks/hasp/%k", RUN+="/usr/sbin/aksusbd -c $root/aks/hasp/$kernel"
+-ACTION=="add", SUBSYSTEM=="usb_device", PHYSDEVBUS=="usb", SYSFS{idVendor}=="0529", SYSFS{idProduct}=="0003", MODE="666", ENV{SENTINELHID}="1", SYMLINK+="aks/sentinelhid/%k"
++#ACTION=="add", SUBSYSTEM=="usb_device", PHYSDEVBUS=="usb", SYSFS{idVendor}=="0529", SYSFS{idProduct}=="0001", MODE="664", ENV{HASP}="1", SYMLINK+="aks/hasp/%k", RUN+="/usr/sbin/aksusbd -c $root/aks/hasp/$kernel"
++#ACTION=="add", SUBSYSTEM=="usb_device", PHYSDEVBUS=="usb", SYSFS{idVendor}=="0529", SYSFS{idProduct}=="0003", MODE="666", ENV{SENTINELHID}="1", SYMLINK+="aks/sentinelhid/%k"
+ 
+ # eof