summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/libssh/Makefile10
-rw-r--r--package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake12
-rw-r--r--package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake8
-rw-r--r--package/libssh/patches/patch-include_libssh_libssh_h6
4 files changed, 19 insertions, 17 deletions
diff --git a/package/libssh/Makefile b/package/libssh/Makefile
index 6a49c346a..2543a7863 100644
--- a/package/libssh/Makefile
+++ b/package/libssh/Makefile
@@ -4,17 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libssh
-PKG_VERSION:= 0.5.3
-PKG_RELEASE:= 3
-PKG_MD5SUM:= 9ad01838d3b89d98e900e0f6260a88cc
+PKG_VERSION:= 0.6.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 66cf16e77f60913b4d54f18c92cdbf71
PKG_DESCR:= SSH library
PKG_SECTION:= libs
PKG_DEPENDS:= libopenssl zlib
PKG_BUILDDEP:= cmake-host openssl zlib
PKG_URL:= http://www.libssh.org/
-PKG_SITES:= http://www.libssh.org/files/0.5/
+PKG_SITES:= https://red.libssh.org/attachments/download/87/
PKG_OPTS:= dev
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBSSH,libssh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake
index a67998250..b8e077b94 100644
--- a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake
+++ b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake
@@ -1,6 +1,6 @@
---- libssh-0.5.3.orig/cmake/Modules/DefineCompilerFlags.cmake 2012-11-20 12:41:49.000000000 +0100
-+++ libssh-0.5.3/cmake/Modules/DefineCompilerFlags.cmake 2013-12-17 13:20:04.073723090 +0100
-@@ -20,11 +20,6 @@ if (UNIX AND NOT WIN32)
+--- libssh-0.6.3.orig/cmake/Modules/DefineCompilerFlags.cmake 2014-02-06 10:20:57.000000000 +0100
++++ libssh-0.6.3/cmake/Modules/DefineCompilerFlags.cmake 2014-03-14 09:10:56.621673326 +0100
+@@ -21,11 +21,6 @@ if (UNIX AND NOT WIN32)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
endif (WITH_FPIC)
@@ -9,6 +9,6 @@
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
- endif (WITH_STACK_PROTECTOR)
-
- check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE)
- if (WITH_FORTIFY_SOURCE)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
+ if (CMAKE_BUILD_TYPE)
+ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+ if (CMAKE_BUILD_TYPE_LOWER MATCHES (release|relwithdebinfo|minsizerel))
diff --git a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
index 9a140e652..e7fcdfd2d 100644
--- a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
+++ b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
@@ -1,5 +1,5 @@
---- libssh-0.5.3.orig/cmake/Modules/FindZLIB.cmake 2012-11-20 12:41:49.000000000 +0100
-+++ libssh-0.5.3/cmake/Modules/FindZLIB.cmake 2014-01-11 12:11:52.000000000 +0100
+--- libssh-0.6.3.orig/cmake/Modules/FindZLIB.cmake 2013-12-21 18:37:12.000000000 +0100
++++ libssh-0.6.3/cmake/Modules/FindZLIB.cmake 2014-03-14 09:07:03.296701809 +0100
@@ -61,11 +61,11 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
NAMES
zlib.h
@@ -13,9 +13,9 @@
)
mark_as_advanced(ZLIB_INCLUDE_DIR)
-@@ -98,12 +98,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
- zlib
+@@ -99,12 +99,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
zlib1
+ zlibd
PATHS
+ ${ZLIB_ROOT_DIR}/lib
/usr/local/lib
diff --git a/package/libssh/patches/patch-include_libssh_libssh_h b/package/libssh/patches/patch-include_libssh_libssh_h
index 8811f79fb..dc60939bf 100644
--- a/package/libssh/patches/patch-include_libssh_libssh_h
+++ b/package/libssh/patches/patch-include_libssh_libssh_h
@@ -1,6 +1,6 @@
---- libssh-0.5.3.orig/include/libssh/libssh.h 2012-11-20 12:41:49.000000000 +0100
-+++ libssh-0.5.3/include/libssh/libssh.h 2014-01-11 12:04:00.000000000 +0100
-@@ -57,6 +57,7 @@
+--- libssh-0.6.3.orig/include/libssh/libssh.h 2014-03-04 13:20:48.000000000 +0100
++++ libssh-0.6.3/include/libssh/libssh.h 2014-03-14 09:07:03.304701842 +0100
+@@ -56,6 +56,7 @@
typedef unsigned long long uint64_t;
typedef int mode_t;
#else /* _MSC_VER */