[{"id":1723935,"web_url":"http://patchwork.ozlabs.org/comment/1723935/","msgid":"","list_archive_url":null,"date":"2017-07-20T03:08:24","subject":"Re: [LEDE-DEV] [PATCH 1/2] busybox: move traceroute applets to /bin","submitter":{"id":65295,"url":"http://patchwork.ozlabs.org/api/people/65295/","name":"Yousong Zhou","email":"yszhou4tech@gmail.com"},"content":"On 20 July 2017 at 05:52, Daniel Golle wrote:\n> busybox currently installs traceroute and traceroute6 into /usr/bin\n> which prevents their 'full' iputils variants from being installed.\n> Move those applets to /bin so they can coexist with their iputils\n> siblings using the same PATH convention already applied for coreutils\n> and other drop-in 'full' versions.\n\nI'd like to mention that the \"alternatives\" support in LEDE repo is\nexactly for this situation and has already been applied to iproute2\nutilities. It's not yet applied to other packages like procps [1] as\nit will break the OpenWrt repo.\n\nThe patch looks good to me if we cannot wait till the OpenWrt repo to\nbe retired ;)\n\n [1] https://github.com/openwrt/packages/pull/4322\n\n yousong\n\n> Refresh existing patch while at it.\n>\n> Signed-off-by: Daniel Golle \n> ---\n> package/utils/busybox/patches/230-add_nslookup_lede.patch | 8 --------\n> .../patches/500-move-traceroute-applets-to-bin.patch | 13 +++++++++++++\n> 2 files changed, 13 insertions(+), 8 deletions(-)\n> create mode 100644 package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch\n>\n> diff --git a/package/utils/busybox/patches/230-add_nslookup_lede.patch b/package/utils/busybox/patches/230-add_nslookup_lede.patch\n> index 976960cf1a..e394dfb9b9 100644\n> --- a/package/utils/busybox/patches/230-add_nslookup_lede.patch\n> +++ b/package/utils/busybox/patches/230-add_nslookup_lede.patch\n> @@ -17,8 +17,6 @@ Signed-off-by: Jo-Philipp Wich \n> 2 files changed, 921 insertions(+)\n> create mode 100644 networking/nslookup_lede.c\n>\n> -diff --git a/Makefile.flags b/Makefile.flags\n> -index 65021de25..096ab7756 100644\n> --- a/Makefile.flags\n> +++ b/Makefile.flags\n> @@ -134,6 +134,12 @@ else\n> @@ -34,9 +32,6 @@ index 65021de25..096ab7756 100644\n> # libpam may use libpthread, libdl and/or libaudit.\n> # On some platforms that requires an explicit -lpthread, -ldl, -laudit.\n> # However, on *other platforms* it fails when some of those flags\n> -diff --git a/networking/nslookup_lede.c b/networking/nslookup_lede.c\n> -new file mode 100644\n> -index 000000000..c6c90ddf3\n> --- /dev/null\n> +++ b/networking/nslookup_lede.c\n> @@ -0,0 +1,915 @@\n> @@ -955,6 +950,3 @@ index 000000000..c6c90ddf3\n> +\n> + return rc;\n> +}\n> ---\n> -2.11.0\n> -\n> diff --git a/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch b/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch\n> new file mode 100644\n> index 0000000000..7fa06a68c7\n> --- /dev/null\n> +++ b/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch\n> @@ -0,0 +1,13 @@\n> +--- a/networking/traceroute.c\n> ++++ b/networking/traceroute.c\n> +@@ -239,8 +239,8 @@\n> + //config: Add option -I to use ICMP ECHO instead of UDP datagrams.\n> +\n> + /* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */\n> +-//applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE))\n> +-//applet:IF_TRACEROUTE6(APPLET(traceroute6, BB_DIR_USR_BIN, BB_SUID_MAYBE))\n> ++//applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_BIN, BB_SUID_MAYBE))\n> ++//applet:IF_TRACEROUTE6(APPLET(traceroute6, BB_DIR_BIN, BB_SUID_MAYBE))\n> +\n> + //kbuild:lib-$(CONFIG_TRACEROUTE) += traceroute.o\n> + //kbuild:lib-$(CONFIG_TRACEROUTE6) += traceroute.o\n> --\n> 2.13.2\n>\n>\n> _______________________________________________\n> Lede-dev mailing list\n> Lede-dev@lists.infradead.org\n> http://lists.infradead.org/mailman/listinfo/lede-dev","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133;\n\thelo=bombadil.infradead.org;\n\tenvelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"r6Vc80Rb\"; \n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"rYOHdfTX\"; dkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xCf5G3Frcz9t2r\n\tfor ;\n\tThu, 20 Jul 2017 13:09:38 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dY1q5-0003Kh-Ld; Thu, 20 Jul 2017 03:09:21 +0000","from mail-ua0-x242.google.com ([2607:f8b0:400c:c08::242])\n\tby bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dY1pq-0002lB-HB\n\tfor lede-dev@lists.infradead.org; Thu, 20 Jul 2017 03:09:19 +0000","by mail-ua0-x242.google.com with SMTP id 80so1572084uas.4\n\tfor ;\n\tWed, 19 Jul 2017 20:08:46 -0700 (PDT)","by 10.176.0.19 with HTTP; Wed, 19 Jul 2017 20:08:24 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:Subject:To:Message-ID:Date:From:\n\tReferences:In-Reply-To:MIME-Version:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=Hdk0xAyhVkCzSRwkBwiN1yoSgp97iZ3HqWxUWJvWigs=;\n\tb=r6Vc80RbVUl2vQ\n\tUobxHCSSejRlgkkcvARnAVIzK+XzzsB2CaYSJsHtWHNKnvl1oChra+2rp/aMPIEKuGiiMtxRQS5Gq\n\tbs600NsumEVkHBn86S3SSJavU7V9++Qm9PdR3b1eCxjGZFW70ab04WCxlFYnqyE62jGOXttMqzw92\n\tiarrZcpSnRjKPZGw7QG6h94IZ2uAEdiun2QPZH/6ZpbOlh3rV/MLwqAmDbAxCUhY0fiu5YIhrJ1Q/\n\tfLfpgwKYZAkIErx4m4QnLwSccgZAMxK8sBcE45vf2Eq83p3E+BcCouLE07a8vWMNiS07CjNPWFnwC\n\tQieNwLqDkmzBYk+okhQA==;","v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=mime-version:in-reply-to:references:from:date:message-id:subject:to\n\t:cc; bh=Ouioa0+GscPuw8CDKu2+ZiDWGR1abLQHpdVCP7aBPPs=;\n\tb=rYOHdfTXeWBkGi/n9zGoIDUy/KArxFKVmpNPW88UCaTknM9nJ7sn4DVeZToYgxFdMp\n\t1o1tSKJ8J/L3H+h+ycAi3cYyQanPBph9/pNM5YKJRr1n16RwYSgVgs34QeL/e9a2jqjZ\n\tWxb5t8Dpv7Db+PgESbzk1AENxdAJ4EoJBUjrOmfPNzxFFw1OdVo+JcdEuDmcmjYjbtbn\n\tUcFOZlBo5Mtdu8BqO6dDK8GaUG1Xg2MMnMOLLevd/1j+XcJT8jGVrbWVvcrh1N4FXLNQ\n\tfWLQEL9/VIPJaDROntZfxJyv+BQhCFqufbugFaH3mm8wFtsgIDxO1viWbY7RE0Rba6Aa\n\tkqbA=="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:in-reply-to:references:from:date\n\t:message-id:subject:to:cc;\n\tbh=Ouioa0+GscPuw8CDKu2+ZiDWGR1abLQHpdVCP7aBPPs=;\n\tb=O/vyvHK9wyhuM2MuUrGRDR2hQaYQ1WcEmJiHGFzeq/PlX0+DR27fWpdcMxCe+qgHk9\n\tvpc6Stzmk0MLbMsakYZQxgjqBjbUCaZGsUM1d9aFTDuojs0J7NZsnBZ7HsMYY+NUSmJg\n\tvBSxycb2Ob89Nay6HgakzkGuGMVCQfkGsy/UgSx+Ga+5uoYrQOn9kEcwvbZcVlGr5g46\n\tkJyYNWcvx5mjdzO7lG2DGrHP4fIRlO2AwwFK1jtwyBE90NlWNYtWVqcwSs/HD5jUppQ9\n\tY40UkGHUY0zibeuw3BP5OHea7jw94u3oCnDNG1Spp11QyyFuO52CYaxhtq5CV1w0ATqZ\n\tZQjA==","X-Gm-Message-State":"AIVw111OIlbX5E+SnP8pRegv+Wksr3hNu+DhYU8+xkXrVjBPGExksXKN\n\tD5lr0WbREGYvbgijjkS9orRedfsl4g==","X-Received":"by 10.176.23.204 with SMTP id p12mr1375643uaf.156.1500520124982; \n\tWed, 19 Jul 2017 20:08:44 -0700 (PDT)","MIME-Version":"1.0","In-Reply-To":"<20170719215217.GA21095@makrotopia.org>","References":"<20170719215217.GA21095@makrotopia.org>","From":"Yousong Zhou ","Date":"Thu, 20 Jul 2017 11:08:24 +0800","Message-ID":"","To":"Daniel Golle ","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170719_200906_840237_2854E363 ","X-CRM114-Status":"GOOD ( 13.80 )","X-Spam-Score":"-2.0 (--)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-2.0 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/,\n\tno\n\ttrust [2607:f8b0:400c:c08:0:0:0:242 listed in] [list.dnswl.org]\n\t-0.0 SPF_PASS SPF: sender matches SPF record\n\t0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\n\tprovider (yszhou4tech[at]gmail.com)\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]\n\t-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature\n\t0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n\tnot necessarily valid\n\t-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n\tauthor's domain","Subject":"Re: [LEDE-DEV] [PATCH 1/2] busybox: move traceroute applets to /bin","X-BeenThere":"lede-dev@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"LEDE Development List ,\n\tFelix Fietkau ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"Lede-dev\" ","Errors-To":"lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"}}]