Re: [OE-core] [PATCH 1/1] socat: add the latest stable version 1.7.2.0
Op 19 dec. 2011, om 06:22 heeft Dexuan Cui het volgende geschreven: +DEPENDS = openssl + +LICENSE = GPLv2+ Linking GPL and openssl is not allowed due to the advertising clause in BSD. The socat people realized that and say: license --- socat is distributed under the terms of the GNU GPL; except for install-sh, which is copyright MIT, with its own license; In addition, as a special exception, the copyright holder gives permission to link the code of this program with any version of the OpenSSL library which is distributed under a license identical to that listed in the included COPYING.OpenSSL file, and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than OpenSSL. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. regards, Koen signature.asc Description: Message signed with OpenPGP using GPGMail ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] socat: add the latest stable version 1.7.2.0
Koen Kooi wrote on 2011-12-19: Op 19 dec. 2011, om 06:22 heeft Dexuan Cui het volgende geschreven: +DEPENDS = openssl + +LICENSE = GPLv2+ Hi Koen, Thanks very much for the comment! Linking GPL and openssl is not allowed due to the advertising clause in BSD. The socat people realized that and say: the advertising clause in BSD? I suppose you meant the advertising clause in openssl license? license --- socat is distributed under the terms of the GNU GPL; except for install-sh, which is copyright MIT, with its own license; In addition, as a special exception, the copyright holder gives permission to link the code of this program with any version of the OpenSSL library which is distributed under a license identical to that listed in the included COPYING.OpenSSL file, and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than OpenSSL. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. My understanding is: the author of socat allows us to link socat to the lib openssl? Koen, I'm really not good at the license stuff at all. Could you please explain the situation in more details? What need we do if we want to add the socat recipe into poky? It has already been in OE for a long period of time. Thanks, -- Dexuan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] socat: add the latest stable version 1.7.2.0
Op 19 dec. 2011, om 10:16 heeft Cui, Dexuan het volgende geschreven: Koen Kooi wrote on 2011-12-19: Op 19 dec. 2011, om 06:22 heeft Dexuan Cui het volgende geschreven: +DEPENDS = openssl + +LICENSE = GPLv2+ Hi Koen, Thanks very much for the comment! Linking GPL and openssl is not allowed due to the advertising clause in BSD. The socat people realized that and say: the advertising clause in BSD? I suppose you meant the advertising clause in openssl license? Yes, indeed license --- socat is distributed under the terms of the GNU GPL; except for install-sh, which is copyright MIT, with its own license; In addition, as a special exception, the copyright holder gives permission to link the code of this program with any version of the OpenSSL library which is distributed under a license identical to that listed in the included COPYING.OpenSSL file, and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than OpenSSL. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. My understanding is: the author of socat allows us to link socat to the lib openssl? Correct. I don't know what happens when you include socat in a GPL product, but that's for other people to worry about :) Koen, I'm really not good at the license stuff at all. Could you please explain the situation in more details? From what I've understood the advertising clause is consired a restriction by the GPL and hence incompatible. Since openssl is so widespread and gnutls so buggy the exception was invented to allow openssl to link with gpl software. What need we do if we want to add the socat recipe into poky? It has already been in OE for a long period of time. Some googling suggests that 'GPL-2.0+-with-OpenSSL-exception' is SPDX compatible, so we could put that in LICENSE. regards, Koen signature.asc Description: Message signed with OpenPGP using GPGMail ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] socat: add the latest stable version 1.7.2.0
Koen Kooi wrote on 2011-12-19: Op 19 dec. 2011, om 10:16 heeft Cui, Dexuan het volgende geschreven: Koen Kooi wrote on 2011-12-19: Op 19 dec. 2011, om 06:22 heeft Dexuan Cui het volgende geschreven: +DEPENDS = openssl + +LICENSE = GPLv2+ Hi Koen, Thanks very much for the comment! Linking GPL and openssl is not allowed due to the advertising clause in BSD. The socat people realized that and say: the advertising clause in BSD? I suppose you meant the advertising clause in openssl license? Yes, indeed license --- socat is distributed under the terms of the GNU GPL; except for install-sh, which is copyright MIT, with its own license; In addition, as a special exception, the copyright holder gives permission to link the code of this program with any version of the OpenSSL library which is distributed under a license identical to that listed in the included COPYING.OpenSSL file, and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than OpenSSL. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. My understanding is: the author of socat allows us to link socat to the lib openssl? Correct. I don't know what happens when you include socat in a GPL product, but that's for other people to worry about :) Koen, I'm really not good at the license stuff at all. Could you please explain the situation in more details? From what I've understood the advertising clause is consired a restriction by the GPL and hence incompatible. Since openssl is so widespread and gnutls so buggy the exception was invented to allow openssl to link with gpl software. What need we do if we want to add the socat recipe into poky? It has already been in OE for a long period of time. Some googling suggests that 'GPL-2.0+-with-OpenSSL-exception' is SPDX compatible, so we could put that in LICENSE. Thanks a lot for the suggestion! Please review/use the new patch: http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/socat-v2id=896e5e9f9ca387d832d423a1e16ad918d473c4cc Thanks, -- Dexuan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] 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. Signed-off-by: Dexuan Cui dexuan@intel.com --- .../recipes-connectivity/socat/files/compile.patch | 946 meta/recipes-connectivity/socat/socat_1.7.2.0.bb | 28 + 2 files changed, 974 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-connectivity/socat/files/compile.patch create mode 100644 meta/recipes-connectivity/socat/socat_1.7.2.0.bb diff --git a/meta/recipes-connectivity/socat/files/compile.patch b/meta/recipes-connectivity/socat/files/compile.patch new file mode 100644 index 000..4d1a0b6 --- /dev/null +++ b/meta/recipes-connectivity/socat/files/compile.patch @@ -0,0 +1,946 @@ +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. + +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 @@ + + + dnl Check for extra socket library (for Solaris) +-AC_CHECK_FUNC(hstrerror, , AC_CHECK_LIB(resolv, hstrerror, [LIBS=$LIBS -lresolv; AC_DEFINE(HAVE_HSTRERROR)])) ++AC_CHECK_FUNC(hstrerror, , AC_CHECK_LIB(resolv, hstrerror, [LIBS=$LIBS -lresolv; AC_DEFINE(HAVE_HSTRERROR, [1], [STRERROR])])) + AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent)) + AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) + +@@ -102,7 +102,7 @@ + [sc_cv_have_prototype_hstrerror=yes]); + CFLAGS=$CFLAGS1]) + if test $sc_cv_have_prototype_hstrerror = yes; then +- AC_DEFINE(HAVE_PROTOTYPE_HSTRERROR) ++ AC_DEFINE(HAVE_PROTOTYPE_HSTRERROR, [1], [Has Strerror]) + fi + AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) + +@@ -111,83 +111,83 @@ + AC_ARG_ENABLE(help, [ --disable-help disable help], + [case $enableval in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_HELP) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_HELP, [1], [With help]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_HELP) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_HELP, [1], [With help]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include STDIO support) + AC_ARG_ENABLE(stdio, [ --disable-stdio disable STDIO support], + [case $enableval in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_STDIO) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_STDIO, [1], [With stdio]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_STDIO) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_STDIO, [1], [With stdio]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include FD-number support) + AC_ARG_ENABLE(fdnum, [ --disable-fdnum disable FD-number support], + [case $enableval in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_FDNUM) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_FDNUM, [1], [With fdnum]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_FDNUM) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_FDNUM, [1], [With fdnum]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include direct file support) + AC_ARG_ENABLE(file, [ --disable-file disable direct file support], + [case $enableval in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_FILE) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_FILE, [1], [With file]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_FILE) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_FILE, [1], [With file]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include direct create support) + AC_ARG_ENABLE(creat, [ --disable-creat disable direct create support], + [case $enableval in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_CREAT) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_CREAT, [1], [With creat]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_CREAT) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_CREAT, [1], [With creat]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include gopen support) + AC_ARG_ENABLE(gopen, [ --disable-gopen disable open for UNIX socket support], + [case $enableval in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_GOPEN) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_GOPEN, [1], [With gopen]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_GOPEN) AC_MSG_RESULT(yes)]) ++
