Update socat to 1.6.0.1 (#3654)

[openwrt/svn-archive/archive.git] / net / socat / Makefile

diff --git a/net/socat/Makefile b/net/socat/Makefile
index eb768e781279fa2e78d26cd0612b1157355ca2ab..22b3aaee0ca8c1c8a83b3cbe2fa7dd861fd61325 100644 (file)
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -9,16 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=socat
-PKG_VERSION:=1.4.3.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.6.0.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download/
-PKG_MD5SUM:=ce574e75c2fda4456e8efd4efb86ec5e
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.4
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=6a0dd33cde2a18eb382433aca8f76ce2
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,16 +23,18 @@ define Package/socat
   CATEGORY:=Network
   DEPENDS:=+libpthread
   TITLE:=A multipurpose relay (SOcket CAT)
-  DESCRIPTION:=\
-       SoCat (for SOcket CAT) establishes two bidirectional byte streams and \\\
-       transfers data between them.\\\
-       Data channels may be files, pipes, devices (terminal or modem, etc.), or \\\
-       sockets (Unix, IPv4, IPv6, raw, UDP, TCP, SSL). It provides forking, \\\
-       logging and tracing, different modes for interprocess communication and \\\
-       many more options.
   URL:=http://www.dest-unreach.org/socat/
 endef
 
+define Package/socat/description
+       SoCat (for SOcket CAT) establishes two bidirectional byte streams and
+       transfers data between them.
+       Data channels may be files, pipes, devices (terminal or modem, etc.), or
+       sockets (Unix, IPv4, IPv6, raw, UDP, TCP, SSL). It provides forking,
+       logging and tracing, different modes for interprocess communication and
+       many more options.
+endef
+
 define Build/Configure
        $(call Build/Configure/Default, \
                --disable-libwrap \
@@ -56,7 +54,7 @@ endef
 
 define Package/socat/install   
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/socat $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/socat $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,socat))