From a970b94a6ee6dcab52737f138887b75fd01612cd Mon Sep 17 00:00:00 2001
From: 4fury-c3440d8 <icu7c1@gmail.com>
Date: Fri, 11 Sep 2020 07:29:05 +0300
Subject: [PATCH] htop-3.0.1, strace-5.8

---
 util/admin/htop/actions.py  |  7 ++++---
 util/admin/htop/pspec.xml   | 14 +++++++++++---
 util/misc/strace/actions.py |  4 ++--
 util/misc/strace/pspec.xml  |  9 ++++++++-
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/util/admin/htop/actions.py b/util/admin/htop/actions.py
index 28dceb8984..01bb639577 100644
--- a/util/admin/htop/actions.py
+++ b/util/admin/htop/actions.py
@@ -1,11 +1,12 @@
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licenses/gpl.txt
+# See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
+from pisi.actionsapi import shelltools
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
-from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
 def setup():
@@ -19,4 +20,4 @@ def build():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README")
+    pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "NEWS", "README")
diff --git a/util/admin/htop/pspec.xml b/util/admin/htop/pspec.xml
index aeafd7f665..49a5a8f6e2 100644
--- a/util/admin/htop/pspec.xml
+++ b/util/admin/htop/pspec.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>htop</Name>
-        <Homepage>http://htop.sourceforge.net/</Homepage>
+        <Homepage>https://github.com/htop-dev/htop</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -14,8 +14,9 @@
         <IsA>app:gui</IsA>
         <Summary>An interactive process viewer for Linux</Summary>
         <Description>htop is an interactive text-mode process viewer for Linux. It aims to be a better 'top'.</Description>
-        <Archive sha1sum="201f793f13dce2448e36047079875b9bd5bba75a" type="targz">http://hisham.hm/htop/releases/2.0.2/htop-2.0.2.tar.gz</Archive>
+        <Archive sha1sum="5bbd6a29b77302b5793c311e72a13b6a424a557e" type="targz">https://dl.bintray.com/htop/source/htop-3.0.1.tar.gz</Archive>
         <BuildDependencies>
+            <Dependency>python3</Dependency>
             <Dependency>ncurses-devel</Dependency>
             <Dependency>gettext-devel</Dependency>
         </BuildDependencies>
@@ -39,6 +40,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2020-09-11</Date>
+            <Version>3.0.1</Version>
+            <Comment>Rebuild New T.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
         <Update release="4">
             <Date>2018-09-09</Date>
             <Version>2.0.2</Version>
diff --git a/util/misc/strace/actions.py b/util/misc/strace/actions.py
index 44383527fa..efa4968eab 100644
--- a/util/misc/strace/actions.py
+++ b/util/misc/strace/actions.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licenses/gpl.txt
+# See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
@@ -21,4 +21,4 @@ def check():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    pisitools.dodoc("ChangeLog", "CREDITS", "NEWS", "README", "README-linux-ptrace",)
+    pisitools.dodoc("ChangeLog", "COPYING", "CREDITS", "NEWS", "README", "README-linux-ptrace",)
diff --git a/util/misc/strace/pspec.xml b/util/misc/strace/pspec.xml
index f610b61e13..b95f6f10f7 100644
--- a/util/misc/strace/pspec.xml
+++ b/util/misc/strace/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>app:console</IsA>
         <Summary>Tracks and displays system calls associated with a running process</Summary>
         <Description>strace intercepts and records the system calls called and received by a running process. strace can print a record of each system call, its arguments and its return value.</Description>
-        <Archive sha1sum="c7d2a8f9d48a70792fafab77cb2e63fa7f976d6c" type="tarxz">https://strace.io/files/4.21/strace-4.21.tar.xz</Archive>
+        <Archive sha1sum="0e60844b68a6097d46053488facbd3c40484af27" type="tarxz">https://strace.io/files/5.8/strace-5.8.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>libaio-devel</Dependency>
             <Dependency>libunwind-devel</Dependency>
@@ -35,6 +35,13 @@
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2020-09-11</Date>
+            <Version>5.8</Version>
+            <Comment>Ver. bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
         <Update release="6">
             <Date>2020-08-13</Date>
             <Version>4.21</Version>