socat: catch up SRC_URI

3 files changed, 95 insertions, 0 deletions

diff --git a/recipes/socat/files/ldflags.patch b/recipes/socat/files/ldflags.patch
new file mode 100644
index 0000000000..6ab4681383
--- /dev/null
+++ b/recipes/socat/files/ldflags.patch
@@ -0,0 +1,32 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- socat-1.3/Makefile.in~ldflags
++++ socat-1.3/Makefile.in
+@@ -33,6 +33,7 @@
+ 
+ 
+ CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS)
++LDFLAGS = @LDFLAGS@
+ CLIBS = $(LIBS)
+ #CLIBS = $(LIBS) -lm -lefence
+ XIOSRCS = xioinitialize.c xiohelp.c xioparam.c xiodiag.c xioopen.c xioopts.c xiosigchld.c xioread.c xiowrite.c \
+@@ -78,13 +79,13 @@
+ 	makedepend @SYSDEFS@ $(CFILES)
+ 
+ socat: socat.o libxio.a
+-	$(CC) $(CFLAGS) -o $@ socat.o libxio.a $(CLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ socat.o libxio.a $(CLIBS)
+ 
+ procan: procan_main.o procan.o error.o sycls.o sysutils.o utils.o
+-	$(CC) $(CFLAGS) -o $@ procan_main.o procan.o error.o sycls.o sysutils.o utils.o $(CLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ procan_main.o procan.o error.o sycls.o sysutils.o utils.o $(CLIBS)
+ 
+ filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o
+-	$(CC) $(CFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o $(CLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o $(CLIBS)
+ 
+ libxio.a: $(XIOOBJS) $(UTLOBJS)
+ 	$(AR) r $@ $(XIOOBJS) $(UTLOBJS)
diff --git a/recipes/socat/files/xioinitialize.patch b/recipes/socat/files/xioinitialize.patch
new file mode 100644
index 0000000000..24e816cfd7
--- /dev/null
+++ b/recipes/socat/files/xioinitialize.patch
@@ -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;
+ }
diff --git a/recipes/socat/files/xioopen.patch b/recipes/socat/files/xioopen.patch
new file mode 100644
index 0000000000..456862653a
--- /dev/null
+++ b/recipes/socat/files/xioopen.patch
@@ -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);