[11/11] package/socat: drop optional readline dependency
diff mbox series

Message ID 20191113151724.12155-12-peter@korsgaard.com
State Accepted
Headers show
Series
  • Fix license incompatibility with readline
Related show

Commit Message

Peter Korsgaard Nov. 13, 2019, 3:17 p.m. UTC
socat is licensed under GPL-2.0, which is not license compatible with
readline (GPL-3.0+), so drop the optional dependency and add a comment
explaining why.

This also matches how socat is packaged in Debian, where the man page has
the following snippet added:

READLINE

  Uses GNU readline and history on stdio to allow editing and reusing input lines (example).
  Due to licensing restrictions the readline feature is disabled in Debian.  See BUGS.
  You can use STDIO instead.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/socat/socat.mk | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

Baruch Siach Nov. 13, 2019, 4:15 p.m. UTC | #1
Hi Peter,

On Wed, Nov 13 2019, Peter Korsgaard wrote:
> socat is licensed under GPL-2.0, which is not license compatible with
> readline (GPL-3.0+), so drop the optional dependency and add a comment
> explaining why.
>
> This also matches how socat is packaged in Debian, where the man page has
> the following snippet added:
>
> READLINE
>
>   Uses GNU readline and history on stdio to allow editing and reusing input lines (example).
>   Due to licensing restrictions the readline feature is disabled in Debian.  See BUGS.
>   You can use STDIO instead.
>
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Reviewed-by: Baruch Siach <baruch@tkos.co.il>

Thanks,
baruch

> ---
>  package/socat/socat.mk | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/package/socat/socat.mk b/package/socat/socat.mk
> index c6f99c2afa..9e747e08fa 100644
> --- a/package/socat/socat.mk
> +++ b/package/socat/socat.mk
> @@ -27,6 +27,8 @@ endif
>  # automake, so we can't use the normal autoreconf logic.
>  
>  SOCAT_DEPENDENCIES = host-autoconf
> +# incompatibile license (GPL-3.0+)
> +SOCAT_CONF_OPTS = --disable-readline
>  
>  ifeq ($(BR2_PACKAGE_OPENSSL),y)
>  SOCAT_DEPENDENCIES += openssl
> @@ -34,12 +36,6 @@ else
>  SOCAT_CONF_OPTS += --disable-openssl
>  endif
>  
> -ifeq ($(BR2_PACKAGE_READLINE),y)
> -SOCAT_DEPENDENCIES += readline
> -else
> -SOCAT_CONF_OPTS += --disable-readline
> -endif
> -
>  define SOCAT_RUN_AUTOCONF
>  	(cd $(@D); $(HOST_DIR)/bin/autoconf)
>  endef
Yann E. MORIN Nov. 13, 2019, 9:02 p.m. UTC | #2
Peter, All,

On 2019-11-13 16:17 +0100, Peter Korsgaard spake thusly:
> socat is licensed under GPL-2.0, which is not license compatible with
> readline (GPL-3.0+), so drop the optional dependency and add a comment
> explaining why.
> 
> This also matches how socat is packaged in Debian, where the man page has
> the following snippet added:
> 
> READLINE
> 
>   Uses GNU readline and history on stdio to allow editing and reusing input lines (example).
>   Due to licensing restrictions the readline feature is disabled in Debian.  See BUGS.
>   You can use STDIO instead.
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/socat/socat.mk | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/package/socat/socat.mk b/package/socat/socat.mk
> index c6f99c2afa..9e747e08fa 100644
> --- a/package/socat/socat.mk
> +++ b/package/socat/socat.mk
> @@ -27,6 +27,8 @@ endif
>  # automake, so we can't use the normal autoreconf logic.
>  
>  SOCAT_DEPENDENCIES = host-autoconf
> +# incompatibile license (GPL-3.0+)
> +SOCAT_CONF_OPTS = --disable-readline
>  
>  ifeq ($(BR2_PACKAGE_OPENSSL),y)
>  SOCAT_DEPENDENCIES += openssl
> @@ -34,12 +36,6 @@ else
>  SOCAT_CONF_OPTS += --disable-openssl
>  endif
>  
> -ifeq ($(BR2_PACKAGE_READLINE),y)
> -SOCAT_DEPENDENCIES += readline
> -else
> -SOCAT_CONF_OPTS += --disable-readline
> -endif
> -
>  define SOCAT_RUN_AUTOCONF
>  	(cd $(@D); $(HOST_DIR)/bin/autoconf)
>  endef
> -- 
> 2.20.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Peter Korsgaard Nov. 19, 2019, 7:39 a.m. UTC | #3
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > socat is licensed under GPL-2.0, which is not license compatible with
 > readline (GPL-3.0+), so drop the optional dependency and add a comment
 > explaining why.

 > This also matches how socat is packaged in Debian, where the man page has
 > the following snippet added:

 > READLINE

 >   Uses GNU readline and history on stdio to allow editing and reusing input lines (example).
 >   Due to licensing restrictions the readline feature is disabled in Debian.  See BUGS.
 >   You can use STDIO instead.

 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed to 2019.02.x and 2019.08.x, thanks.

Patch
diff mbox series

diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index c6f99c2afa..9e747e08fa 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -27,6 +27,8 @@  endif
 # automake, so we can't use the normal autoreconf logic.
 
 SOCAT_DEPENDENCIES = host-autoconf
+# incompatibile license (GPL-3.0+)
+SOCAT_CONF_OPTS = --disable-readline
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 SOCAT_DEPENDENCIES += openssl
@@ -34,12 +36,6 @@  else
 SOCAT_CONF_OPTS += --disable-openssl
 endif
 
-ifeq ($(BR2_PACKAGE_READLINE),y)
-SOCAT_DEPENDENCIES += readline
-else
-SOCAT_CONF_OPTS += --disable-readline
-endif
-
 define SOCAT_RUN_AUTOCONF
 	(cd $(@D); $(HOST_DIR)/bin/autoconf)
 endef