From patchwork Sun Jul 19 01:34:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1331634 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=qMnWu2D5; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Urc+pNCK; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B8SBx33mYz9sRR for ; Sun, 19 Jul 2020 11:36:56 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=MypEPqZmasp0Gey7ffwBthoUhPZo6DMPkuwMkdlRD6A=; b=qMnWu2D5GbhN/cgZLNk9/Qoz84 rMHfow0R5FY9Sz1HLkAvdqaNzFlLkllhMFrZv8bwiKoXxXXUt/aP3m+c0nhjoH6OHvIGAvFYl67nq rnGsbX0iClUjWuwSTO6LkXb1dagm5KS8R9sqPXjLl0JhwVHOxMimT0/0UWW/aafXrWGOwZZFDYjos ZOny/Y7tWiYBRxZ6bsaM5Yyc4aWcuNIZxp0w8jgAu/T1L1V9GTSpw6IJRUazARkMf/IKxY92kjEw+ RPkyYviOc4GgWjgWzhAeIQTdRKdDoUvU49IBPbGitkKgnSmwwOUNZ+GXwnr0m4OddnffzrETwEBkK YPVk5VqA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwyDw-0007Kp-Sm; Sun, 19 Jul 2020 01:34:40 +0000 Received: from mail-qt1-x843.google.com ([2607:f8b0:4864:20::843]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwyDq-0007Jz-AB for openwrt-devel@lists.openwrt.org; Sun, 19 Jul 2020 01:34:39 +0000 Received: by mail-qt1-x843.google.com with SMTP id j10so10520473qtq.11 for ; Sat, 18 Jul 2020 18:34:34 -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=3Lx8ND1J/l0FEQrEh8mH2xElyayArr+fpOKedSpKiBo=; b=Urc+pNCK+Wz4YgcBEgdQLBTaUFjHiNz+7n/pFfruHr1aKYRbH7XO2IhhI0Oovr1+mc +j8DwR0h/MJO5NtjXrhvbtHLJyQCiGtzchvUixewyV06qydvTfFhZhV4jLEEucT6aQam /R4VqEfA2RYPZiK65//ROm8V4K30nN7EbamBnmg83Uaar/ZJmPSOW2wMCASEwEWdlu4s +oEnmsVWb3fMcCFrbC+NTKBU0iEaxyiCPhYmU7U/pZo+ZjJ4GEuUYSFiK9CHWyVuJ1R4 +3ScepYbiMt6abCOrI6PKcAdccvB125Q6Xxsgvm0zwm33ZrBEzli2Vc0g5bX7iofJ6Ke 7crA== 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=3Lx8ND1J/l0FEQrEh8mH2xElyayArr+fpOKedSpKiBo=; b=JRBNI89h9eNnTz6sxuFMPvGg0BQSedGiEXwStZ4J21P5xMDnCE1xKBluqgvF/aNojH MZ2PjMU9vidXoL5HIgt5QUV7kVdySoA5svaKZ7bYepiRNGbe/qxFdArA6BtBXmKH2Pbp mvqYudeBvtynxjMewJS4CbJ0uWVqEpga1eUjML0X/MSB5ApUDdnzY+Kbcf5J4IykKsu7 DB1/k4oyNU+7SH/rTUZeZNEsI2JlmYNNWjII5qYWHbePmHajJOEUTVOv+wMHaavPdSuf lYX/ztAiyrdOTXyUqk49qLg9QvCiHnvsgm20mVktfAG4YQLm9sDyQErBZqpdkB/njUXr xMAQ== X-Gm-Message-State: AOAM5336ga5+ocRM/wUyEMtALidkj+8w4ovuXw+JojUHH+y5owgqjoRA HYLvFDFanFeFlW6yDdtx4/joWds= X-Google-Smtp-Source: ABdhPJwYb/jg4dNfcTG/VEKE5sL4ITVVg5eIKuJ37cg13CBpOlBZo4kc8IyZ6D7Ip9rNpl9JSb0fSw== X-Received: by 2002:aed:2518:: with SMTP id v24mr17350645qtc.327.1595122472476; Sat, 18 Jul 2020 18:34:32 -0700 (PDT) Received: from presler.lan (a109-49-8-134.cpe.netcabo.pt. [109.49.8.134]) by smtp.gmail.com with ESMTPSA id u71sm15656610qka.40.2020.07.18.18.34.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2020 18:34:31 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH] dropbear: fix the alternatives when dbclient isn't built Date: Sun, 19 Jul 2020 02:34:09 +0100 Message-Id: <20200719013408.331492-1-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200718_213438_305034_CA88071A X-CRM114-Status: UNSURE ( 7.50 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:843 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rsalvaterra[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rui Salvaterra Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The ssh and scp symlinks were still being created even when dbclient was disabled in the build configuration. Fix this annoyance. Signed-off-by: Rui Salvaterra --- package/network/services/dropbear/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 61e8a3bcb0..ae3f2a8637 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -53,9 +53,9 @@ define Package/dropbear CATEGORY:=Base system TITLE:=Small SSH2 client/server DEPENDS:= +DROPBEAR_ZLIB:zlib - ALTERNATIVES:=\ + $(if $(CONFIG_DROPBEAR_DBCLIENT),ALTERNATIVES:=\ 100:/usr/bin/ssh:/usr/sbin/dropbear \ - 100:/usr/bin/scp:/usr/sbin/dropbear \ + 100:/usr/bin/scp:/usr/sbin/dropbear,) endef @@ -149,7 +149,7 @@ endef define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - PROGRAMS="dropbear $(if $(CONFIG_DROPBEAR_DBCLIENT),dbclient,) dropbearkey scp" \ + PROGRAMS="dropbear $(if $(CONFIG_DROPBEAR_DBCLIENT),dbclient scp,) dropbearkey" \ MULTI=1 SCPPROGRESS=1 +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \