From 469b35af91f6b8123943bab064ecf362e28bc438 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 16 Dec 2013 10:54:03 +0100
Subject: fix xbmc build, use swig and sdl host, add CEC,NFS, SSH and Samba
 support

---
 package/libssh/Makefile | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/libssh/Makefile

(limited to 'package/libssh')

diff --git a/package/libssh/Makefile b/package/libssh/Makefile
new file mode 100644
index 000000000..34f282de2
--- /dev/null
+++ b/package/libssh/Makefile
@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libssh
+PKG_VERSION:=		0.5.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		9ad01838d3b89d98e900e0f6260a88cc
+PKG_DESCR:=		SSH library
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libopenssl zlib
+PKG_BUILDDEP:=		openssl zlib
+PKG_URL:=		http://www.libssh.org/
+PKG_SITES:=		http://www.libssh.org/files/0.5/
+PKG_OPTS:=		dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSSH,libssh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
+CONFIG_STYLE:=          manual
+
+do-configure:
+	(cd $(WRKBUILD) && PATH='${TARGET_PATH}' cmake -DCMAKE_SYSTEM_NAME=Linux \
+		-DCMAKE_INSTALL_PREFIX=/usr -DZLIB_ROOT_DIR='$(STAGING_TARGET_DIR)/usr' $(WRKSRC)/)
+
+libssh-install:
+	$(INSTALL_DIR) $(IDIR_LIBSSH)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libssh*.so* \
+		$(IDIR_LIBSSH)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From bb8da6757f0a0be18341e2a31a97ab1e8fffa37f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 17 Dec 2013 11:56:39 +0100
Subject: set openssl dir correctly

---
 package/libssh/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'package/libssh')

diff --git a/package/libssh/Makefile b/package/libssh/Makefile
index 34f282de2..871f1e2b5 100644
--- a/package/libssh/Makefile
+++ b/package/libssh/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libssh
 PKG_VERSION:=		0.5.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		9ad01838d3b89d98e900e0f6260a88cc
 PKG_DESCR:=		SSH library
 PKG_SECTION:=		libs
@@ -23,8 +23,11 @@ WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
 CONFIG_STYLE:=          manual
 
 do-configure:
-	(cd $(WRKBUILD) && PATH='${TARGET_PATH}' cmake -DCMAKE_SYSTEM_NAME=Linux \
-		-DCMAKE_INSTALL_PREFIX=/usr -DZLIB_ROOT_DIR='$(STAGING_TARGET_DIR)/usr' $(WRKSRC)/)
+	(cd $(WRKBUILD) && PATH='${TARGET_PATH}' \
+		cmake -DCMAKE_SYSTEM_NAME=Linux \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DOPENSSL_ROOT_DIR='$(STAGING_TARGET_DIR)/usr' \
+		-DZLIB_ROOT_DIR='$(STAGING_TARGET_DIR)/usr' $(WRKSRC)/)
 
 libssh-install:
 	$(INSTALL_DIR) $(IDIR_LIBSSH)/usr/lib
-- 
cgit v1.2.3


From 346e5341b1f5bad2b257bd7658669fbfac7a3bec Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 17 Dec 2013 13:21:07 +0100
Subject: remove stack protector check

---
 package/libssh/Makefile                                    |  2 +-
 .../patches/patch-cmake_Modules_DefineCompilerFlags_cmake  | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake

(limited to 'package/libssh')

diff --git a/package/libssh/Makefile b/package/libssh/Makefile
index 871f1e2b5..8d7b455fb 100644
--- a/package/libssh/Makefile
+++ b/package/libssh/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libssh
 PKG_VERSION:=		0.5.3
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		9ad01838d3b89d98e900e0f6260a88cc
 PKG_DESCR:=		SSH library
 PKG_SECTION:=		libs
diff --git a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake
new file mode 100644
index 000000000..a67998250
--- /dev/null
+++ b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake
@@ -0,0 +1,14 @@
+--- 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)
+             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+         endif (WITH_FPIC)
+ 
+-        check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
+-        if (WITH_STACK_PROTECTOR)
+-            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")
-- 
cgit v1.2.3