Cleanup building files and change website

4 files changed, 106 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 63f34e6e3652..99483d1cc68d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,17 +2,16 @@ pkgbase = akia
 	pkgdesc = PKCS#11 library and utility tools for Akis Smartcard
 	pkgver = 6.2.1
 	pkgrel = 1
-	url = http://www.akiskart.com.tr
+	url = https://akiskart.bilgem.tubitak.gov.tr/
 	install = akia.install
 	arch = x86_64
 	license = custom
-	makedepends = unrar
 	depends = pcsclite
 	depends = ccid
 	depends = java-environment
-	source = akia
+	source = akia.patch
 	source = https://akiskart.bilgem.tubitak.gov.tr/dosyalar/akis_6.2.1_amd64.rar
-	sha256sums = cd71c80eda1674ca8b0cc8f86fdf7404b89edfc910c4460cf62ed8d706cfe609
+	sha256sums = 180d9fe95b6c94d6e4377701bd1bdf116e722d5baedbd57b509b0c12339dc503
 	sha256sums = 2e1fb8f8b176e3e674ec72e3f0394abc1de95a5d044e610ddf8255709c13f20a
 
 pkgname = akia
diff --git a/PKGBUILD b/PKGBUILD
index 88523e562f33..5b9c2b25f3ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,30 +6,21 @@ pkgver=6.2.1
 pkgrel=1
 pkgdesc="PKCS#11 library and utility tools for Akis Smartcard"
 arch=('x86_64')
-url="http://www.akiskart.com.tr"
+url="https://akiskart.bilgem.tubitak.gov.tr/"
 license=('custom')
-makedepends=('unrar')
 depends=('pcsclite' 'ccid' 'java-environment')
 install=akia.install
-source=(akia
+source=(akia.patch
         https://akiskart.bilgem.tubitak.gov.tr/dosyalar/akis_${pkgver}_amd64.rar)  
-sha256sums=('cd71c80eda1674ca8b0cc8f86fdf7404b89edfc910c4460cf62ed8d706cfe609'
+sha256sums=('180d9fe95b6c94d6e4377701bd1bdf116e722d5baedbd57b509b0c12339dc503'
             '2e1fb8f8b176e3e674ec72e3f0394abc1de95a5d044e610ddf8255709c13f20a')
 
 prepare() {
-  unrar x akis_${pkgver}_amd64.rar
   ar x akis_${pkgver}_amd64.deb
+  tar -zxf data.tar.gz -C "${srcdir}"
+  patch --forward --strip=1 --input="akia.patch"
 }
 
 package() {
-
-  tar -zxf data.tar.gz -C "${srcdir}"
-  
-  rm -rf "${srcdir}"/usr/bin
-  
-  install -dm755 "${pkgdir}"/usr
-  install -dm755 "${pkgdir}"/usr/bin
-  
-  mv "${srcdir}"/usr/* "${pkgdir}"/usr
-  install -Dm755 "${srcdir}"/akia "${pkgdir}"/usr/bin/akia
+  mv "${srcdir}"/usr "${pkgdir}"/usr
 }
diff --git a/akia b/akia
deleted file mode 100644
index 9f32788d451f..000000000000
--- a/akia
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -jar /usr/share/akis/akia.jar
diff --git a/akia.patch b/akia.patch
new file mode 100644
index 000000000000..8195b4f2ba76
--- /dev/null
+++ b/akia.patch
@@ -0,0 +1,97 @@
+diff --unified --recursive --text package.orig/usr/bin/akia package.new/usr/bin/akia
+--- package.orig/usr/bin/akia	2021-09-15 16:49:13.000000000 +0300
++++ package.new/usr/bin/akia	2022-01-05 09:21:51.762935000 +0300
+@@ -1,91 +1,2 @@
+-#!/bin/bash
+-
+-
+-# returns the JDK version.
+-# 8 for 1.8.0_nn, 9 for 9-ea etc, and "no_java" for undetected
+-jdk_version() {
+-  local result
+-  local java_cmd
+-  if [[ -n $(type -p java) ]]
+-  then
+-    java_cmd=java
+-  elif [[ (-n "$JAVA_HOME") && (-x "$JAVA_HOME/bin/java") ]]
+-  then
+-    java_cmd="$JAVA_HOME/bin/java"
+-  fi
+-  local IFS=$'\n'
+-  # remove \r for Cygwin
+-  local lines=$("$java_cmd" -Xms32M -Xmx32M -version 2>&1 | tr '\r' '\n')
+-  if [[ -z $java_cmd ]]
+-  then
+-    result=no_java
+-  else
+-    for line in $lines; do
+-      if [[ (-z $result) && ($line = *"version \""*) ]]
+-      then
+-        local ver=$(echo $line | sed -e 's/.*version "\(.*\)"\(.*\)/\1/; 1q')
+-        # on macOS, sed doesn't support '?'
+-        if [[ $ver = "1."* ]]
+-        then
+-          result=$(echo $ver | sed -e 's/1\.\([0-9]*\)\(.*\)/\1/; 1q')
+-        else
+-          result=$(echo $ver | sed -e 's/\([0-9]*\)\(.*\)/\1/; 1q')
+-        fi
+-      fi
+-    done
+-  fi
+-  echo "$result"
+-}
+-
+-Status=1
+-echo
+-echo "[EN] Checking for dependencies..."
+-echo "[TR] Bagimliliklar kontrol ediliyor..."
+-echo 
+-
+-java_ver="$(jdk_version)"
+-if [[ $java_ver -lt "7" ]]
+-then
+-	echo "(x) Java version: $java_ver < 7"
+-	Status=0
+-else
+-	echo "(.) Java version: $java_ver"
+-fi
+-
+-
+-
+-
+-set libpcsclite1 pcscd libccid
+-for A; do
+-    dpkg -s "$A" >/dev/null 2>&1 && {
+-        echo "(.) $A"
+-    } || {
+-        echo "(x) $A"
+-        Status=0
+-    }
+-done
+-
+-echo 
+-
+-if [ "$Status" -eq "1" ]
+-then
+-    echo "[EN] Dependencies are OK"
+-    echo "[TR] Bagimliliklar TAMAM"
+-    echo
+-
+-
+-    java -jar /usr/share/akis/akia.jar
+-	
+-else
+-    echo "[EN] WARNING : Some dependencies not found !"
+-    echo "[TR] UYARI : Bazi bagimliliklar bulunamadi !"
+-
+-fi
+-
+-echo
+-
+-
+-
+-
+-
+-
++#!/bin/sh
++java -jar /usr/share/akis/akia.jar