19 files changed, 5 insertions, 230 deletions

diff --git a/security/libssh/Makefile b/security/libssh/Makefile
index 822bd8c37543..9927787cb1ab 100644
--- a/security/libssh/Makefile
+++ b/security/libssh/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libssh
-PORTVERSION=	0.3.0
+PORTVERSION=	0.3.1
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.libssh.org/files/
 
diff --git a/security/libssh/distinfo b/security/libssh/distinfo
index a63a568415f7..348e3ebe9ff9 100644
--- a/security/libssh/distinfo
+++ b/security/libssh/distinfo
@@ -1,3 +1,3 @@
-MD5 (libssh-0.3.0.tar.gz) = 2496338686932685c08ed8f6ad185227
-SHA256 (libssh-0.3.0.tar.gz) = d9a7575cd3dfcfcafd3a00c8b9f40baf981b7f2d6edbdd19ea4e6ff07a4a6bf5
-SIZE (libssh-0.3.0.tar.gz) = 234813
+MD5 (libssh-0.3.1.tar.gz) = 4e053deac7b643ed67ed130d60ca4062
+SHA256 (libssh-0.3.1.tar.gz) = e84e9e661c53fa931599e166b535492422674c8d4922d86c8f9a73344fab904c
+SIZE (libssh-0.3.1.tar.gz) = 221834
diff --git a/security/libssh/files/patch-cmake_Modules_DefineCompilerFlags.cmake b/security/libssh/files/patch-cmake_Modules_DefineCompilerFlags.cmake
deleted file mode 100644
index 30940dada9f2..000000000000
--- a/security/libssh/files/patch-cmake_Modules_DefineCompilerFlags.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: cmake/Modules/DefineCompilerFlags.cmake
-===================================================================
---- cmake/Modules/DefineCompilerFlags.cmake	(revision 772)
-+++ cmake/Modules/DefineCompilerFlags.cmake	(working copy)
-@@ -29,11 +29,11 @@
-       ERROR_QUIET
-       OUTPUT_STRIP_TRAILING_WHITESPACE
-     )
-+    string(REGEX REPLACE "[\r\n]" " " "${_lfs_CFLAGS}" "${${_lfs_CFLAGS}}")
-+
-+    add_definitions(${_lfs_CFLAGS})
-   endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
- 
--  string(REGEX REPLACE "[\r\n]" " " ${_lfs_CFLAGS} "${${_lfs_CFLAGS}}")
--
--  add_definitions(${_lfs_CFLAGS})
-   add_definitions(-Wall -Wextra -Wmissing-prototypes -Wdeclaration-after-statement -Wunused)
- 
-   check_c_compiler_flag("-fstack-protector" WITH_STACK_PROTECTOR)
diff --git a/security/libssh/files/patch-libssh__agent.c b/security/libssh/files/patch-libssh__agent.c
deleted file mode 100644
index 7deaf213a064..000000000000
--- a/security/libssh/files/patch-libssh__agent.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./libssh/agent.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/agent.c	2009-07-09 08:21:13.000000000 +1000
-@@ -44,6 +44,10 @@
- #include <poll.h>
- #include <unistd.h>
- 
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
- #include "libssh/agent.h"
- #include "libssh/priv.h"
- 
diff --git a/security/libssh/files/patch-libssh__auth.c b/security/libssh/files/patch-libssh__auth.c
deleted file mode 100644
index 32b680a3b0eb..000000000000
--- a/security/libssh/files/patch-libssh__auth.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./libssh/auth.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/auth.c	2009-07-09 08:21:13.000000000 +1000
-@@ -22,12 +22,17 @@
-  * MA 02111-1307, USA.
-  */
- 
--#include "libssh/priv.h"
--#include "libssh/ssh2.h"
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
- 
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
-+#include "libssh/priv.h"
-+#include "libssh/ssh2.h"
-+
- /** \defgroup ssh_auth SSH Authentication functions
-  * \brief functions to authenticate to servers
-  */
diff --git a/security/libssh/files/patch-libssh__buffer.c b/security/libssh/files/patch-libssh__buffer.c
deleted file mode 100644
index c800538d3150..000000000000
--- a/security/libssh/files/patch-libssh__buffer.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./libssh/buffer.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/buffer.c	2009-07-09 08:21:13.000000000 +1000
-@@ -23,6 +23,11 @@
- 
- #include <stdlib.h>
- #include <string.h>
-+
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
- #include "libssh/priv.h"
- 
- /** \defgroup ssh_buffer SSH Buffers
diff --git a/security/libssh/files/patch-libssh__channels.c b/security/libssh/files/patch-libssh__channels.c
deleted file mode 100644
index 5d7279b9d875..000000000000
--- a/security/libssh/files/patch-libssh__channels.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./libssh/channels.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/channels.c	2009-07-09 08:21:13.000000000 +1000
-@@ -28,6 +28,10 @@
- #include <stdio.h>
- #include <errno.h>
- 
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
- #include "libssh/priv.h"
- #include "libssh/ssh2.h"
- 
diff --git a/security/libssh/files/patch-libssh__client.c b/security/libssh/files/patch-libssh__client.c
deleted file mode 100644
index bb938154a78e..000000000000
--- a/security/libssh/files/patch-libssh__client.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./libssh/client.c.orig	2009-05-21 18:46:18.000000000 +1000
-+++ ./libssh/client.c	2009-07-09 08:21:13.000000000 +1000
-@@ -24,6 +24,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
- #include "libssh/priv.h"
- #include "libssh/ssh2.h"
- 
diff --git a/security/libssh/files/patch-libssh__crypt.c b/security/libssh/files/patch-libssh__crypt.c
deleted file mode 100644
index 51d7f8c932a9..000000000000
--- a/security/libssh/files/patch-libssh__crypt.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./libssh/crypt.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/crypt.c	2009-07-09 08:21:13.000000000 +1000
-@@ -26,6 +26,10 @@
- #include <stdio.h>
- #include <string.h>
- 
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
- #ifdef OPENSSL_CRYPTO
- #include <openssl/blowfish.h>
- #include <openssl/evp.h>
diff --git a/security/libssh/files/patch-libssh__dh.c b/security/libssh/files/patch-libssh__dh.c
deleted file mode 100644
index df73c8be8853..000000000000
--- a/security/libssh/files/patch-libssh__dh.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./libssh/dh.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/dh.c	2009-07-09 08:21:13.000000000 +1000
-@@ -44,6 +44,10 @@
- #include <stdlib.h>
- #include <string.h>
- 
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
- #include "libssh/priv.h"
- #include "libssh/crypto.h"
- 
diff --git a/security/libssh/files/patch-libssh__kex.c b/security/libssh/files/patch-libssh__kex.c
deleted file mode 100644
index 81899b3f80a8..000000000000
--- a/security/libssh/files/patch-libssh__kex.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./libssh/kex.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/kex.c	2009-07-09 08:21:13.000000000 +1000
-@@ -25,6 +25,10 @@
- #include <stdlib.h>
- #include <stdio.h>
- 
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
- #include "config.h"
- #include "libssh/priv.h"
- #include "libssh/ssh2.h"
diff --git a/security/libssh/files/patch-libssh__keyfiles.c b/security/libssh/files/patch-libssh__keyfiles.c
deleted file mode 100644
index 73ded58d3ef6..000000000000
--- a/security/libssh/files/patch-libssh__keyfiles.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./libssh/keyfiles.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/keyfiles.c	2009-07-09 08:21:13.000000000 +1000
-@@ -29,6 +29,11 @@
- #include <stdlib.h>
- #include <fcntl.h>
- #include <ctype.h>
-+
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
- #include "libssh/priv.h"
- 
- #ifdef HAVE_LIBGCRYPT
diff --git a/security/libssh/files/patch-libssh__messages.c b/security/libssh/files/patch-libssh__messages.c
deleted file mode 100644
index b7c0f8cd1df5..000000000000
--- a/security/libssh/files/patch-libssh__messages.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./libssh/messages.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/messages.c	2009-07-09 08:21:13.000000000 +1000
-@@ -34,6 +34,11 @@
- 
- #include <string.h>
- #include <stdlib.h>
-+
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
- #include "libssh/libssh.h"
- #include "libssh/priv.h"
- #include "libssh/server.h"
diff --git a/security/libssh/files/patch-libssh__misc.c b/security/libssh/files/patch-libssh__misc.c
deleted file mode 100644
index 367f306ea090..000000000000
--- a/security/libssh/files/patch-libssh__misc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./libssh/misc.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/misc.c	2009-07-09 08:21:13.000000000 +1000
-@@ -37,6 +37,7 @@
- #include <winsock2.h>
- #else
- #include <pwd.h>
-+#include <arpa/inet.h>
- #endif
- 
- #include "libssh/priv.h"
diff --git a/security/libssh/files/patch-libssh__packet.c b/security/libssh/files/patch-libssh__packet.c
deleted file mode 100644
index 429a29c79b0d..000000000000
--- a/security/libssh/files/patch-libssh__packet.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./libssh/packet.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/packet.c	2009-07-09 08:21:13.000000000 +1000
-@@ -27,6 +27,10 @@
- #include <string.h>
- #include <errno.h>
- 
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
- #include "config.h"
- #include "libssh/priv.h"
- #include "libssh/ssh2.h"
diff --git a/security/libssh/files/patch-libssh__sftp.c b/security/libssh/files/patch-libssh__sftp.c
deleted file mode 100644
index 16bb25cfa7bf..000000000000
--- a/security/libssh/files/patch-libssh__sftp.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./libssh/sftp.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/sftp.c	2009-07-09 08:21:13.000000000 +1000
-@@ -31,6 +31,10 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
- #include "libssh/priv.h"
- #include "libssh/ssh2.h"
- #include "libssh/sftp.h"
diff --git a/security/libssh/files/patch-libssh__sftpserver.c b/security/libssh/files/patch-libssh__sftpserver.c
deleted file mode 100644
index 5251c292186a..000000000000
--- a/security/libssh/files/patch-libssh__sftpserver.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./libssh/sftpserver.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/sftpserver.c	2009-07-09 08:21:13.000000000 +1000
-@@ -26,6 +26,10 @@
- #include <string.h>
- #include <stdio.h>
- 
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
- #include "libssh/libssh.h"
- #include "libssh/sftp.h"
- #include "libssh/ssh2.h"
diff --git a/security/libssh/files/patch-libssh__string.c b/security/libssh/files/patch-libssh__string.c
deleted file mode 100644
index f4887d154405..000000000000
--- a/security/libssh/files/patch-libssh__string.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./libssh/string.c.orig	2009-05-21 18:46:17.000000000 +1000
-+++ ./libssh/string.c	2009-07-09 08:21:13.000000000 +1000
-@@ -24,6 +24,11 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-+
-+#ifndef _WIN32
-+#include <arpa/inet.h>
-+#endif
-+
- #include "libssh/priv.h"
- 
- /** \defgroup ssh_string SSH Strings
diff --git a/security/libssh/pkg-plist b/security/libssh/pkg-plist
index cd01ab3ea1f7..88dce1354de8 100644
--- a/security/libssh/pkg-plist
+++ b/security/libssh/pkg-plist
@@ -1,6 +1,6 @@
 lib/libssh.so
 lib/libssh.so.3
-lib/libssh.so.3.0.0
+lib/libssh.so.3.1.0
 include/libssh/libssh.h
 include/libssh/sftp.h
 include/libssh/crypto.h