[OE-core] [PATCH 1/2] socat: upgrade to 1.7.2.4
Tweak compile.patch:
- add the explanation of 'AC_DEFINE' in the patch header;
- remove the t.c_ispeed assinged line for AC_TRY_COMPILE;
- remove the SHIFT_NAME line, use socat-enable-termios.patch to instead.
Drop fix-xxx-SHIFT-autoheader.patch, and add socat-enable-termios.patch to
instead;
Remove 'do_configure_prepend' task, use socat-enable-termios.patch to instead.
The license checksum changed, becuase the company address changed.
Signed-off-by: Hongxu Jia hongxu@windriver.com
---
.../recipes-connectivity/socat/socat/compile.patch | 191 +++--
.../socat/socat/socat-enable-termios.patch | 39 +
.../socat/{socat_1.7.2.3.bb = socat_1.7.2.4.bb} | 17 +-
3 files changed, 149 insertions(+), 98 deletions(-)
create mode 100644
meta/recipes-connectivity/socat/socat/socat-enable-termios.patch
rename meta/recipes-connectivity/socat/{socat_1.7.2.3.bb = socat_1.7.2.4.bb}
(63%)
diff --git a/meta/recipes-connectivity/socat/socat/compile.patch
b/meta/recipes-connectivity/socat/socat/compile.patch
index 4d1a0b6..0c4c110 100644
--- a/meta/recipes-connectivity/socat/socat/compile.patch
+++ b/meta/recipes-connectivity/socat/socat/compile.patch
@@ -1,15 +1,35 @@
-Upstream-Status: Inappropriate [configuration]
+configure.in: fix AC_DEFINE
+
+The 'AC_DEFINE (variable)' is older versions of Autoconf,
+but this usage is obsolescent and withdrawn in oe-core's
+Autoconf 2.69. Use 'AC_DEFINE (variable, value, [description])'
+to instead.
+
+The same reason for 'AC_DEFINE_UNQUOTED (variable)'.
+
+http://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Defining-Symbols.html
-The patch is from
http://git.openembedded.org/openembedded/tree/recipes/socat/files/compile.patch
-and was rebased to socat-1.7.2.0.
+Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Dexuan Cui dexuan@intel.com
-Fri Dec 16 17:12:17 CST 2011
+Signed-off-by: Hongxu Jia hongxu@windriver.com
+---
+ configure.in | 292 +--
+ 1 file changed, 146 insertions(+), 146 deletions(-)
-diff -Nru socat-1.7.2.0.orig/configure.in socat-1.7.2.0/configure.in
socat-1.7.2.0.orig/configure.in2011-12-04 21:34:16.0 +0800
-+++ socat-1.7.2.0/configure.in 2011-12-16 17:08:59.698367071 +0800
-@@ -88,7 +88,7 @@
+diff --git a/configure.in b/configure.in
+index 549f929..b88c0c7 100644
+--- a/configure.in
b/configure.in
+@@ -80,7 +80,7 @@ AC_HEADER_RESOLV()
+ AC_CHECK_HEADERS(termios.h linux/if_tun.h)
+ AC_CHECK_HEADERS(net/if_dl.h)
+ AC_CHECK_HEADERS(linux/types.h)
+-AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [],
[#include linux/types.h])
++AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H, [1], [With
linux errqueue header]), [], [#include linux/types.h])
+ AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h)
+ AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h)
+ AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h)
+@@ -95,7 +95,7 @@ AC_SEARCH_LIBS([res_9_init], [resolv])
dnl Check for extra socket library (for Solaris)
@@ -18,7 +38,7 @@ diff -Nru socat-1.7.2.0.orig/configure.in
socat-1.7.2.0/configure.in
AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
-@@ -102,7 +102,7 @@
+@@ -128,7 +128,7 @@ AC_CACHE_VAL(sc_cv_have_prototype_hstrerror,
[sc_cv_have_prototype_hstrerror=yes]);
CFLAGS=$CFLAGS1])
if test $sc_cv_have_prototype_hstrerror = yes; then
@@ -27,7 +47,7 @@ diff -Nru socat-1.7.2.0.orig/configure.in
socat-1.7.2.0/configure.in
fi
AC_MSG_RESULT($sc_cv_have_prototype_hstrerror)
-@@ -111,83 +111,83 @@
+@@ -137,83 +137,83 @@ AC_MSG_CHECKING(whether to include help)
AC_ARG_ENABLE(help, [ --disable-help disable help],
[case $enableval in
no) AC_MSG_RESULT(no);;
@@ -131,7 +151,7 @@ diff -Nru socat-1.7.2.0.orig/configure.in
socat-1.7.2.0/configure.in
*)
AC_MSG_RESULT(no);;
esac])
-@@ -196,9 +196,9 @@
+@@ -222,9 +222,9 @@ AC_MSG_CHECKING(whether to include IPv4 support)
AC_ARG_ENABLE(ip4, [ --disable-ip4 disable IPv4 support],
[case $enableval in
no) AC_MSG_RESULT(no);;
@@ -143,7 +163,7 @@ diff -Nru socat-1.7.2.0.orig/configure.in
socat-1.7.2.0/configure.in
AC_MSG_CHECKING(whether to include IPv6 support)
AC_ARG_ENABLE(ip6, [ --disable-ip6 disable IPv6 support],
-@@ -209,7 +209,7 @@
+@@ -235,7 +235,7 @@ AC_ARG_ENABLE(ip6, [ --disable-ip6 disable IPv6
support],
[ AC_MSG_RESULT(yes); WITH_IP6=1 ])
if test $WITH_IP6; then
AC_CHECK_HEADERS([netinet/ip6.h],
@@ -152,7 +172,7 @@ diff -Nru socat-1.7.2.0.orig/configure.in
socat-1.7.2.0/configure.in
[AC_MSG_WARN([include file netinet/ip6.h not found, disabling IP6])],
[AC_INCLUDES_DEFAULT
#ifdef HAVE_NETINET_IN_H
-@@ -242,17
[OE-core] [PATCH 1/2] socat: upgrade to 1.7.2.4
Signed-off-by: Hongxu Jia hongxu@windriver.com
---
.../recipes-connectivity/socat/socat/compile.patch | 163 +++--
.../socat/{socat_1.7.2.3.bb = socat_1.7.2.4.bb} | 12 +-
2 files changed, 90 insertions(+), 85 deletions(-)
rename meta/recipes-connectivity/socat/{socat_1.7.2.3.bb = socat_1.7.2.4.bb}
(75%)
diff --git a/meta/recipes-connectivity/socat/socat/compile.patch
b/meta/recipes-connectivity/socat/socat/compile.patch
index 4d1a0b6..1486e41 100644
--- a/meta/recipes-connectivity/socat/socat/compile.patch
+++ b/meta/recipes-connectivity/socat/socat/compile.patch
@@ -1,15 +1,16 @@
Upstream-Status: Inappropriate [configuration]
The patch is from
http://git.openembedded.org/openembedded/tree/recipes/socat/files/compile.patch
-and was rebased to socat-1.7.2.0.
+and was rebased to socat-1.7.2.4.
+Signed-off-by: Hongxu Jia hongxu@windriver.com
+---
+ configure.in | 294 ++-
+ 1 file changed, 148 insertions(+), 146 deletions(-)
-Signed-off-by: Dexuan Cui dexuan@intel.com
-Fri Dec 16 17:12:17 CST 2011
-
-diff -Nru socat-1.7.2.0.orig/configure.in socat-1.7.2.0/configure.in
socat-1.7.2.0.orig/configure.in2011-12-04 21:34:16.0 +0800
-+++ socat-1.7.2.0/configure.in 2011-12-16 17:08:59.698367071 +0800
-@@ -88,7 +88,7 @@
+diff --git a/configure.in b/configure.in
+--- a/configure.in
b/configure.in
+@@ -95,7 +95,7 @@ AC_SEARCH_LIBS([res_9_init], [resolv])
dnl Check for extra socket library (for Solaris)
@@ -18,7 +19,7 @@ diff -Nru socat-1.7.2.0.orig/configure.in
socat-1.7.2.0/configure.in
AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
-@@ -102,7 +102,7 @@
+@@ -128,7 +128,7 @@ AC_CACHE_VAL(sc_cv_have_prototype_hstrerror,
[sc_cv_have_prototype_hstrerror=yes]);
CFLAGS=$CFLAGS1])
if test $sc_cv_have_prototype_hstrerror = yes; then
@@ -27,7 +28,7 @@ diff -Nru socat-1.7.2.0.orig/configure.in
socat-1.7.2.0/configure.in
fi
AC_MSG_RESULT($sc_cv_have_prototype_hstrerror)
-@@ -111,83 +111,83 @@
+@@ -137,83 +137,83 @@ AC_MSG_CHECKING(whether to include help)
AC_ARG_ENABLE(help, [ --disable-help disable help],
[case $enableval in
no) AC_MSG_RESULT(no);;
@@ -131,7 +132,7 @@ diff -Nru socat-1.7.2.0.orig/configure.in
socat-1.7.2.0/configure.in
*)
AC_MSG_RESULT(no);;
esac])
-@@ -196,9 +196,9 @@
+@@ -222,9 +222,9 @@ AC_MSG_CHECKING(whether to include IPv4 support)
AC_ARG_ENABLE(ip4, [ --disable-ip4 disable IPv4 support],
[case $enableval in
no) AC_MSG_RESULT(no);;
@@ -143,7 +144,7 @@ diff -Nru socat-1.7.2.0.orig/configure.in
socat-1.7.2.0/configure.in
AC_MSG_CHECKING(whether to include IPv6 support)
AC_ARG_ENABLE(ip6, [ --disable-ip6 disable IPv6 support],
-@@ -209,7 +209,7 @@
+@@ -235,7 +235,7 @@ AC_ARG_ENABLE(ip6, [ --disable-ip6 disable IPv6
support],
[ AC_MSG_RESULT(yes); WITH_IP6=1 ])
if test $WITH_IP6; then
AC_CHECK_HEADERS([netinet/ip6.h],
@@ -152,7 +153,7 @@ diff -Nru socat-1.7.2.0.orig/configure.in
socat-1.7.2.0/configure.in
[AC_MSG_WARN([include file netinet/ip6.h not found, disabling IP6])],
[AC_INCLUDES_DEFAULT
#ifdef HAVE_NETINET_IN_H
-@@ -242,17 +242,17 @@
+@@ -268,17 +268,17 @@ AC_MSG_CHECKING(whether to include raw IP support)
AC_ARG_ENABLE(rawip, [ --disable-rawip disable raw IP support],
[case $enableval in
no) AC_MSG_RESULT(no);;
@@ -163,7 +164,7 @@ diff -Nru socat-1.7.2.0.orig/configure.in
socat-1.7.2.0/configure.in
+ [AC_DEFINE(WITH_RAWIP, [1], [With rawip]) AC_MSG_RESULT(yes)])
AC_MSG_CHECKING(whether to include generic socket support)
- AC_ARG_ENABLE(rawsocket, [ --disable-genericsocket disable generic socket
support],
+ AC_ARG_ENABLE(genericsocket, [ --disable-genericsocket disable generic
socket support],
[case $enableval in
no) AC_MSG_RESULT(no);;
- *) AC_DEFINE(WITH_GENERICSOCKET) AC_MSG_RESULT(yes);;
@@ -171,10 +172,10 @@ diff -Nru socat-1.7.2.0.orig/configure.in
socat-1.7.2.0/configure.in
esac],
- [AC_DEFINE(WITH_GENERICSOCKET) AC_MSG_RESULT(yes)])
+ [AC_DEFINE(WITH_GENERICSOCKET, [1], [With genericsocket])
AC_MSG_RESULT(yes)])
- AC_MSG_CHECKING(whether to include raw network interface support)
+ AC_MSG_CHECKING(whether to include generic network interface support)
AC_ARG_ENABLE(interface, [ --disable-interface disable network interface
support],
[case $enableval in
-@@ -262,35 +262,35 @@
+@@ -288,35 +288,35 @@ AC_ARG_ENABLE(interface, [ --disable-interface disable
network interface suppo
[AC_MSG_RESULT(yes); WITH_INTERFACE=1 ])
if test $WITH_INTERFACE; then
AC_CHECK_HEADER(netpacket/packet.h,
