From 0a31b57fbc87d5cc1fe60a12bbfa20d88ff6c668 Mon Sep 17 00:00:00 2001
From: blue-devil <bluedevil@sctzine.com>
Date: Tue, 25 Feb 2020 03:33:21 +0300
Subject: [PATCH] libssh:version bump

---
 network/misc/libssh/actions.py       | 20 +++++++++++++++-----
 network/misc/libssh/pspec.xml        | 20 +++++++++++++++-----
 network/misc/libssh/translations.xml |  9 ++++++++-
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/network/misc/libssh/actions.py b/network/misc/libssh/actions.py
index 6c358263d6..90bc4ec304 100644
--- a/network/misc/libssh/actions.py
+++ b/network/misc/libssh/actions.py
@@ -5,28 +5,38 @@
 # See the file http://www.gnu.org/copyleft/gpl.txt
 
 from pisi.actionsapi import cmaketools
-from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
 
 def setup():
+    # fix unittest error
+    pisitools.dosed("tests/unittests/torture_misc.c", "cmocka_unit_test\(torture_path_expand_tilde_unix\),", "")
+    
     shelltools.makedirs("build")
     shelltools.cd("build")
-    cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \
+    cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib \
+                          -DCMAKE_BUILD_TYPE=Release \
+                          -DUNIT_TESTING=ON \
                           -DWITH_GSSAPI=OFF", sourceDir="..")
 
 def build():
     shelltools.cd("build")
     cmaketools.make()
-    #cmaketools.make("doc")
+    autotools.make("docs")
+    
+def check():
+    shelltools.cd("build")
+    autotools.make("test")
 
 def install():
     shelltools.cd("build")
     cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
 
     #pisitools.doman("doc/man/*/*")
-    pisitools.dohtml("doc/*")
+    pisitools.dohtml("doc/html/*")
 
     shelltools.cd("..")
-    pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "INSTALL", "README")
+    pisitools.dodoc("COPYING", "README*")
\ No newline at end of file
diff --git a/network/misc/libssh/pspec.xml b/network/misc/libssh/pspec.xml
index 3972b33df8..199eb85a44 100644
--- a/network/misc/libssh/pspec.xml
+++ b/network/misc/libssh/pspec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>libssh</Name>
@@ -8,25 +8,28 @@
             <Name>PisiLinux Community</Name>
             <Email>admin@pisilinux.org</Email>
         </Packager>
+        <PartOf>network.misc</PartOf>
         <License>LGPLv2.1</License>
         <IsA>library</IsA>
         <Summary>Full C library functions for manipulating a client-side SSH connection</Summary>
         <Description>libssh library was designed to be used by programmers needing a working SSH implementation by the mean of a library. The complete control of the client is made by the programmer. With libssh, you can remotely execute programs, transfer files, use a secure and transparent tunnel for your remote programs. With its Secure FTP implementation, you can play with remote files easily, without third-party programs others than libcrypto (from openssl).</Description>
-        <Archive sha1sum="31167827e6d86fcee77323e744e51dfc19739ad6" type="tarxz">https://www.libssh.org/files/0.8/libssh-0.8.4.tar.xz</Archive>
+        <Archive sha1sum="24bb9d6f53691236f34cc8e6fec86dd659aef757" type="tarxz">https://www.libssh.org/files/0.9/libssh-0.9.3.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency>zlib-devel</Dependency>
             <Dependency>openssl-devel</Dependency>
-	    <!--Dependency>graphviz</Dependency-->
+            <Dependency>cmocka-devel</Dependency>
+            <Dependency>zlib-devel</Dependency>
             <Dependency>doxygen</Dependency>
             <Dependency>cmake</Dependency>
+            <!--Dependency>graphviz</Dependency-->
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>libssh</Name>
+        <Summary>Full C library functions for manipulating a client-side SSH connection</Summary>
         <RuntimeDependencies>
-            <Dependency>zlib</Dependency>
             <Dependency>openssl</Dependency>
+            <Dependency>zlib</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib</Path>
@@ -56,6 +59,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2020-02-24</Date>
+            <Version>0.9.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Blue Devil</Name>
+            <Email>bluedevil@sctzine.com</Email>
+        </Update>
         <Update release="5">
             <Date>2018-10-17</Date>
             <Version>0.8.4</Version>
diff --git a/network/misc/libssh/translations.xml b/network/misc/libssh/translations.xml
index 55fea85eaf..933bb689d4 100644
--- a/network/misc/libssh/translations.xml
+++ b/network/misc/libssh/translations.xml
@@ -9,5 +9,12 @@
     <Package>
         <Name>libssh-devel</Name>
         <Summary xml:lang="tr">libssh için geliştirme dosyaları</Summary>
+        <Description xml:lang="tr">libssh-devel, libssh için geliştirme dosyalarını içerir.</Description>
     </Package>
-</PISI>
+
+    <Package>
+        <Name>libssh-docs</Name>
+        <Summary xml:lang="tr">libssh için belgelendirme dosyaları</Summary>
+        <Description xml:lang="tr">libssh-docs, libssh için belgelendirme dosyalarını içerir.</Description>
+    </Package>
+</PISI>
\ No newline at end of file