From e80cc3f1acfe90e481f7ed7fceda59d333b48242 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Wed, 8 Jan 2020 19:00:47 +0300
Subject: [PATCH 1/2] save archive with a different name.

---
 .../save-archive-with-a-different-name.patch  | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 system/base/pisi/files/save-archive-with-a-different-name.patch

diff --git a/system/base/pisi/files/save-archive-with-a-different-name.patch b/system/base/pisi/files/save-archive-with-a-different-name.patch
new file mode 100644
index 00000000..79664c00
--- /dev/null
+++ b/system/base/pisi/files/save-archive-with-a-different-name.patch
@@ -0,0 +1,64 @@
+diff -Nuar a/pisi/comariface.py b/pisi/comariface.py
+--- a/pisi/comariface.py	2011-05-26 20:17:29.000000000 +0300
++++ b/pisi/comariface.py	2020-01-08 18:44:29.795094390 +0300
+@@ -10,16 +10,17 @@
+ # Please read the COPYING file.
+ #
+ 
++import gettext
+ import os
+-import time
+ import string
++import time
++
++import pisi
++import pisi.context as ctx
+ 
+-import gettext
+ __trans = gettext.translation('pisi', fallback=True)
+ _ = __trans.ugettext
+ 
+-import pisi
+-import pisi.context as ctx
+ 
+ class Error(pisi.Error):
+     pass
+@@ -30,10 +31,12 @@
+ except ImportError:
+     raise Error(_("comar-api package is not fully installed"))
+ 
++
+ def is_char_valid(char):
+     """Test if char is valid object path character."""
+     return char in string.ascii_letters + string.digits + "_"
+ 
++
+ def is_method_missing(exception):
+     """Tells if exception is about missing method in COMAR script"""
+     if exception._dbus_error_name in ("tr.org.pardus.comar.python.missing",
+@@ -41,6 +44,7 @@
+         return True
+     return False
+ 
++
+ def safe_script_name(package):
+     """Generates DBus-safe object name for package script names."""
+     object = package
+@@ -51,6 +55,7 @@
+         object = '_%s' % object
+     return object
+ 
++
+ def get_link():
+     """Connect to the COMAR daemon and return the link."""
+ 
+@@ -190,8 +195,7 @@
+     link = get_link()
+ 
+     package_name = safe_script_name(package_name)
+-    scripts = set([safe_script_name(s.name) for s \
+-            in provided_scripts if s.name])
++    scripts = set([safe_script_name(s.name) for s in provided_scripts if s.name])
+     scripts.add(package_name)
+ 
+     if package_name in list(link.System.Package):

From a20ae9d2176e0722774aa5120a3ced14d358497b Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Wed, 8 Jan 2020 19:03:17 +0300
Subject: [PATCH 2/2] pisi-2.6.2

---
 system/base/pisi/pspec.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/base/pisi/pspec.xml b/system/base/pisi/pspec.xml
index 98312ea5..bf6e4850 100644
--- a/system/base/pisi/pspec.xml
+++ b/system/base/pisi/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>app:console</IsA>
         <Summary>PISI is the package management system of Pisi Linux</Summary>
         <Description>PISI is a modern package management system implemented in Python. Some of its main features are: package sources are written in XML and python, implements all functions through a simple-to-use API, integrates low-level and high-level package management features.</Description>
-        <Archive sha1sum="071e80356df2dddd7628d63431ea080d8f765a3b" type="targz">https://github.com/PisiLinuxNew/pisi/archive/v2.6.2.tar.gz</Archive>
+        <Archive sha1sum="7f16d1a0e4c8d2df73838a329485b74523fe50ad" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/pisi-2.6.tar.xz</Archive>
         <AdditionalFiles>
             <AdditionalFile permission="0644" target="pisi.conf-i686">pisi.conf-i686</AdditionalFile>
             <AdditionalFile permission="0644" target="pisi.conf-x86_64">pisi.conf-x86_64</AdditionalFile>
@@ -36,7 +36,7 @@
             <Patch>emergeup.patch</Patch>
             <Patch>fetch.patch</Patch>
             <Patch>kerneltools_extra_headers_moved.patch</Patch>
-            <!--Patch>kernel-5.4-kerneltools-headers.patch</Patch-->
+            <Patch>save-archive-with-a-different-name.patch</Patch>
         </Patches>
     </Source>