From bd12134a95a13984a94c7b89a5165abd7959c303 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Mar 2014 12:08:01 +0100 Subject: make socat ssl flavour and update --- TODO | 1 - package/socat/Makefile | 20 +++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/TODO b/TODO index 6f2cb0c96..61cfcc099 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,6 @@ - move tools to package host infrastructure, resolve dependency handling for host tools - add misp64 n32/n64 toolchains - hash-style=gnu for non-mips and non-musl -- socat openssl flavour + update - add fb full screen logo - port opkg with gpg signing - restart network (kill wpa_supplicant) diff --git a/package/socat/Makefile b/package/socat/Makefile index 9f9d6d701..4969a6d85 100644 --- a/package/socat/Makefile +++ b/package/socat/Makefile @@ -4,16 +4,20 @@ include ${TOPDIR}/rules.mk PKG_NAME:= socat -PKG_VERSION:= 1.7.2.2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= fe70c821a104378a834c3ed1b5971e54 +PKG_VERSION:= 1.7.2.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 6943f7a5e1ffd553ad2a900bbf05b83a PKG_DESCR:= A multipurpose relay (SOcket CAT) PKG_SECTION:= net/misc -PKG_DEPENDS:= libpthread libopenssl -PKG_BUILDDEP:= openssl +PKG_DEPENDS:= libpthread PKG_URL:= http://www.dest-unreach.org/socat/ PKG_SITES:= http://www.dest-unreach.org/socat/download/ +PKG_FLAVOURS_SOCAT:= WITH_SSL +PKGFD_WITH_SSL:= enable SSL support +PKGFS_WITH_SSL:= libopenssl +PKGFB_WITH_SSL:= openssl + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SOCAT,socat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -25,6 +29,12 @@ CONFIGURE_ENV+= sc_cv_termios_ispeed="no" \ CONFIGURE_ARGS+= --disable-libwrap \ --disable-readline +ifneq (${ADK_PACKAGE_SOCAT_WITH_SSL},) +CONFIGURE_ARGS+= --enable-openssl +else +CONFIGURE_ARGS+= --disable-openssl +endif + socat-install: ${INSTALL_DIR} ${IDIR_SOCAT}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/socat ${IDIR_SOCAT}/usr/bin/ -- cgit v1.2.3