From patchwork Fri Sep 6 10:18:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Mukhin X-Patchwork-Id: 1158933 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=gmail.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="F+4OfyRF"; 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 46Ptq21Fyhz9s7T for ; Fri, 6 Sep 2019 20:20:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A19C787626; Fri, 6 Sep 2019 10:20:10 +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 uWEtomRF2Jis; Fri, 6 Sep 2019 10:20:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C0AA787660; Fri, 6 Sep 2019 10:20:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8F2971BF2C0 for ; Fri, 6 Sep 2019 10:20:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8A74087660 for ; Fri, 6 Sep 2019 10:20:07 +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 1wbp1yXxnm1h for ; Fri, 6 Sep 2019 10:20:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 95EB387626 for ; Fri, 6 Sep 2019 10:20:06 +0000 (UTC) Received: by mail-lf1-f67.google.com with SMTP id w6so4587729lfl.2 for ; Fri, 06 Sep 2019 03:20:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bOyQ3D2m6kp4keOh4/ISbHF3F0Z8zk+OuX0WUFymWNs=; b=F+4OfyRFf/SE9PMprWJh5LXEhzXskJhKJS07l2jOfuGs0+kDlTHnwiymgaPiwsWvLr nd/tLt/5/CavuAndNFYauvsIu3Kx+ZK9+8Sb+eEtMiHzG0HlIuPP5mFTqD1M67ePfqu1 tURM4m9GZmuOKbWF129mw9v6HFYB5FrBaM0lpEFiy8cds5MbNH4PkCtipVyTqrGtbh4R sVmKOOk0A9ixUg/t1kttJCpCzXLzAT+YYbXDSvUMYHDaFiugMSmsBPLPDVEEGeIHJ8B5 5IlMp5r5065TmX/ZV9r3mSVOFOGzGyGHFAv4RXWJA1TDEUKzhe/TLU5rOBlr8wkaVIOT /SDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bOyQ3D2m6kp4keOh4/ISbHF3F0Z8zk+OuX0WUFymWNs=; b=UP4i/4dhYArIXeNrMjwj8aqjza7v6dnSwPGHQJrxBT/cYuMnOgpIKWHbeHIM25G2jQ EoqQeUEF20hkzH5Wp2BGZ+49zxSkI9e3DKr9fhuLx4SGUu1wmY1n3bLhB+rndFwFBdEv qk0vSTLFnya4eVJBTF9BoUAe/oeqnso8rBjwOXUIYuHhAr68hlQDyeCp0uqnzxQhtVko 4YRM9akUMIRzt6NzNzBAnPheWYSFlYzTS7dMe0hXnzKKrlm2ZFEiZUJDHakHbBzGD3H7 lJnyfy4ofK9lHPl4xTLqGMQyEREi9Q7s/3NWSg2EQrRcw0plzEFawYUMBU/Y5xOi6DNw qO9w== X-Gm-Message-State: APjAAAXW9kLjTLvnXsUNF9pA1NpcykinTxXcXpCQ1K15ZF9ezRLpsLcM 85K8DD1QOoTjDj30nNKr4cU79rvH X-Google-Smtp-Source: APXvYqxy3FKi2OWdTi6pePHnwskIyOpQEUNcgXdd8LooJmLM/VAR5ZEx4vN1OgaToepTX+qReTLmWA== X-Received: by 2002:a19:8c14:: with SMTP id o20mr5722508lfd.158.1567765204293; Fri, 06 Sep 2019 03:20:04 -0700 (PDT) Received: from localhost.localdomain ([2a00:1838:30:a00:b25a:daff:fe9e:845]) by smtp.gmail.com with ESMTPSA id j22sm853841lja.4.2019.09.06.03.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2019 03:20:03 -0700 (PDT) From: Alexander Mukhin To: buildroot@buildroot.org Date: Fri, 6 Sep 2019 13:18:49 +0300 Message-Id: <20190906101849.4621-1-alexander.i.mukhin@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] pppd: use uclibc libcrypt instead of openssl 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: Alexander Mukhin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" If building with uclibc, fall back to using its cryptographic routines instead of openssl. This removes unnecessary dependence. Signed-off-by: Alexander Mukhin --- package/pppd/Config.in | 2 +- package/pppd/pppd.mk | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/pppd/Config.in b/package/pppd/Config.in index bf05689f53..7db5674bf1 100644 --- a/package/pppd/Config.in +++ b/package/pppd/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_PPPD depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_MUSL # Use __P() macro all over the tree depends on BR2_USE_MMU - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if BR2_TOOLCHAIN_USES_GLIBC help An implementation of the Point-to-point protocol. diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 4dffc17941..be6c443eec 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -12,10 +12,14 @@ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c +PPPD_MAKE_OPTS = HAVE_INET6=y +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) PPPD_DEPENDENCIES = openssl -PPPD_MAKE_OPTS = \ - HAVE_INET6=y \ - OPENSSL_INCLUDE_DIR=$(STAGING_DIR)/usr/include/openssl +PPPD_MAKE_OPTS += OPENSSL_INCLUDE_DIR=$(STAGING_DIR)/usr/include/openssl +else +PPPD_MAKE_OPTS += USE_CRYPT=y +endif + PPPD_INSTALL_STAGING = YES PPPD_TARGET_BINS = chat pppd pppdump pppstats PPPD_RADIUS_CONF = \