From patchwork Wed Nov 13 15:17:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1194333 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="k1cdQRGs"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47CpCF1M8Vz9sP6 for ; Thu, 14 Nov 2019 02:18:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A727386AFD; Wed, 13 Nov 2019 15:17:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z-a+Bt6K+UZ2; Wed, 13 Nov 2019 15:17:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6DB0786AA1; Wed, 13 Nov 2019 15:17:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 725821BF2B4 for ; Wed, 13 Nov 2019 15:17:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6106022668 for ; Wed, 13 Nov 2019 15:17:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qQ6QJmBAOxyI for ; Wed, 13 Nov 2019 15:17:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by silver.osuosl.org (Postfix) with ESMTPS id 648A22214F for ; Wed, 13 Nov 2019 15:17:43 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id r10so2822027wrx.3 for ; Wed, 13 Nov 2019 07:17:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jSY5yHU8sFSml3QDeC3kC9HIUcKp6X2aSjNI3Ha3vBc=; b=k1cdQRGsNDosHXWPJotyI9cu9fhsut6nM2f0KPb+cGjY0UWm76LMseTVIXFGSW8aI/ CMHnTXj2jFNb2fl8A5iMlLO3EKMh8bNm/Y3VpBC5eP5911pfucGhXkUNwEFqj96Mkme4 dgCTNZIhgtBVKmAu+SP5NXlc8AR0GjU34XG0Fcn61Kj0TuoUN1jv7w4orPfhfpizA+ej Lu03czrhLGWAHgLZnfa/HDR0btZlv8Bh8ADcq0Biwf8WCFNgmZcgUld/jiuv9KgqBR30 5DY5R2Mp4KVnSHHqUYpfbO9oO5ioXfiLWdzsQ8orjV7W7p/0DTKD1U5gQ3PzpAg6gcYB zWOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jSY5yHU8sFSml3QDeC3kC9HIUcKp6X2aSjNI3Ha3vBc=; b=pdzuHIHJvdbXgnWPAibn9VVuA4o2VtcP5t8IlPNVaq2INA16Qjf8Pjz0gw46cietf8 NLVze6cenO/tIF1YcY5JagceY7yhtWddDtJy7i5k3JIUVD/j/ig5J/imk6lH3+vvGbl5 3tJyXzG5hvHoVPiEzRU4GIVZMsIJmYmMbMMrw7xtgGptfI9Y+aXxNYORnn+mHV7HUrCw tuzABBNSciupwhhquAqRG8zkKEGTKe5omgHH0xQG6FxNgiR14Lf3Zr/CTj7znUKRpBCb X3CS4vRRGyiA7AYjnoikbtl13GmxjKr582no8rwexAzpy6TZCFZS0TNBKfx806pEm4Ro hblg== X-Gm-Message-State: APjAAAUlWjzuAg4u1N28RvFXRp7SVWQkrUdDSx5JkcCGjLoC+RLVdjJs tvpfEAwN58QnyKrHKmuQ42OngzkC X-Google-Smtp-Source: APXvYqwGIQxQFi0mKL+NZF55AdYE7ZgEqAe/qcnIETA2xqWsMZo8JqJu+qVkaCIB+++4Io0cMmdW7g== X-Received: by 2002:a5d:4584:: with SMTP id p4mr3430664wrq.345.1573658261419; Wed, 13 Nov 2019 07:17:41 -0800 (PST) Received: from dell.be.48ers.dk (d528f5fe4.static.telenet.be. [82.143.95.228]) by smtp.gmail.com with ESMTPSA id j2sm3213643wrt.61.2019.11.13.07.17.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Nov 2019 07:17:39 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1iUuOo-0003Cc-Sy; Wed, 13 Nov 2019 16:17:38 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 13 Nov 2019 16:17:24 +0100 Message-Id: <20191113151724.12155-12-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113151724.12155-1-peter@korsgaard.com> References: <20191113151724.12155-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 11/11] package/socat: drop optional readline dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Reviewed-by: Baruch Siach --- 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