From ae9aec2505c44e07cc84699d3de49eaab58302e4 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 12 Mar 2015 18:28:04 +0000 Subject: [PATCH] libssh2: bump version --- ...ssh2-1.4.3.recipe => libssh2-1.5.0.recipe} | 4 +- .../libssh2/patches/libssh2-1.4.3.patchset | 57 ------------------- .../libssh2/patches/libssh2-1.5.0.patchset | 22 +++++++ 3 files changed, 24 insertions(+), 59 deletions(-) rename net-libs/libssh2/{libssh2-1.4.3.recipe => libssh2-1.5.0.recipe} (94%) delete mode 100644 net-libs/libssh2/patches/libssh2-1.4.3.patchset create mode 100644 net-libs/libssh2/patches/libssh2-1.5.0.patchset diff --git a/net-libs/libssh2/libssh2-1.4.3.recipe b/net-libs/libssh2/libssh2-1.5.0.recipe similarity index 94% rename from net-libs/libssh2/libssh2-1.4.3.recipe rename to net-libs/libssh2/libssh2-1.5.0.recipe index 539e2e4a3..189d3e212 100644 --- a/net-libs/libssh2/libssh2-1.4.3.recipe +++ b/net-libs/libssh2/libssh2-1.5.0.recipe @@ -14,7 +14,7 @@ COPYRIGHT=" " LICENSE="BSD (3-clause)" SRC_URI="http://www.libssh2.org/download/libssh2-$portVersion.tar.gz" -CHECKSUM_SHA256="eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d" +CHECKSUM_SHA256="83196badd6868f5b926bdac8017a6f90fb8a90b16652d3bf02df0330d573d0fc" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -65,7 +65,7 @@ INSTALL() # devel package packageEntries devel \ $developDir \ - $manDir/man3 + $manDir } # ----- devel package ------------------------------------------------------- diff --git a/net-libs/libssh2/patches/libssh2-1.4.3.patchset b/net-libs/libssh2/patches/libssh2-1.4.3.patchset deleted file mode 100644 index d1db5689c..000000000 --- a/net-libs/libssh2/patches/libssh2-1.4.3.patchset +++ /dev/null @@ -1,57 +0,0 @@ -From 22c9d0908444b0d912ace76ea22f89b90b43a01c Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Fri, 13 Jun 2014 17:08:13 +0000 -Subject: haiku patch - - -diff --git a/configure.ac b/configure.ac -index dfc6988..6c2f519 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2,7 +2,7 @@ - AC_INIT(libssh2, [-], libssh2-devel@cool.haxx.se) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_SRCDIR([src]) --AM_CONFIG_HEADER([src/libssh2_config.h example/libssh2_config.h]) -+AC_CONFIG_HEADERS([src/libssh2_config.h example/libssh2_config.h]) - AM_MAINTAINER_MODE - - dnl SED is needed by some of the tools --- -1.8.3.4 - - -From 25a2ec62ce50144b20d9bf3cb674ce4e9b5beece Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Fri, 13 Jun 2014 17:19:49 +0000 -Subject: haiku patch - - -diff --git a/configure.ac b/configure.ac -index 6c2f519..b68cfba 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -60,7 +60,7 @@ dnl Our configure and build reentrant settings - CURL_CONFIGURE_REENTRANT - - # Some systems (Solaris?) have socket() in -lsocket. --AC_SEARCH_LIBS(socket, socket) -+AC_SEARCH_LIBS(socket,[socket network]) - - # Solaris has inet_addr() in -lnsl. - AC_SEARCH_LIBS(inet_addr, nsl) -diff --git a/example/x11.c b/example/x11.c -index 6480dc8..a669a73 100644 ---- a/example/x11.c -+++ b/example/x11.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -1.8.3.4 - diff --git a/net-libs/libssh2/patches/libssh2-1.5.0.patchset b/net-libs/libssh2/patches/libssh2-1.5.0.patchset new file mode 100644 index 000000000..44dddc132 --- /dev/null +++ b/net-libs/libssh2/patches/libssh2-1.5.0.patchset @@ -0,0 +1,22 @@ +From c34843e419df91f5aef52632df473bdbafe3a684 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 13 Jun 2014 17:19:49 +0000 +Subject: haiku patch + + +diff --git a/configure.ac b/configure.ac +index 563fb04..334a051 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -60,7 +60,7 @@ dnl Our configure and build reentrant settings + CURL_CONFIGURE_REENTRANT + + # Some systems (Solaris?) have socket() in -lsocket. +-AC_SEARCH_LIBS(socket, socket) ++AC_SEARCH_LIBS(socket,[socket network]) + + # Solaris has inet_addr() in -lnsl. + AC_SEARCH_LIBS(inet_addr, nsl) +-- +1.8.3.4 +