From 3d6bd506ebe7c7bfcafd221dbe336a83e562942c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 13 Jun 2014 17:47:58 +0000 Subject: [PATCH] libssh2: added recipe for version 1.4.3 --- net-libs/libssh2/libssh2-1.4.3.recipe | 79 +++++++++++++++++++ .../libssh2/patches/libssh2-1.4.3.patchset | 57 +++++++++++++ 2 files changed, 136 insertions(+) create mode 100644 net-libs/libssh2/libssh2-1.4.3.recipe create mode 100644 net-libs/libssh2/patches/libssh2-1.4.3.patchset diff --git a/net-libs/libssh2/libssh2-1.4.3.recipe b/net-libs/libssh2/libssh2-1.4.3.recipe new file mode 100644 index 000000000..d0a9ab37b --- /dev/null +++ b/net-libs/libssh2/libssh2-1.4.3.recipe @@ -0,0 +1,79 @@ +SUMMARY="A SSH2 library." +DESCRIPTION=" +libssh2 is a library implementing the SSH2 protocol, available under \ +the revised BSD license. +" +HOMEPAGE="http://www.libssh2.org" +COPYRIGHT=" + 2004-2007 Sara Golemon + 2005,2006 Mikhail Gusarov + 2006-2007 The Written Word, Inc. + 2007 Eli Fant + 2009 Daniel Stenberg + 2008, 2009 Simon Josefsson + " +LICENSE="BSD (3-clause)" +SRC_URI="http://www.libssh2.org/download/libssh2-$portVersion.tar.gz" +CHECKSUM_SHA256="eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="libssh2-$portVersion.patchset" + +PROVIDES=" + libssh2$secondaryArchSuffix = $portVersion compat >= 1.4 + lib:libssh2$secondaryArchSuffix = 1.0.1 compat >= 1 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libcrypto$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libcrypto$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ + autoreconf -I m4 -f -i + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libssh2 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libssh2${secondaryArchSuffix}_devel = $portVersion compat >= 1.4 + devel:libssh2$secondaryArchSuffix = 1.0.1 compat >= 1 + " +REQUIRES_devel=" + libssh2$secondaryArchSuffix == $portVersion base + " diff --git a/net-libs/libssh2/patches/libssh2-1.4.3.patchset b/net-libs/libssh2/patches/libssh2-1.4.3.patchset new file mode 100644 index 000000000..d1db5689c --- /dev/null +++ b/net-libs/libssh2/patches/libssh2-1.4.3.patchset @@ -0,0 +1,57 @@ +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 +