Commit e92ada74 authored by Jan Pavlinec's avatar Jan Pavlinec

socat: update to version 1.7.3.2

parent 2d7779ea
......@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=socat
PKG_VERSION:=1.7.3.1
PKG_RELEASE:=4
PKG_VERSION:=1.7.3.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download
PKG_MD5SUM:=334e46924f2b386299c9db2ac22bcd36
PKG_MD5SUM:=e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251
PKG_MAINTAINER:= Ted Hess <thess@kitschensync.net>
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=GPL-2.0 OpenSSL
PKG_LICENSE_FILES:=COPYING COPYING.OpenSSL
......@@ -63,6 +63,13 @@ ifneq ($(CONFIG_SOCAT_SSL),y)
CONFIGURE_ARGS+= --disable-openssl
endif
CONFIGURE_VARS += \
sc_cv_termios_ispeed="no" \
sc_cv_sys_crdly_shift=9 \
sc_cv_sys_tabdly_shift=11 \
sc_cv_sys_csize_shift=4 \
BUILD_DATE=$(SOURCE_DATE_EPOCH)
define Package/socat/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/socat $(1)/usr/bin/
......
......@@ -21,14 +21,3 @@
#if HAVE_LINUX_IF_TUN_H
#include <linux/if_tun.h>
#endif
--- a/nestlex.c
+++ b/nestlex.c
@@ -9,6 +9,8 @@
#include "sysincludes.h"
+#include <stddef.h>
+
static int _nestlex(const char **addr,
char **token,
ptrdiff_t *len,
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,7 +38,8 @@ INSTALL = @INSTALL@
#0 CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS)
CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(CPPFLAGS)
-CLIBS = $(LIBS)
......
diff -u -r socat-1.7.3.0/socat.c socat-1.7.3.0b/socat.c
--- socat-1.7.3.0/socat.c 2015-01-24 11:15:22.000000000 +0100
+++ socat-1.7.3.0b/socat.c 2015-07-03 13:24:23.326489458 +0200
@@ -298,7 +298,6 @@
--- a/socat.c
+++ b/socat.c
@@ -298,7 +298,6 @@ int main(int argc, const char *argv[]) {
Sigaction(SIGABRT, &act, NULL);
Sigaction(SIGBUS, &act, NULL);
Sigaction(SIGFPE, &act, NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment