From ce6d63ec00303163897994f8879596952498f9fc Mon Sep 17 00:00:00 2001
From: Andrey Kolchenko <andrey@kolchenko.me>
Date: Wed, 10 Dec 2025 16:22:25 +0300
Subject: [PATCH] v4.11.4-4

---
 .SRCINFO |  3 ++-
 PKGBUILD | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index d999c6e4ecea..c902487ce5f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rutoken-plugin
 	pkgdesc = The Rutoken plugin is necessary for connecting USB devices with the browser, it allows you to identify devices and work with them.
 	pkgver = 4.11.4
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.rutoken.ru/support/download/rutoken-plugin/
 	arch = i686
 	arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = rutoken-plugin
 	makedepends = coreutils
 	makedepends = bash
 	depends = rutoken-pkcs
+	depends = rutoken-connect
 	options = !strip
 	source_i686 = rutoken-plugin-4.11.4-i686.rpm::https://download.rutoken.ru/Rutoken_Plugin/4.11.4.0/Linux/libnpRutokenPlugin-4.11.4-1.i686.rpm
 	sha256sums_i686 = 8374661e6af98537d3eedf321adb582ac849aa6c8746fbb794ad31234293effb
diff --git a/PKGBUILD b/PKGBUILD
index 1e79a40fe00f..8cbcd9550313 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
 
 pkgname=rutoken-plugin
 pkgver=4.11.4
-pkgrel=3
+pkgrel=4
 pkgdesc="The Rutoken plugin is necessary for connecting USB devices with the browser, it allows you to identify devices and work with them."
 arch=('i686' 'x86_64')
 url="https://www.rutoken.ru/support/download/rutoken-plugin/"
 license=('custom:rutoken-plugin')
-depends=('rutoken-pkcs')
+depends=('rutoken-pkcs' 'rutoken-connect')
 makedepends=('findutils' 'sed' 'grep' 'coreutils' 'bash')
 options=(!strip)
 
@@ -20,9 +20,16 @@ sha256sums_x86_64=('01876a9a51e30476a40b92061130e388921e51aab90824c17001d0e6cb6e
 package() {
 	cp -r "${srcdir}/usr/lib64/mozilla/native-messaging-hosts" "${srcdir}/usr/lib/mozilla/"
 	rm -rf "${srcdir}/usr/lib64"
+	rm -rf "${srcdir}/usr/lib/mozilla/plugins/pcache"
+	rm -f "${srcdir}/usr/lib/mozilla/plugins/librtpkcs11ecp.so"
+	ln -s /opt/aktivco/rutokenconnect/librtpkcs11ecp.so "${srcdir}/usr/lib/mozilla/plugins/librtpkcs11ecp.so"
+	rm -f "${srcdir}/opt/aktivco/rutokenplugin/librtpkcs11ecp.so"
 
-	find "${srcdir}" -type d | sed "s#^${srcdir}#${pkgdir}#g" | tail -n +2 | xargs install -d
-	eval $(find ${srcdir} -type f -exec bash -c 'echo install \"{}\" \"@$(dirname {})\"\;' \; | sed "s#@${srcdir}#${pkgdir}#g")
-	eval $(find ${srcdir} -type l -exec bash -c 'echo ln -s \"$(readlink {})\" \"@{}\"\;' \; | grep -v '.rpm' |  sed "s#@${srcdir}#${pkgdir}#g")
 	install -Dm644 "${srcdir}/usr/share/doc/rutokenplugin/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	rm -rf "${srcdir}/usr/share/"
+
+	for dir in 'etc' 'usr' 'opt'
+	do
+		cp -a "${srcdir}/${dir}" "${pkgdir}"
+	done
 }