[oe-commits] org.oe.dev socat: fix termios stuff, closes #1407

[balle commit]

socat: fix termios stuff, closes #1407

Author: balle at chaostal.de
Branch: org.openembedded.dev
Revision: 5b517db465e78171fe40e917eed17ab8594b1423
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5b517db465e78171fe40e917eed17ab8594b1423
Files:
1
packages/socat/socat-1.3.2.1/xioinitialize.patch
packages/socat/socat-1.3.2.1/xioopen.patch
packages/socat/socat_1.3.2.1.bb
Diffs:

#
# mt diff -rb8008aabce59082ac3d1ce2199f08f43bfd1c6da -r5b517db465e78171fe40e917eed17ab8594b1423
#
# 
# 
# add_file "packages/socat/socat-1.3.2.1/xioinitialize.patch"
#  content [697abb3b4898f60da39ca9904ca44c0bb5a9f3f4]
# 
# add_file "packages/socat/socat-1.3.2.1/xioopen.patch"
#  content [e2cec694f8d45bf4df68b2c9f2fc32e765995990]
# 
# patch "packages/socat/socat_1.3.2.1.bb"
#  from [8c48534a914a4a518b11248fecea1a0541916a0d]
#    to [3a1a562195d080f43ef437c3771f89d0f3a400d8]
# 
============================================================
--- packages/socat/socat-1.3.2.1/xioinitialize.patch	697abb3b4898f60da39ca9904ca44c0bb5a9f3f4
+++ packages/socat/socat-1.3.2.1/xioinitialize.patch	697abb3b4898f60da39ca9904ca44c0bb5a9f3f4
@@ -0,0 +1,52 @@
+diff -Naur socat-1.3/xioinitialize.c socat-1.3_patched/xioinitialize.c
+--- socat-1.3/xioinitialize.c	2003-05-23 08:24:53.000000000 +0200
++++ socat-1.3_patched/xioinitialize.c	2006-09-09 18:18:19.000000000 +0200
+@@ -19,48 +19,10 @@
+    assert(O_WRONLY==1);
+    assert(O_RDWR==2);
+ 
+-   /* some assertions about termios */
+-#if WITH_TERMIOS
+-#ifdef CRDLY
+-   assert(3 << opt_crdly.arg3  == CRDLY);
+-#endif
+-#ifdef TABDLY
+-   assert(3 << opt_tabdly.arg3 == TABDLY);
+-#endif
+-   assert(3 << opt_csize.arg3  == CSIZE);
+-   {
+-      union {
+-	 struct termios termarg;
+-	 tcflag_t flags[4];
+-#if HAVE_TERMIOS_ISPEED
+-	 speed_t speeds[sizeof(struct termios)/sizeof(speed_t)];
+-#endif
+-      } tdata;
+-      tdata.termarg.c_iflag = 0x12345678;
+-      tdata.termarg.c_oflag = 0x23456789;
+-      tdata.termarg.c_cflag = 0x3456789a;
+-      tdata.termarg.c_lflag = 0x456789ab;
+-      assert(tdata.termarg.c_iflag == tdata.flags[0]);
+-      assert(tdata.termarg.c_oflag == tdata.flags[1]);
+-      assert(tdata.termarg.c_cflag == tdata.flags[2]);
+-      assert(tdata.termarg.c_lflag == tdata.flags[3]);
+-#if HAVE_TERMIOS_ISPEED
+-      tdata.termarg.c_ispeed = 0x56789abc;
+-      tdata.termarg.c_ospeed = 0x6789abcd;
+-      assert(tdata.termarg.c_ispeed == tdata.speeds[ISPEED_OFFSET]);
+-      assert(tdata.termarg.c_ospeed == tdata.speeds[OSPEED_OFFSET]);
+-#endif
+-   }
+-#endif
+-
+    /* these dependencies required in applyopts() for OFUNC_FCNTL */
+    assert(F_GETFD == F_SETFD-1);
+    assert(F_GETFL == F_SETFL-1);
+ 
+-   if (Atexit(xioexit) < 0) {
+-      Error("atexit(xioexit) failed");
+-      return -1;
+-   }
+    xioinitialized = 1;
+    return 0;
+ }
============================================================
--- packages/socat/socat-1.3.2.1/xioopen.patch	e2cec694f8d45bf4df68b2c9f2fc32e765995990
+++ packages/socat/socat-1.3.2.1/xioopen.patch	e2cec694f8d45bf4df68b2c9f2fc32e765995990
@@ -0,0 +1,11 @@
+diff -Naur socat-1.3/xioopen.h socat-1.3_patched/xioopen.h
+--- socat-1.3/xioopen.h	2003-02-15 15:26:22.000000000 +0100
++++ socat-1.3_patched/xioopen.h	2006-09-05 10:49:15.000000000 +0200
+@@ -42,7 +42,6 @@
+ extern const char *ddirection[];
+ extern const char *filetypenames[];
+ extern const struct addrname addressnames[];
+-extern const char *addressgroupnames[];
+ extern const struct optname optionnames[];
+ 
+ extern int xioopen_makedual(xiofile_t *file);
============================================================
--- packages/socat/socat_1.3.2.1.bb	8c48534a914a4a518b11248fecea1a0541916a0d
+++ packages/socat/socat_1.3.2.1.bb	3a1a562195d080f43ef437c3771f89d0f3a400d8
@@ -1,14 +1,20 @@ LICENSE = "GPL"
 SECTION = "console/network"
 DEPENDS = "openssl"
 DESCRIPTION = "Socat is a relay for bidirectional data \
 transfer between two independent data channels."
 LICENSE = "GPL"
+PR="r1"
+
 SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
-	   file://ldflags.patch;patch=1"
+           file://xioopen.patch;patch=1 \ 
+           file://ldflags.patch;patch=1 \
+           file://xioinitialize.patch;patch=1"
+
 S = "${WORKDIR}/socat-1.3"
 
 inherit autotools
 
 do_install_prepend () {
+        mkdir -p ${D}${bindir}
 	install -d ${D}${bindir} ${D}${mandir}/man1
 }