Browse Source

make socat ssl flavour and update

Waldemar Brodkorb 11 years ago
parent
commit
bd12134a95
2 changed files with 15 additions and 6 deletions
  1. 0 1
      TODO
  2. 15 5
      package/socat/Makefile

+ 0 - 1
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)

+ 15 - 5
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/