Commit Graph

20 Commits

Author SHA1 Message Date
Hongxu Jia fa1d3b3efb socat: 1.7.3.1 -> 1.7.3.2
(From OE-Core rev: 999179c23aebb991a8e26b4a10bc369bf03db738)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-02-15 20:06:42 -08:00
Patrick Ohly f98baa62e5 socat: support native compilation
This is needed for building the swtpm TPM simulator (recipe
in meta-security).

Native compilation disables tcp-wrappers by default to simplify
the build.

"nativesdk" is added just in case that someone also wants this
in an SDK.

(From OE-Core rev: a33a252462e2d7b90a1c89e42a96b9696eb08b23)

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-01-26 10:44:28 +00:00
Zhenhua Luo ac0e5e2f39 socat: remove the hardcoded shifting offset
The hardcoded shifting offset causes the following runtime error:
| socat: xioinitialize.c:41: xioinitialize: Assertion `3 <<
| opt_crdly.arg3 == 00030000' failed.

(From OE-Core rev: 9dab6d1113e9aec9cbfce4c57ae5a85b1a032cbb)

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-08 09:57:25 +01:00
Khem Raj 2c81e17222 socat: Use c_ispeed and c_ospeed based upon libc
musl calls them __c_ispeed and __c_ospeed
and we can not use get/set APIs because the get APIs
will return the value from iflags and not from *speed
element from termios struct

(From OE-Core rev: b4744ffb94f76f2be138f2f9bd04153034bf62df)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-14 10:58:32 +01:00
Khem Raj e1f3f4cc3c socat: Access c_ispeed and c_ospeed via APIs
make it more portable across libc implementations

(From OE-Core rev: cd3408e7b845891b63de04249982330e02f13ee8)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-03-20 23:12:27 +00:00
Khem Raj 0b1c3240ad socat: Fix build with musl
NETDB_INTERNAL is a glibc define

(From OE-Core rev: eb513884519804b3b8d600eeb7aadf3ec54e0345)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-18 07:39:30 +00:00
Ross Burton d09a25e862 socat: upgrade to 1.7.3.1
This fixes Socat Security Advisory 7 (MSVR-1499) and 8.

[ YOCTO #9024 ]

(From OE-Core rev: 4be6104e8466e977e2ea45d068d277c089b2a9d1)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-04 23:39:03 +00:00
Robert Yang b92a75c218 socat: fix for parallel build
Fixed:
vsnprintf_r.o: file not recognized: File truncated
collect2: error: ld returned 3 exit status
Makefile:122: recipe for target 'filan' failed

Let filan depend on vsnprintf_r.o and snprinterr.o to fix the issue.

(From OE-Core rev: ee0a4412d66a2dd001defae7615f02e0617d91ed)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-05-14 11:43:59 +01:00
Robert Yang 8bdf8b9012 socat: 1.7.2.4 -> 1.7.3.0
Removed fix-cross-compiling-failed.patch and
socat-1.7.2.4-linux-3.17.patch since upstream has fixed them.

Updated README's LIC_FILES_CHKSUM, there is a word changed (GPL ->
GPLv2, it should be GPLv2 as COPYING shows), its license is already
"GPL-2.0+-with-OpenSSL-exception", so we just update the md5 is OK.

(From OE-Core rev: 1c09d06ab8694612e1bd5cc63ad660d1e1ea4d64)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-08 10:53:27 +01:00
Ross Burton b39ebfd9b2 socat: forcibly disable use of libbsd
Socat will look for openpty() in BSD headers before Linux headers, so if libbsd
is present at configure time then that will be used.  We don't need to depend on
libbsd though, and leaving it floating can cause build errors, so tell configure
that the libbsd header isn't present.

(From OE-Core rev: 7defa2bb5b28ea69f749363a607a114cfa4ba4ed)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-16 23:08:21 +00:00
Bruce Ashfield c219f6b399 socat: fix compile erorr against 3.17+ kernel headers
With the linux 3.17 kernel socat's configure detects the wrong include
for errqueue.h which results in a compilation error.

By backporting the gentoo patch from:

  http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch

Fixes the build issue

(From OE-Core rev: ad83184721be815c6589b53dcf0b469f7fee5c41)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-12-21 12:37:54 +00:00
Ross Burton ae642d3fad socat: upgrade to 1.7.2.4
socat manually maintains config.h.in instead of using autoheader, so exclude
autoheader from autoreconf and remove all patches that are intended to enable
use of autoheader.

The license checksum changed, because the company address changed.

Based on a upgrade by Hongxu Jia <hongxu.jia@windriver.com>, with cleanup after
noticing that config.h.in was hand-maintained.

(From OE-Core rev: ea3ec30c19af23f6b62ce3d4d9d42c1fcb23a215)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-06-01 14:30:40 +01:00
Hongxu Jia b38c7cb7a6 socat: upgrade to 1.7.2.3
The package has been successfully compiled for all major architectures.

(From OE-Core rev: 5d509fde3acc3dd94a259dc171a9331367d250cc)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-14 12:31:10 +00:00
Paul Eggleton e792f5470b Add missing SUMMARY values
These recipes all had a long DESCRIPTION but no SUMMARY; since the
SUMMARY is often displayed alone by package managers and the default
value ("${PN} version ${PV}") isn't particularly useful, we should
always try to set SUMMARY.

(From OE-Core rev: db02edd2e9d7645592933cbb25ea0ca4d6561392)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 12:50:18 +00:00
Martin Jansa 7386dba5be socat: add PACKAGECONFIG for tcp-wrappers
* it's autodetected from sysroot
* add PACKAGECONFIG to make it deterministic

(From OE-Core rev: 15d82c0f0cccdf0886d4452fddf399b7569f7e56)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-29 13:09:10 +01:00
Saul Wold 650f30c709 socat: Update to 1.7.2.2
COPYING changed formating and address, no license changes

(From OE-Core rev: e83bc6b5f68b12c2a989001f2cdac02b46bb3c9b)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-13 17:38:08 +01:00
Roy.Li 95e23df258 socat: enable termios
fix two cross-compile issue to enable termios:
1. Define ac_cv_ispeed_offset in EXTRA_OECONF to avoid to call AC_TRY_RUN()
on cross-compile environment.
2. fix autoheader to generate *_SHIFT macros

(From OE-Core rev: fa4d1526f639d50b578ff82b4e65ac45c612bcca)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-11 15:38:01 +01:00
Saul Wold 0a435c8a4a socat: Update to 1.7.2.1
Changed LIC_FILES_CHKSUM due to whitespace and GNU address difference

(From OE-Core rev: e2294db8e31aacdc27204e0b0fe5ff9221ee768a)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-28 23:15:50 +00:00
Roy.Li edc2559a73 socat 1.7.2: add readline dependency
[YOCTO #2844]

socat has dependency on readline

(From OE-Core rev: dc84ac6bc1c496501fe3cd4b4dfbc1b7ed973663)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-29 10:55:28 +01:00
Dexuan Cui 7bde933974 socat: add the latest stable version 1.7.2.0
socat is useful for the self-hosted-image work.

The original recipe is from OE:
http://git.openembedded.org/openembedded/tree/recipes/socat/
and I upgraded it to 1.7.2.0.

Thank Koen Kooi <koen@dominion.thruhere.net> for suggesting
how to assign the LICENSE field with a proper value.

(From OE-Core rev: b1771ff0ad39250678bd53b0ae7543c9365572f5)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-22 13:13:45 +00:00