From patchwork Mon Jul 20 22:26:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1332656 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=lYxACBv4; 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=oPAEN4lF; 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 4B9bxN6VW7z9sRR for ; Tue, 21 Jul 2020 08:29:10 +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=dI4o20pTwQvGGoWwFV12NlnzPrpMXKExt6jledH3gk8=; b=lYxACBv4YgQPtLykVpgk8V8zp/ DyrtBqWdSvYb7qpt+Xyo302qe8GxesjU5IwP9HcP8m9V83PqmTodlgyCeroHcpdbNxNw4V6Dvn5ew e7TADWInE4aFZPhdoFc5nbKMGkYsR+kTCDMYN3uP3wHVPSChgEXsAaId2D8refDDWWBaiR5xhZFTv TuOYV9bCgE8u6vw0hEVum2T2n8+Vn9N9eXwkuDU2ofMAUc/ge7O7R/cnx6yD8IUq0nREtmh96Jw7F Z9RgrhT6JbVX8yiCCGcyZf8owMpkNxQUVv94f6f2ec9ZlpZCJa61qdkU9Hg5GHxbKbM+TqWr6BXAu W68hbuJg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxeFu-0003S8-04; Mon, 20 Jul 2020 22:27:30 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxeFs-0003RZ-0u for openwrt-devel@lists.openwrt.org; Mon, 20 Jul 2020 22:27:29 +0000 Received: by mail-wm1-x342.google.com with SMTP id 22so956593wmg.1 for ; Mon, 20 Jul 2020 15:27:26 -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=ql+nX/8gBVTF19gQUV522C6Glc/Svwgd97wrX4TEtxg=; b=oPAEN4lFv+XiLwtWiDdvZO7cCklqSyQyvrgYxlAcntgd0COqiXx/hysW3tGdIdg/N8 pg/xkpH6W2cke7u7th/sqhzxNIBAZCiRpkpuDF5JCn8rD/gQf4WRNt+dL1ifFFXwzkyy PSbi/gunIDx8dErfDj15lmRjp/VGgFws2FoEWV2g4teVypFlHzvyDZcK3CkDy+M8KiMj G01kfhJM3YbltQA97NH1/F+L59N7guTY9UmognsZ9etdKlkpvetTRidhcuKOAx/NKDqL QdlTBInN+r83HbpVmZxh4MV13E7tcbLZc8qi/oBE9/Q1DyUKe+mHh+oc95MziyqrPsjh GIIw== 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=ql+nX/8gBVTF19gQUV522C6Glc/Svwgd97wrX4TEtxg=; b=UZu4smDhO2QZiDUFqvd2JW7QvG0o2ZiSMrhBycpHuFDInbOg3RnJdbmIgA4AF/MVJ5 ORjwKQtfDCDhYW5896jssMFx7J6pxeDLpqshbILA2wd/XjxgShdoHVhv8XfPijWKiqN2 gQVh5QrhMMGny0NhMlzBr/TAyjQXRD0MUbs/PIPYNo/uVeAC/zfNEysBwfLdp+BG4yAD JZb71qkEoNZwEwXhK9XfUuXZmCzgPyrHk/urQdeg0Ez2n0/2+51B9zsb/hEHPxZEic+D t9PC9KP1XatkNvTE+iAMqnjSvdwHINxZMsRO3Rmnp0hWarP/kP2ZBuVHaMqh7HWuWMVb 61yg== X-Gm-Message-State: AOAM531MaK84wqUpC0w6jmTuuY///6K7HIgLlpHKgOLTuEyhmiVSqQ6T 8qRzO1EUj+hY+xm6x87bGdC0z94= X-Google-Smtp-Source: ABdhPJxrIDvtHwWN/hJGgGO4ifJJEuUoIwsIJa6WtrMro4BxXlVuTLIPG6vt/XMgB2P1XH/kS1v16A== X-Received: by 2002:a1c:238d:: with SMTP id j135mr1169681wmj.71.1595284045180; Mon, 20 Jul 2020 15:27:25 -0700 (PDT) Received: from presler.lan (a95-93-126-125.cpe.netcabo.pt. [95.93.126.125]) by smtp.gmail.com with ESMTPSA id s8sm35162840wru.38.2020.07.20.15.27.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 15:27:24 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH] dropbear: fix ssh alternative when dbclient isn't built Date: Mon, 20 Jul 2020 23:26:42 +0100 Message-Id: <20200720222641.585517-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-20200720_182728_184380_DA59FFF5 X-CRM114-Status: UNSURE ( 7.03 ) 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 [2a00:1450:4864:20:0:0:0:342 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_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_SIGNED Message has a DKIM or DK signature, not necessarily valid -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 symlink was 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..edd20909b1 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:=\ - 100:/usr/bin/ssh:/usr/sbin/dropbear \ - 100:/usr/bin/scp:/usr/sbin/dropbear \ + ALTERNATIVES:=100:/usr/bin/scp:/usr/sbin/dropbear + $(if $(CONFIG_DROPBEAR_DBCLIENT),ALTERNATIVES+= \ + 100:/usr/bin/ssh:/usr/sbin/dropbear,) endef