{"id":791246,"url":"http://patchwork.ozlabs.org/api/patches/791246/?format=json","web_url":"http://patchwork.ozlabs.org/project/lede/patch/20170719215217.GA21095@makrotopia.org/","project":{"id":54,"url":"http://patchwork.ozlabs.org/api/projects/54/?format=json","name":"LEDE development","link_name":"lede","list_id":"lede-dev.lists.infradead.org","list_email":"lede-dev@lists.infradead.org","web_url":"http://lede-project.org/","scm_url":"","webscm_url":"http://git.lede-project.org/","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170719215217.GA21095@makrotopia.org>","list_archive_url":null,"date":"2017-07-19T21:52:22","name":"[LEDE-DEV,1/2] busybox: move traceroute applets to /bin","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"a35fa1a291818540ddb4319c64410bcc745e2103","submitter":{"id":64091,"url":"http://patchwork.ozlabs.org/api/people/64091/?format=json","name":"Daniel Golle","email":"daniel@makrotopia.org"},"delegate":{"id":54629,"url":"http://patchwork.ozlabs.org/api/users/54629/?format=json","username":"dangole","first_name":"Daniel","last_name":"Golle","email":"daniel@makrotopia.org"},"mbox":"http://patchwork.ozlabs.org/project/lede/patch/20170719215217.GA21095@makrotopia.org/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/791246/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/791246/checks/","tags":{},"related":[],"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=\"uGgU0AEi\"; \n\tdkim-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 3xCW4710V9z9t33\n\tfor ;\n\tThu, 20 Jul 2017 07:53:11 +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 1dXwtv-0003yG-U9; Wed, 19 Jul 2017 21:52:59 +0000","from fudo.makrotopia.org ([2a07:2ec0:3002::71])\n\tby bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dXwtq-0003wj-5Q\n\tfor lede-dev@lists.infradead.org; Wed, 19 Jul 2017 21:52:57 +0000","from local by fudo.makrotopia.org with esmtpsa\n\t(TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256)\n\t(Exim 4.88) (envelope-from )\n\tid 1dXwtQ-00085w-Vo; Wed, 19 Jul 2017 23:52:29 +0200"],"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:MIME-Version:Message-ID:To:From\n\t:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:\n\tResent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:\n\tList-Owner; bh=Rnamlgr6gNyzta6ceoJofGXcLHVaxWtNNV0lIv4WgBI=;\n\tb=uGgU0AEiEvdHru\n\tZslQ+mpgR/CCqG0B9uWq6jFRoB0g0drExCaBw+4UuyFR8Nn/ElpgtrS7TS06TXLrl8MgPJ7mxGKB3\n\t7lNCtuVSADtSCfV5lHAuDCDXW0jW/wZdv/R7TsyMhhTMOtohGZXpIj+ZUTF4UDQ0OnIVxPYnBhty9\n\tqrFdrMl+GoiWXry5CDO3yOlSIrvmdZ2DyNvnUPctUEcYUfa1kQA8aCk9Z/CMLDj6hK0aVDeBTK0Sd\n\tQlau77n6RL0Licqr8QMcN1tK2OUroMGnskLb+Q4ISBLZKopKmT1y/k3pkCmt99UNOLsbnrpEnrQDY\n\tBdmyhhp44JFh+FQAkcEA==;","Date":"Wed, 19 Jul 2017 23:52:22 +0200","From":"Daniel Golle ","To":"lede-dev@lists.infradead.org","Message-ID":"<20170719215217.GA21095@makrotopia.org>","MIME-Version":"1.0","Content-Disposition":"inline","User-Agent":"Mutt/1.8.3 (2017-05-23)","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170719_145254_393941_BC4116AE ","X-CRM114-Status":"GOOD ( 10.30 )","X-Spam-Score":"-1.9 (-)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-1.9 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 SPF_PASS SPF: sender matches SPF record\n\t-0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay\n\tdomain\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]","Subject":"[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":"Felix 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"},"content":"busybox currently installs traceroute and traceroute6 into /usr/bin\nwhich prevents their 'full' iputils variants from being installed.\nMove those applets to /bin so they can coexist with their iputils\nsiblings using the same PATH convention already applied for coreutils\nand other drop-in 'full' versions.\nRefresh existing patch while at it.\n\nSigned-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","diff":"diff --git a/package/utils/busybox/patches/230-add_nslookup_lede.patch b/package/utils/busybox/patches/230-add_nslookup_lede.patch\nindex 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 +\treturn rc;\n +}\n--- \n-2.11.0\n-\ndiff --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\nnew file mode 100644\nindex 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:\t 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","prefixes":["LEDE-DEV","1/2"]}