Dpkg drop in; some patches

4 files changed, 241 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f9b3dd8f27c..67a4205cbd63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = eparakstitajs3
 	pkgdesc = Application software to sign and validate documents in EDOC and PDF formats.
 	pkgver = 1.5.13
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.eparaksts.lv
 	arch = x86_64
 	groups = eparaksts
@@ -10,11 +10,15 @@ pkgbase = eparakstitajs3
 	depends = gtk3
 	depends = java-environment
 	depends = libnet
-	optdepends = python2-nautilus: Nautilus context menu integration
+	optdepends = python-nautilus: Nautilus context menu integration
 	optdepends = eparaksts-token-signing: eParaksts browser plugins
 	optdepends = latvia-eid-middleware: libraries for Latvia eID cards
 	source = https://www.eparaksts.lv/files/ep3updates/debian/pool/eparaksts/e/eparakstitajs3/eparakstitajs3_1.5.13_amd64.deb
+	source = dpkg
+	source = eparakstitajs3.patch
 	sha512sums = 9e2ea6e038bbc7c56e9ce3c7cbae4c4bb2470e5416c39d5ad337cac4bba3e81860cce4a5702a2fd2b1e93937321ac5da24d0966b21fabc8d043ff917e273992c
+	sha512sums = 2831607d41e6480620869264866711341917de093bdd0228c2b8efb041c9c9ae8861ca0564f1e9917dab888cad69eb81c97a7a5509b58adb2ce61eb7a95a3d4a
+	sha512sums = 67b54637f08abb7b6b2b810cab9db76db41d94df887c56efe84d83b39052936a2a3b37f15f7b33b1fd9a29fafb9dec9ea03895770e6b15bbda5dff7ccc6d2f63
 
 pkgname = eparakstitajs3
 
diff --git a/PKGBUILD b/PKGBUILD
index 00efb301360e..41b5ced5467d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,22 @@
 # Maintainer: Māris Vilks <kaaposc@gmail.com>
 pkgname=eparakstitajs3
 pkgver=1.5.13
-pkgrel=1
+pkgrel=2
 pkgdesc="Application software to sign and validate documents in EDOC and PDF formats."
 arch=('x86_64')
 url="https://www.eparaksts.lv"
 license=('custom:E-PARAKSTĪTĀJS 3')
 groups=('eparaksts')
 depends=('gtk2' 'gtk3' 'java-environment' 'libnet')
-optdepends=('python2-nautilus: Nautilus context menu integration'
+optdepends=('python-nautilus: Nautilus context menu integration'
             'eparaksts-token-signing: eParaksts browser plugins'
             'latvia-eid-middleware: libraries for Latvia eID cards')
-source=("https://www.eparaksts.lv/files/ep3updates/debian/pool/eparaksts/e/${pkgname}/${pkgname}_${pkgver}_amd64.deb")
-sha512sums=('9e2ea6e038bbc7c56e9ce3c7cbae4c4bb2470e5416c39d5ad337cac4bba3e81860cce4a5702a2fd2b1e93937321ac5da24d0966b21fabc8d043ff917e273992c')
+source=("https://www.eparaksts.lv/files/ep3updates/debian/pool/eparaksts/e/${pkgname}/${pkgname}_${pkgver}_amd64.deb"
+        'dpkg'
+        'eparakstitajs3.patch')
+sha512sums=('9e2ea6e038bbc7c56e9ce3c7cbae4c4bb2470e5416c39d5ad337cac4bba3e81860cce4a5702a2fd2b1e93937321ac5da24d0966b21fabc8d043ff917e273992c'
+            '2831607d41e6480620869264866711341917de093bdd0228c2b8efb041c9c9ae8861ca0564f1e9917dab888cad69eb81c97a7a5509b58adb2ce61eb7a95a3d4a'
+            '67b54637f08abb7b6b2b810cab9db76db41d94df887c56efe84d83b39052936a2a3b37f15f7b33b1fd9a29fafb9dec9ea03895770e6b15bbda5dff7ccc6d2f63')
 
 package() {
 
@@ -20,4 +24,10 @@ package() {
 
   install -D "${pkgdir}/usr/share/doc/eparakstitajs3/copyright" "${pkgdir}/usr/share/licenses/$pkgname/copyright"
 
+  install -D "${srcdir}/dpkg" "${pkgdir}/opt/eparakstitajs3/dpkg"
+
+  cd "${pkgdir}"
+  patch --forward --strip=1 < "${srcdir}/${pkgname}.patch"
+  
 }
+
diff --git a/dpkg b/dpkg
new file mode 100755
index 000000000000..e9ebba4de1e6
--- /dev/null
+++ b/dpkg
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+##
+#       NOTES by kaaposc@gmail.com
+#
+# Plain dumb Debian's dpkg replacement just for eparakstitajs3 package
+#   version checking. Uses pacman to get info on the package and prints
+#   out stripped down package info.
+#
+# Judging by verbose eparakstitajs3 output it tries to call
+#   `dpkg -s package-name`
+#   to see if needed packages are installed and up to date. It seems to look
+#   for Version: and Status: lines, so we print them out.
+#
+##
+
+usage() {
+    echo 'dpkg -s <pkg-name>'
+    exit 1
+}
+
+if [ -z "$1" ] || [ "$1" != "-s" ] || [ -z "$2" ]; then usage; fi
+
+out=$(pacman -Qi $2 2>&1)
+
+if [ $? -ne 0 ]; then
+    echo "Package $2 not found."
+    exit 1
+fi
+
+name=$(echo "$out" | grep -e '^Name' | awk '{print $3}')
+version=$(echo "$out" | grep -e '^Version' | awk '{print $3}')
+
+echo "Package: $name"
+echo "Version: $version"
+echo "Status: install ok installed"
diff --git a/eparakstitajs3.patch b/eparakstitajs3.patch
new file mode 100644
index 000000000000..5ec2116bde0d
--- /dev/null
+++ b/eparakstitajs3.patch
@@ -0,0 +1,185 @@
+diff --color --unified --recursive --text --color eparakstitajs3.orig/usr/share/applications/eparakstitajs3.desktop eparakstitajs3.new/usr/share/applications/eparakstitajs3.desktop
+--- eparakstitajs3.orig/usr/share/applications/eparakstitajs3.desktop	2021-02-13 12:00:00.000000000 +0200
++++ eparakstitajs3.new/usr/share/applications/eparakstitajs3.desktop	2021-02-14 16:03:48.412307112 +0200
+@@ -4,7 +4,7 @@
+ Icon=eparakstitajs3
+ Type=Application
+ Categories=Application;Office;Viewer;
+-Exec=/opt/eparakstitajs3/eparakstitajs3 %F
++Exec=env PATH=/opt/eparakstitajs3:$PATH /opt/eparakstitajs3/eparakstitajs3 %F
+ MimeType=application/pdf;application/lv.eme.edoc;application/vnd.etsi.asic-e+zip;
+ StartupWMClass=lv.euso.signanywhere.SignAnywhere
+ 
+diff --color --unified --recursive --text --color eparakstitajs3.orig/usr/share/menu/eparakstitajs3 eparakstitajs3.new/usr/share/menu/eparakstitajs3
+--- eparakstitajs3.orig/usr/share/menu/eparakstitajs3	2021-02-13 12:00:00.000000000 +0200
++++ eparakstitajs3.new/usr/share/menu/eparakstitajs3	2021-02-14 16:04:21.924916639 +0200
+@@ -1,5 +1,5 @@
+ ?package(eparakstitajs3):needs="X11" section="Applications/Viewers"\

+-  title="eParakstītājs 3.0" command="/opt/eparakstitajs3/eparakstitajs3"\

++  title="eParakstītājs 3.0" command="env PATH=/opt/eparakstitajs3:$PATH /opt/eparakstitajs3/eparakstitajs3"\

+   hints="eParakstītājs 3.0"\

+   kderemove="y"\

+   icon="/usr/share/icons/hicolor/32x32/apps/eparakstitajs3.png"

+diff --color --unified --recursive --text --color eparakstitajs3.orig/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py eparakstitajs3.new/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py
+--- eparakstitajs3.orig/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py	2021-02-13 12:00:00.000000000 +0200
++++ eparakstitajs3.new/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py	2021-02-14 16:13:33.916358188 +0200
+@@ -1,7 +1,10 @@
+ from gi.repository import Nautilus, GObject
+ import subprocess
+ import os
+-import urllib
++import urllib.request
++import urllib.parse
++import urllib.error
++
+ 
+ class eParakstsContextMenu(GObject.GObject, Nautilus.MenuProvider):
+ 
+@@ -9,78 +12,86 @@
+         pass
+ 
+     def open_eparakstitajs(self, menu, command, files):
+-        print "menu_activate_cb", command
+-	bash_string=["/opt/eparakstitajs3/eparakstitajs3", command]
+-	for file in files:
+-		bash_string.append(file.get_location().get_path())
+-	
+-	subprocess.Popen(bash_string)
+-    
++        print("menu_activate_cb", command)
++        bash_string = ["/opt/eparakstitajs3/eparakstitajs3", command]
++        for file in files:
++            bash_string.append(file.get_location().get_path())
++
++        subprocess.Popen(bash_string)
++
+     def dir_count(self, files):
+-	dirCount = 0
+-	for file in files:
+-		if (file.is_directory()):
+-			dirCount += 1
+-	return dirCount
++        dirCount = 0
++        for file in files:
++            if (file.is_directory()):
++                dirCount += 1
++        return dirCount
+ 
+     def enable_sign(self, files):
+-	noDirs = (self.dir_count(files) == 0)
+-	return noDirs
++        noDirs = (self.dir_count(files) == 0)
++        return noDirs
+ 
+     def enable_signpdf(self, files):
+-	noDirs = (self.dir_count(files) == 0)
+-	multiplePDFFiles = True
+-	for file in files:
+-		if ((file.get_mime_type() != "application/pdf")):
+-			multiplePDFFiles = False
+-			break
+-	return (noDirs and multiplePDFFiles)
+-   
++        noDirs = (self.dir_count(files) == 0)
++        multiplePDFFiles = True
++        for file in files:
++            if ((file.get_mime_type() != "application/pdf")):
++                multiplePDFFiles = False
++                break
++        return (noDirs and multiplePDFFiles)
++
+     def enable_new(self, files):
+-	singleDir = (self.dir_count(files) == 1 and len(files) == 1)
+-	noDirs = (self.dir_count(files) == 0)
+-	return (singleDir or noDirs)
+-   
++        singleDir = (self.dir_count(files) == 1 and len(files) == 1)
++        noDirs = (self.dir_count(files) == 0)
++        return (singleDir or noDirs)
++
+     def enable_batch(self, files):
+-	singleDir = (self.dir_count(files) == 1 and len(files) == 1)
+-	multipleFiles = (self.dir_count(files) == 0 and  len(files) > 1)
+-	return (singleDir or multipleFiles)
++        singleDir = (self.dir_count(files) == 1 and len(files) == 1)
++        multipleFiles = (self.dir_count(files) == 0 and len(files) > 1)
++        return (singleDir or multipleFiles)
+ 
+     def get_file_items(self, window, files):
+-	if (len(files) > 0):
+-		# Top menu  eParakstitajs
+-        	top_menuitem = Nautilus.MenuItem(name='eParakstsContextMenuProvider::eParakstitajs', label='eParakstitajs', tip='', icon='')
+-        	submenu = Nautilus.Menu()
+-        	top_menuitem.set_submenu(submenu)
+-
+-		# Sign as eDOC
+-		if (self.enable_sign(files)):
+-        		sub_menuitem = Nautilus.MenuItem(name='eParakstsContextMenuProvider::SignEDOC',label='Sign as eDOC', tip='', icon='')
+-			submenu.append_item(sub_menuitem)
+-			sub_menuitem.connect('activate', self.open_eparakstitajs, "-sign", files)
+-        
+-		# Sign as PDF
+-		if (self.enable_signpdf(files)):
+-        		sub_menuitem = Nautilus.MenuItem(name='eParakstsContextMenuProvider::SignPDF',	label='Sign as PDF', tip='', icon='')
+-       			submenu.append_item(sub_menuitem)
+-			sub_menuitem.connect('activate', self.open_eparakstitajs, "-signpdf", files)
+-
+-		# New with eParakstitajs
+-		if (self.enable_new(files)):
+-        		sub_menuitem = Nautilus.MenuItem(name='eParakstsContextMenuProvider::New', 	label='New with eParakstitajs', tip='', icon='')
+-        		submenu.append_item(sub_menuitem)
+-			sub_menuitem.connect('activate', self.open_eparakstitajs, "-new", files)
+-
+-		# Batch with eParakstitajs
+-		if (self.enable_batch(files)):
+-        		sub_menuitem = Nautilus.MenuItem(name='eParakstsContextMenuProvider::Batch',	label='Batch with eParakstitajs', tip='', icon='')
+-        		submenu.append_item(sub_menuitem)
+-			sub_menuitem.connect('activate', self.open_eparakstitajs, "-batch", files)
+- 		
+-		return [top_menuitem]
++        if (len(files) > 0):
++            # Top menu  eParakstitajs
++            top_menuitem = Nautilus.MenuItem(
++                name='eParakstsContextMenuProvider::eParakstitajs', label='eParakstitajs', tip='', icon='')
++            submenu = Nautilus.Menu()
++            top_menuitem.set_submenu(submenu)
++
++            # Sign as eDOC
++            if (self.enable_sign(files)):
++                sub_menuitem = Nautilus.MenuItem(
++                    name='eParakstsContextMenuProvider::SignEDOC', label='Sign as eDOC', tip='', icon='')
++                submenu.append_item(sub_menuitem)
++                sub_menuitem.connect(
++                    'activate', self.open_eparakstitajs, "-sign", files)
++
++            # Sign as PDF
++            if (self.enable_signpdf(files)):
++                sub_menuitem = Nautilus.MenuItem(
++                    name='eParakstsContextMenuProvider::SignPDF',	label='Sign as PDF', tip='', icon='')
++                submenu.append_item(sub_menuitem)
++                sub_menuitem.connect(
++                    'activate', self.open_eparakstitajs, "-signpdf", files)
++
++            # New with eParakstitajs
++            if (self.enable_new(files)):
++                sub_menuitem = Nautilus.MenuItem(
++                    name='eParakstsContextMenuProvider::New', 	label='New with eParakstitajs', tip='', icon='')
++                submenu.append_item(sub_menuitem)
++                sub_menuitem.connect(
++                    'activate', self.open_eparakstitajs, "-new", files)
++
++            # Batch with eParakstitajs
++            if (self.enable_batch(files)):
++                sub_menuitem = Nautilus.MenuItem(
++                    name='eParakstsContextMenuProvider::Batch',	label='Batch with eParakstitajs', tip='', icon='')
++                submenu.append_item(sub_menuitem)
++                sub_menuitem.connect(
++                    'activate', self.open_eparakstitajs, "-batch", files)
++
++            return [top_menuitem]
+ 
+         return
+ 
+     def get_background_items(self, window, file):
+         return
+-