Browse Source

socat: update to 1.8.1.1

Waldemar Brodkorb 3 months ago
parent
commit
478b14c416

+ 2 - 3
package/socat/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		socat
-PKG_VERSION:=		1.7.4.3
+PKG_VERSION:=		1.8.1.1
 PKG_RELEASE:=		1
-PKG_HASH:=		d697245144731423ddbbceacabbd29447089ea223e9a439b28f9ff90d0dd216e
+PKG_HASH:=		f68b602c80e94b4b7498d74ec408785536fe33534b39467977a82ab2f7f01ddb
 PKG_DESCR:=		multipurpose relay
 PKG_SECTION:=		net/misc
 PKG_NEEDS:=		threads
@@ -25,7 +25,6 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SOCAT,socat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-AUTOTOOL_STYLE:=	autoconf
 CONFIGURE_ENV+=		sc_cv_termios_ispeed=no \
 			sc_cv_sys_crdly_shift=9 \
 			sc_cv_sys_tabdly_shift=11 \

+ 0 - 12
package/socat/patches/patch-Makefile_in

@@ -1,12 +0,0 @@
---- socat-1.7.2.4.orig/Makefile.in	2014-03-09 15:48:44.000000000 +0100
-+++ socat-1.7.2.4/Makefile.in	2014-03-22 12:13:46.000000000 +0100
-@@ -38,7 +38,8 @@ INSTALL = @INSTALL@
- 
- #0 CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS)
- CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(CPPFLAGS)
--CLIBS = $(LIBS)
-+LDFLAGS = @LDFLAGS@
-+CLIBS = $(LDFLAGS) $(LIBS)
- #CLIBS = $(LIBS) -lm -lefence
- XIOSRCS = xioinitialize.c xiohelp.c xioparam.c xiodiag.c xioopen.c xioopts.c \
- 	xiosignal.c xiosigchld.c xioread.c xiowrite.c \

+ 0 - 14
package/socat/patches/patch-sysincludes_h

@@ -1,14 +0,0 @@
---- socat-1.7.3.0.orig/sysincludes.h	2015-01-24 11:15:22.000000000 +0100
-+++ socat-1.7.3.0/sysincludes.h	2015-12-29 20:35:27.000000000 +0100
-@@ -141,9 +141,11 @@
- #if HAVE_NETINET_IF_ETHER_H
- #include <netinet/if_ether.h>
- #endif
-+#if defined(__GLIBC__)
- #if HAVE_LINUX_IF_TUN_H
- #include <linux/if_tun.h>
- #endif
-+#endif
- 
- #if HAVE_TERMIOS_H && _WITH_TERMIOS
- #include <termios.h>

+ 0 - 12
package/socat/patches/patch-xio-ip4_c

@@ -1,12 +0,0 @@
---- socat-1.7.2.2.orig/xio-ip4.c	2010-10-06 09:25:30.000000000 +0200
-+++ socat-1.7.2.2/xio-ip4.c	2013-12-25 15:46:30.000000000 +0100
-@@ -13,6 +13,9 @@
- #include "xio-ip.h"
- #include "xio-ip4.h"
- 
-+#if !defined(__GLIBC__)
-+# define NETDB_INTERNAL       -1 
-+#endif
- 
- int xioparsenetwork_ip4(const char *rangename, struct xiorange *range) {
-    struct hostent *maskaddr;

+ 0 - 12
package/socat/patches/patch-xio-proxy_c

@@ -1,12 +0,0 @@
---- socat-1.7.2.2.orig/xio-proxy.c	2011-12-06 08:45:03.000000000 +0100
-+++ socat-1.7.2.2/xio-proxy.c	2013-12-25 15:47:38.000000000 +0100
-@@ -16,6 +16,9 @@
- 
- #include "xio-proxy.h"
- 
-+#if !defined(__GLIBC__)
-+# define NETDB_INTERNAL       -1 
-+#endif
- 
- #define PROXYPORT "8080"
- 

+ 0 - 15
package/socat/patches/patch-xio-tun_c

@@ -1,15 +0,0 @@
---- socat-1.7.2.2.orig/xio-tun.c	2011-12-06 08:45:03.000000000 +0100
-+++ socat-1.7.2.2/xio-tun.c	2013-12-25 15:51:46.000000000 +0100
-@@ -14,6 +14,12 @@
- 
- #include "xio-tun.h"
- 
-+#if !defined(__GLIBC__)
-+#define IFF_TUN                0x0001
-+#define IFF_TAP                0x0002
-+#define IFF_NO_PI      0x1000
-+#define TUNSETIFF     _IOW('T', 202, int)
-+#endif
- 
- static int xioopen_tun(int argc, const char *argv[], struct opt *opts, int xioflags, xiofile_t *fd, unsigned groups, int dummy1, int dummy2, int dummy3);
-