[oe] [PATCH v2] socat: Add version 1.7.1.2

[Paul Menzel]

Am Samstag, den 23.01.2010, 15:16 -0800 schrieb John Faith:

[Moved note about v2 to the end of commit message.]

> Allow socat 1.7.1.2 to cross build.  In configure.in, the 4th value in
> AC_TRY_RUN() gives a default value for cross build environments since
> a test program cannot be run on the build system.  There are 2 places
> where AC_MSG_RESULT() is used instead of a default value which seems
> to result in code like "#define CRDLY_SHIFT" which breaks preprocessor
> checks like "#if CRDLY_SHIFT >= 0".

Maybe add an item, why the change in do_configure() is needed. Just copy
it from your reply to Koen maybe.

> The patch gives default values in configure and configure.in for cross
> compiling and checks were added in the affected source.

v2: Added package source checksums, changed PR to r0, and removed some
trailing whitespace in the patch.

> Signed-off-by: John Faith <john at soundmetrics.com>

Build-tested-by: Paul Menzel <paulepanter at users.sourceforge.net>
  (beagleboard, Ångström)

        /oe/angstrom-dev/deploy/glibc/ipk/armv7a$ ls -lh socat*
        -rw-r--r-- 1 x x 146K 24. Jan 12:21 socat_1.7.1.2-r0.5_armv7a.ipk
        -rw-r--r-- 1 x x 9,4M 24. Jan 12:21 socat-dbg_1.7.1.2-r0.5_armv7a.ipk
        -rw-r--r-- 1 x x  790 24. Jan 12:21 socat-dev_1.7.1.2-r0.5_armv7a.ipk
        -rw-r--r-- 1 x x  36K 24. Jan 12:21 socat-doc_1.7.1.2-r0.5_armv7a.ipk

I am just wondering about the size of `socat-dbg*.ipk` though.

> ---

[…]

> +--- socat-1.7.1.2/xioopts.c.orig	2010-01-04 04:29:36.000000000 -0800
> ++++ socat-1.7.1.2/xioopts.c	2010-01-21 10:54:03.561742501 -0800
> +@@ -763,7 +763,7 @@ const struct optname optionnames[] = {
> + 	IF_IP6    ("ipv6only",	&opt_ipv6_v6only)

Still some trailing whitespaces (in all ipv6 lines I think).

        openembedded$ git am -s /tmp/\[oe\]_\[PATCH_v2\]_socat\:_Add_version_1.7.1.2 
        Applying: socat: Add version 1.7.1.2
        /oe/openembedded/.git/rebase-apply/patch:76: space before tab in indent.
         	IF_IP6    ("ipv6only",	&opt_ipv6_v6only)
        /oe/openembedded/.git/rebase-apply/patch:78: space before tab in indent.
         	IF_TERMIOS("isig",	&opt_isig)
        /oe/openembedded/.git/rebase-apply/patch:81: space before tab in indent.
         	IF_TERMIOS("ispeed",	&opt_ispeed)
        /oe/openembedded/.git/rebase-apply/patch:83: space before tab in indent.
         	IF_TERMIOS("istrip",	&opt_istrip)
        /oe/openembedded/.git/rebase-apply/patch:85: space before tab in indent.
         	IF_OPENSSL("openssl-pseudo",	&opt_openssl_pseudo)
        warning: squelched 5 whitespace errors
        warning: 10 lines add whitespace errors.

(Try to apply your patch yourself.) But I guess it is alright.

[…]

> diff --git a/recipes/socat/socat_1.7.1.2.bb b/recipes/socat/socat_1.7.1.2.bb
> new file mode 100644
> index 0000000..2214354
> --- /dev/null
> +++ b/recipes/socat/socat_1.7.1.2.bb
> @@ -0,0 +1,23 @@
> +SECTION = "console/network"
> +DEPENDS = "openssl readline"
> +DESCRIPTION = "Socat is a network relay for bidirectional data \
> +transfer between two independent data channels."
> +LICENSE = "GPL"
> +PR = "r0"
> +
> +SRC_URI = "http://www.dest-unreach.org/socat/download/${P}.tar.bz2 \
> +           file://socat-1.7.1.2-cross.patch;patch=1 "
> +
> +inherit autotools
> +
> +do_configure() {
> +	# Override this function so the included config.h.in is used instead
> +	# of recreating it with autoheader.
> +	(cd ${S} && gnu-configize) || die "failure in running gnu-configize"

Someone else has to judge on the autotool stuff.

[…]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20100124/22383dea/attachment-0002.sig>