pkgver 7.80

Remove service files and use the ones from the rpm (patch to /usr/bin).
Remove udev patch (not needed anymore).
Add (but disable) support for 64bit-driver. 64bit hasplmd crashes atm.

9 files changed, 78 insertions, 114 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdcc39af3042..90016462bda7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun Nov 20 22:45:27 UTC 2016
 pkgbase = aksusbd
 	pkgdesc = SafeNet Sentinel LDK AKSUSB daemon supporting Sentinel HASP, HASP HL, HASP4 and Hardlock keys.
-	pkgver = 7.51
+	pkgver = 7.80
 	pkgrel = 1
 	url = https://safenet.gemalto.com/
 	install = aksusbd.install
@@ -12,20 +10,16 @@ pkgbase = aksusbd
 	makedepends = libarchive
 	conflicts = ehaspd
 	options = !strip
-	source = ftp://ftp.cis-app.com/pub/hasp/Sentinel_HASP/Runtime_(Drivers)/7.51/Sentinel_LDK_RedHat_and_SuSE_RPM_Run-time_Installer.tar.gz
-	source = aksusbd.service
-	source = winehasp.service
-	source = hasplmd.service
+	source = Sentinel_LDK_RedHat_and_SuSE_RPM_Run-time_Installer-7.80.tar.gz::https://fdsdown.safenet-inc.com/filesSN/Index/7f8dd7b54da0482d910bd461ba0d991e?sid=5aeeaadf4fb59788102400818110c73b
+	source = service-usr-bin-i386.patch
+	source = service-usr-bin-x86_64.patch
 	source = LICENSE
-	source = udev-rules.patch
 	source = aksusbd.install
-	sha256sums = 28effa888ffc0aaffd535bd0166770564c82655415fb42bd8a1008f47d1fbfb4
-	sha256sums = 5551253cf3f048f3c1418c8f3e7378651a47807201de98f3e759fa81b38a859f
-	sha256sums = d4558107c7c9cf94f4b1e95ca5036e5cb43e59c5bc9ac35e2fbb70a194dc091a
-	sha256sums = e3be521db63423519161eb50c5561601fcfeb3341320e4d077b968d0a30d541a
+	sha256sums = 21db58ea3acbb32ce358473dd20b372c4ccafee92739bc6f71b236cc5277ad31
+	sha256sums = 75c02721799e3f2b498d67265201445c963063b331c61402205db2ad91e72ec3
+	sha256sums = d63548bac27eab7cf4a524830643705bafc63349d2e3c5276a37d3382e5598ec
 	sha256sums = c67d1383c94e2fda4c25a70d5a5d4a90d692586ff7977eb5e9e82139f85e22dd
-	sha256sums = 83145c8323a987572607a4f3a4af5498a84f5974f2d60a698b15fb87f9d64d35
-	sha256sums = 8d5a12de57caf36af433f7c2890969b1a9fbd3ae5ce9d20d5706a5f67125ebd9
+	sha256sums = db96b8b8f1ae5af6bbe6eaa3b4cf635341b8c07d294442cb3bfb1b78a20a54ec
 
 pkgname = aksusbd
 
diff --git a/PKGBUILD b/PKGBUILD
index 03ff1c7b3339..0028b71a3f2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
 # $Id$
 # Maintainer: Ido Rosen (ido) <ido@kernel.org>
+# Maintainer: jakob <grandchild@gmx.net>
 # 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.51
+pkgver=7.80
 _pkgrel=1
 _tarballname=Sentinel_LDK_RedHat_and_SuSE_RPM_Run-time_Installer
 pkgrel=1 # ${_pkgrel}
@@ -13,20 +14,16 @@ pkgdesc="SafeNet Sentinel LDK AKSUSB daemon supporting Sentinel HASP, HASP HL, H
 arch=('i686' 'x86_64')
 url="https://safenet.gemalto.com/"
 license=('custom')
-source=("ftp://ftp.cis-app.com/pub/hasp/Sentinel_HASP/Runtime_(Drivers)/${pkgver}/${_tarballname}.tar.gz"
-        "aksusbd.service"
-        "winehasp.service"
-        "hasplmd.service"
+source=("${_tarballname}-${pkgver}.tar.gz::https://fdsdown.safenet-inc.com/filesSN/Index/7f8dd7b54da0482d910bd461ba0d991e?sid=5aeeaadf4fb59788102400818110c73b"
+        "service-usr-bin-i386.patch"
+        "service-usr-bin-x86_64.patch"
         "LICENSE"
-        "udev-rules.patch"
         "${pkgname}.install")
-sha256sums=('28effa888ffc0aaffd535bd0166770564c82655415fb42bd8a1008f47d1fbfb4'
-            '5551253cf3f048f3c1418c8f3e7378651a47807201de98f3e759fa81b38a859f'
-            'd4558107c7c9cf94f4b1e95ca5036e5cb43e59c5bc9ac35e2fbb70a194dc091a'
-            'e3be521db63423519161eb50c5561601fcfeb3341320e4d077b968d0a30d541a'
+sha256sums=('21db58ea3acbb32ce358473dd20b372c4ccafee92739bc6f71b236cc5277ad31'
+            '75c02721799e3f2b498d67265201445c963063b331c61402205db2ad91e72ec3'
+            'd63548bac27eab7cf4a524830643705bafc63349d2e3c5276a37d3382e5598ec'
             'c67d1383c94e2fda4c25a70d5a5d4a90d692586ff7977eb5e9e82139f85e22dd'
-            '83145c8323a987572607a4f3a4af5498a84f5974f2d60a698b15fb87f9d64d35'
-            '8d5a12de57caf36af433f7c2890969b1a9fbd3ae5ce9d20d5706a5f67125ebd9')
+            'db96b8b8f1ae5af6bbe6eaa3b4cf635341b8c07d294442cb3bfb1b78a20a54ec')
 makedepends=('libarchive')
 conflicts=('ehaspd')
 install=$pkgname.install
@@ -36,33 +33,37 @@ prepare(){
   cd $srcdir
 
   # Extract RPM into $srcdir:
-  bsdtar -xvf ${_tarballname}/${pkgname}-${pkgver}-${_pkgrel}.i386.rpm
+  bsdtar -xvf ${_tarballname}/${pkgname}-${pkgver}-${_pkgrel}.${CARCH}.rpm
 
-  # Comment out redundant legacy udev rules:
-  patch -p1 < udev-rules.patch
+  # Change /usr/sbin/ to /usr/bin/
+  patch -p1 < service-usr-bin-i386.patch
+  patch -p1 < service-usr-bin-x86_64.patch
 }
 
 package() {
   cd $srcdir
+  ### x86_64 hasplmd segfaults -- continue to install 32bit-version.
+  ### Uncomment the section below to install x86_64 on such systems anyway.
+  # if [ "${CARCH}" != "i386" ]; then
+  #   arch_suffix=_${CARCH}
+  # fi
 
   # Binaries:
   install -dm755 ${pkgdir}/usr/bin
-  install -Dm755 ${srcdir}/usr/sbin/* \
+  install -Dm755 ${srcdir}/usr/sbin/{aksusbd,hasplmd}${arch_suffix} \
       ${pkgdir}/usr/bin/
 
-  # (patched) udev rules:
+  # 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):
+  # systemd service
   install -dm755 ${pkgdir}/usr/lib/systemd/system/
-  install -m644 ${srcdir}/{aksusbd,winehasp,hasplmd}.service \
-      ${pkgdir}/usr/lib/systemd/system/
+  install -m644 ${srcdir}/var/hasplm/init/aksusbd${arch_suffix}.service \
+      ${pkgdir}/usr/lib/systemd/system/aksusbd.service
+  install -m644 ${srcdir}/var/hasplm/init/hasplmd${arch_suffix}.service \
+      ${pkgdir}/usr/lib/systemd/system/hasplmd.service
 
   # LICENSE and readme.html:
   install -Dm644 ${srcdir}/${_tarballname}/readme.html \
@@ -70,4 +71,3 @@ package() {
   install -Dm644 ${srcdir}/LICENSE \
       ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
-
diff --git a/aksusbd.install b/aksusbd.install
index f9761392f21b..d828f93f5be4 100644
--- a/aksusbd.install
+++ b/aksusbd.install
@@ -5,5 +5,5 @@ post_install() {
 
 post_upgrade() {
   systemctl daemon-reload
-  systemctl try-restart aksusbd winehasp hasplmd
+  systemctl try-restart aksusbd hasplmd
 }
diff --git a/aksusbd.service b/aksusbd.service
deleted file mode 100644
index 158946606774..000000000000
--- a/aksusbd.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=AKSUSB daemon
-Wants=winehasp.service hasplmd.service
-
-[Service]
-Type=forking
-StandardOutput=tty
-TimeoutStopSec=10s
-
-ProtectSystem=full
-ProtectHome=true
-
-ExecStart=/usr/bin/aksusbd
-
-[Install]
-WantedBy=multi-user.target
-Also=winehasp.service
-Also=hasplmd.service
diff --git a/hasplmd.service b/hasplmd.service
deleted file mode 100644
index 7fa4f20637ef..000000000000
--- a/hasplmd.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=AKSUSB winehasp daemon
-After=aksusbd.service winehasp.service
-Requires=aksusbd.service winehasp.service
-BindsTo=aksusbd.service winehasp.service
-PartOf=aksusbd.service winehasp.service
-JoinsNamespaceOf=aksusbd.service
-
-[Service]
-Type=forking
-StandardOutput=tty
-TimeoutStopSec=10s
-
-ProtectSystem=full
-ProtectHome=true
-
-ExecStart=/usr/bin/hasplmd -s
-
-[Install]
-WantedBy=multi-user.target
-Also=aksusbd.service
-Also=winehasp.service
diff --git a/service-usr-bin-i386.patch b/service-usr-bin-i386.patch
new file mode 100644
index 000000000000..0c3d1e7636cc
--- /dev/null
+++ b/service-usr-bin-i386.patch
@@ -0,0 +1,22 @@
+--- a/var/hasplm/init/aksusbd.service
++++ b/var/hasplm/init/aksusbd.service
+@@ -5,7 +5,7 @@
+ 
+ [Service]
+ Type=forking
+-ExecStart=/usr/sbin/aksusbd
++ExecStart=/usr/bin/aksusbd
+ 
+ [Install]
+ WantedBy=multi-user.target
+--- a/var/hasplm/init/hasplmd.service
++++ b/var/hasplm/init/hasplmd.service
+@@ -5,7 +5,7 @@
+ 
+ [Service]
+ Type=forking
+-ExecStart=/usr/sbin/hasplmd -s
++ExecStart=/usr/bin/hasplmd -s
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/service-usr-bin-x86_64.patch b/service-usr-bin-x86_64.patch
new file mode 100644
index 000000000000..c05a91c601f0
--- /dev/null
+++ b/service-usr-bin-x86_64.patch
@@ -0,0 +1,22 @@
+--- a/var/hasplm/init/aksusbd_x86_64.service
++++ b/var/hasplm/init/aksusbd_x86_64.service
+@@ -5,7 +5,7 @@
+ 
+ [Service]
+ Type=forking
+-ExecStart=/usr/sbin/aksusbd_x86_64
++ExecStart=/usr/bin/aksusbd_x86_64
+ 
+ [Install]
+ WantedBy=multi-user.target
+--- a/var/hasplm/init/hasplmd_x86_64.service
++++ b/var/hasplm/init/hasplmd_x86_64.service
+@@ -5,7 +5,7 @@
+ 
+ [Service]
+ Type=forking
+-ExecStart=/usr/sbin/hasplmd_x86_64 -s
++ExecStart=/usr/bin/hasplmd_x86_64 -s
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/udev-rules.patch b/udev-rules.patch
deleted file mode 100644
index 928c91aca141..000000000000
--- a/udev-rules.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- old/etc/udev/rules.d/80-hasp.rules	2016-11-20 14:30:46.445417194 -0500
-+++ new/etc/udev/rules.d/80-hasp.rules	2016-11-20 16:44:11.014504305 -0500
-@@ -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", GROUP="plugdev", 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", GROUP="plugdev", 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", GROUP="plugdev", ENV{SENTINELHID}="1", SYMLINK+="aks/sentinelhid/%k"
- 
- # eof
diff --git a/winehasp.service b/winehasp.service
deleted file mode 100644
index 4e057b14b4dc..000000000000
--- a/winehasp.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=AKSUSB winehasp daemon
-After=aksusbd.service
-Requires=aksusbd.service
-BindsTo=aksusbd.service
-PartOf=aksusbd.service
-JoinsNamespaceOf=aksusbd.service
-
-[Service]
-Type=forking
-StandardOutput=tty
-TimeoutStopSec=10s
-
-ProtectSystem=full
-ProtectHome=true
-
-ExecStart=/usr/bin/winehasp
-
-[Install]
-WantedBy=multi-user.target
-Also=aksusbd.service
-Also=hasplmd.service