From patchwork Thu Jan 4 21:22:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin 'ldir' Darbyshire-Bryant X-Patchwork-Id: 855825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GLjBhhSR"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=darbyshire-bryant.me.uk header.i=@darbyshire-bryant.me.uk header.b="EsWg0/7d"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zCLPc4Qhfz9s83 for ; Fri, 5 Jan 2018 08:23:16 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date: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=SDXCBJUDgp2vcJbfsRZxX2ynR2hbFje3N+lwGdqBRxQ=; b=GLjBhhSR0BDOsM +RjH9hpfLv5NuB/slHoJ2vj9ZJDaL3T6s4vXHim8rxfKWWCYD/SZi57ldyE0IE7DDdufkPFQqK0TN v4laUfJH+drP+hcI9pFAHRk3djc8ThMxEOMe9iz8LlRtzllMc/+GZVaD2t1O+AdzjDW8wQQ6ynPSa wwqZ3P2bjpWRITpA1se62VStIq8Qp8bukdRP+odO88cFQogdmUTVmz10FvCy3lXNlFsQzPdw5da9/ pEPNUzl7eF0zqqkQ7I9jW++ObVtv5Y5PN9PT92c4pVtHusi2q7M+jf+kSuVgi5BXqwn/0+rGyskKi B7H6LShdsu3UhiI/TLGg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eXCyk-0005uA-9e; Thu, 04 Jan 2018 21:23:10 +0000 Received: from mail-ve1eur01on0074.outbound.protection.outlook.com ([104.47.1.74] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eXCyW-0005YE-Dq for lede-dev@lists.infradead.org; Thu, 04 Jan 2018 21:23:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darbyshire-bryant.me.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=nPstlmoGH/LVMez6bjwlUth0RN1zp7xVx+xgqtoZq74=; b=EsWg0/7dmPRfs+JLld4FDTLV1M3GxGPALaiCsrrbCV7dGhAhezz2rdaRTmuLSFF9JF73xbFOCM2mBEKpPlc7nsXF6i+dZ08g1CzVgBcruplz1qWix2+CjwO4YMvjUSjL2JjRAQiOMvhflrTKjXs2yYT5INibEsSGI7mfZnN3gZw= Received: from Rowlf.darbyshire-bryant.me.uk (151.227.238.51) by VI1PR0702MB3741.eurprd07.prod.outlook.com (2603:10a6:803:7::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.1; Thu, 4 Jan 2018 21:22:42 +0000 From: Kevin Darbyshire-Bryant To: lede-dev@lists.infradead.org Date: Thu, 4 Jan 2018 21:22:38 +0000 Message-Id: <20180104212238.89041-1-ldir@darbyshire-bryant.me.uk> X-Mailer: git-send-email 2.14.3 (Apple Git-98) MIME-Version: 1.0 X-Originating-IP: [151.227.238.51] X-ClientProxiedBy: AM5P189CA0030.EURP189.PROD.OUTLOOK.COM (2603:10a6:206:15::43) To VI1PR0702MB3741.eurprd07.prod.outlook.com (2603:10a6:803:7::31) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7292082b-1223-41a6-9126-08d553b94a74 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020020)(7021020)(5600026)(4604075)(4534040)(7022020)(4602075)(4603075)(4627136)(201702281549075)(7023020)(2017052603307)(7153060); SRVR:VI1PR0702MB3741; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0702MB3741; 3:78cqyzjlE8fZNC0YGjJFvfbB45n0KsQ8Q+ssLrL07JEIEIBuHOty5n+G3ywbB+GuQ+tXu4eePBeqqVipa9lkWZig2YAuRhJeXInk+oMp1U2KHpks+eNInV8yUUlAEdbmaS36hiJB+KvrG+qAnCdNAWY3ab42Zz2RDc3s9yt0pBDLhx+Nm743VRzZFNkXIHPfD7bx1NsdkELm1+Dgo2OduPXCOqAgK1/scjI65M1xBw8f3A6qoJm+mQyv3xv3aX/Z; 25:7Wkr8Oys6GOhHbd59goccDh97oCDJRGKh15KW60CtgL2k+6ZtYnQbfECKxa41xU2BI6rSKIaPB9IesgxRbVN2jB71Q/1w2W8nRST/j4mQ8zOuX8TV4G84wqKENguqHl7DbxUHLKXOdLsGS2ilacJrpNuvXXFczUmIZnSygtrc5ylXxUwtq7wCnPRqsY/NeAcFSP4AeZaISa3lAvVMeNofFLPAMAVbGxyjRfTuDHlUJipmZ1xcUVmD7yLPIYgi2+za3RuKwKo6Uo+gwJeN2DpQmz8hwjGpSK+xuYXb5sic69BnwuXPzUYVmpjYKVaJquAFoWfBwrgvY81MhtgmyPK8g==; 31:fjjMqQQyBDXBK5ReCvIh6CpanyH42qJlgu+8IFYRtjxTg7AdV32EuqWnpUh6ljJHcxJuruSntd5BzasMffEQUbCa9ltt835n9xzZW+ACwcHHSq4/ydObSbdxo81307ZwyXr4vvNUCDfDWHNY/TvX5pyImNZyyDglAsjfcdUEXDAOtq6xeV46GdGdT3GKfA10quS4RdGTextZtHOmUKNBO6Rcy0ZoJUX4lHIlJ1UPPxE= X-MS-TrafficTypeDiagnostic: VI1PR0702MB3741: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(8415204561270); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231023)(944501075)(6041268)(20161123564045)(201703131423095)(201702281528075)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(2016111802025)(6072148)(6043046)(201708071742011); SRVR:VI1PR0702MB3741; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0702MB3741; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0702MB3741; 4:ecd4c5MbgHIdvICFhVE7xNvs9EmUHa9kLRyS3ECYyP1T56/HpUimwJoGwptPTxzxZ6lKKortOsRp6w3bhI2A7FOSV58MkrxSPX4z1CynqfFSYHvwo42xJsvES8D33jhDt1H0lPE7h1rwdu2RsAedF4Rbx4UXgpnBqxbpQizQt1MH6HyMa6lnTLWCpGqufDeAUrLRFdaBisLePM0IexEtRwjR4qTg09ZZkRUA22QVBGXpVOJT3tGrwtLQpHVtEMKOY2mHEwxA8T3K7QPcLw8T0WZwIaMt9nHrd/w0+U3up1nxYsz8T6QmpTlN1OygqtC6 X-Forefront-PRVS: 054231DC40 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(366004)(39380400002)(39830400003)(189003)(199004)(478600001)(1076002)(3846002)(6116002)(47776003)(66066001)(107886003)(25786009)(36756003)(97736004)(42882006)(6916009)(6666003)(2906002)(5660300001)(69596002)(48376002)(68736007)(386003)(575784001)(50226002)(7736002)(6486002)(7696005)(51416003)(8936002)(316002)(8676002)(74482002)(16586007)(53936002)(105586002)(106356001)(4326008)(2351001)(53416004)(2361001)(52116002)(50466002)(81166006)(81156014)(305945005)(16526018); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0702MB3741; H:Rowlf.darbyshire-bryant.me.uk; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0702MB3741; 23:SQ5jZGX7aDB0Rkk2FRRlemzy4c5pImBCqio0zlV?= NOCN4vAC+Y6CIHQ3q/elxBmTnZ1zE9UZbleNNrGP6/3cGU2JebuEi/R6r7ABoYx5mnvzU6x16+gediLDTogA9dwclekm9TY3QJ5JKl38y/bEqpN6vxjFp1yMI1UNgsZR0VXEkGF51K21hBQ2mgENGq0fSq4lt6UdItWOhtnH00xHVCXmBZ8BiqvTCXqbs0ceGtf1ahniT0ElGCnyLZLOZVCzBT6gT8KTQ9GXCXJUywhq56J9Cz1emh+juBpBmNpS6U3lsvSH93xK+fG/9BaYWe7xwnDIpEXPAiLnONUJgWTazwdFPRqrPj8tPvh+1JdVtdP5GY5vAdcF8n+7ePxzajsxZzE78HUQOohkq8b3KF/MEdvrpLhaUqHlQfRmrsSBnHX1S1UZr6EtPGcNK7rdEVgULAna+v9fptkR9ZuZ+afDiuF6/uTo1BwZzWDXjGWdq6521eoyiLenbG8frHvgOHM2h/cVp9ns95NyEGkHk8iG4fWYeuzAEw9Ks+n3r5lBd2FNXa/Vi9330lizzIAeWIHsjnB6urZQZBnz3hqvTrAPBBrS+XQKqyOTToNDNrcm1V4Wl6ysd39I+PPX6Vcsf+5LuUR5LMASE6LlnR2ELhbgHjlVRG1gXeBnCG1ufVdp9cInJQnO/rlgGHaGg013wx+GHoorN5ffnuAo8Neg9JlYSs4VaGaa3QsGMXX96cfU5gsHpzLAmjH3geF3Kj1lH/ygrIiL4JuXUQY9VSm0wui+gpTUDecYIL43aVsMU3B+f1dEjJQRW7CbxttfISOweL6vl0JELzolcm4sA1eV3YZqn9azE5LdQ3ILR9gfshmYLk+P/Vmmcd8DTNU+jafFBStkmnDAfHjKlGG9Jgdbfw62PszDx9fI9rJXxs5S79X5EngBAdnTn7M2ywYu/OfFs45l5wXw70YJeZMsdZiR4lwCoNUwM2NNrb7Xm8MHOHdqqmoKMJGXVrkDW2LUszekal7LsfEvv/XEyHkOkDPB9Yp+iKjOUjd3QnOzxwY1atGWGMtbQaCvkqrngGLWdTjIiZNgoAhoAoNRpfjGWF0fe7jm9HdUf0tkkbE7yx5eQHF5Rn4kBIiVcDVj6DkmIMa5/ChZleFwff1+2+uPBYF/j07qtNg== X-Microsoft-Exchange-Diagnostics: 1; VI1PR0702MB3741; 6:xnTwKvt+XQIWlN744cnGSQ2L62Y3PgmTxSl9QKKl4HPALQ5okij7rXvV9MVunmGayNxluxHGyXSIV2LY1646HA5oeFUXFaMqigb6akEL7ZaAx4++B3cEGIwKycGit0tJw/SANdiy8G0CmyJ48903KZm8pCEBMpq2jEOzapkpxOFE8OTMxvzTZy2psw/BRTR586lCKLrccSIotfnAPRCO6m0VPDvCZQohK+4AGVBFmNdHnZNPQLaOX8TZpdYCnvCRn1kudHgQRxBen32jXYUB/Y3EvUfHAWvwHDnWrBml9B60qocIZCKRqDOO0XxcCM9aQ2ZiJwsyzaToGhX8kmjF5aiytpYtbjIieeudBqiTyp0=; 5:GcJRLK8i3TukaJ1l1uAHE0aNXlClV86LSsPga8Pevi1PWVh/HIWo4kbqvmeRY9a9fvxSZH+RpDazMOfqvhAN9BPz0z5fHqMCdN+o2fGcn1Q5HvLDUSf8AAEN9c1fK7LaO2DbFT8zT9B7BpCPbeVYVHflibBaqqYRfYKgNF7KFmw=; 24:xKHqmqeC8r8a+w/wHDSukJ/C43x6hOb89KXq6yHrgSB3Klcwoa0F5k3qFSC8NPeZfjS8HdmHcbhHGGSq9F/S1ybJASQQV1e4mogK6302or8=; 7:NfulSo4Za6Vz5zux51CVl9ml67r5zjDWdgh2BE+IEk640pJja9nRGywTgSWsp/HP06wlpV+A7lGxTHyYZpCzO5R2wbDfL2eFoI61bXUU/FHfZLxKvSL4kPay846vIyIr/OKqYJGgccM/ivZNr1ai9UJx6xUVQoBGywA2yUULZyLvzCfbYuCngXl4Xp9aH0YS0iSENTrRbATyJvOqfokGcpGQ7KrqhU0h9mjKlSVx9oKP3Glw6n7ZpA4k8WS3is1f SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2018 21:22:42.4126 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7292082b-1223-41a6-9126-08d553b94a74 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0702MB3741 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180104_132257_444421_75DA36E9 X-CRM114-Status: UNSURE ( 7.17 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [104.47.1.74 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [104.47.1.74 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -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 Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Subject: [LEDE-DEV] [PATCH v1] busybox: clean up patch fuzz X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Darbyshire-Bryant Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Refresh patches to tidy up fuzz. No functional changes Signed-off-by: Kevin Darbyshire-Bryant --- .../utils/busybox/patches/500-move-traceroute-applets-to-bin.patch | 4 ++-- package/utils/busybox/patches/600-cve-2017-16544.patch | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) 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 index 7fa06a68c7..3741e25c3f 100644 --- a/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch +++ b/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch @@ -1,7 +1,7 @@ --- a/networking/traceroute.c +++ b/networking/traceroute.c -@@ -239,8 +239,8 @@ - //config: Add option -I to use ICMP ECHO instead of UDP datagrams. +@@ -237,8 +237,8 @@ + //config: depends on TRACEROUTE || TRACEROUTE6 /* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */ -//applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE)) diff --git a/package/utils/busybox/patches/600-cve-2017-16544.patch b/package/utils/busybox/patches/600-cve-2017-16544.patch index cbbdd53e9f..3b142bdd64 100644 --- a/package/utils/busybox/patches/600-cve-2017-16544.patch +++ b/package/utils/busybox/patches/600-cve-2017-16544.patch @@ -12,11 +12,9 @@ Signed-off-by: Denys Vlasenko libbb/lineedit.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -diff --git a/libbb/lineedit.c b/libbb/lineedit.c -index c0e35bb..56e8140 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c -@@ -645,6 +645,18 @@ static void free_tab_completion_data(void) +@@ -633,6 +633,18 @@ static void free_tab_completion_data(voi static void add_match(char *matched) { @@ -35,6 +33,3 @@ index c0e35bb..56e8140 100644 matches = xrealloc_vector(matches, 4, num_matches); matches[num_matches] = matched; num_matches++; --- -cgit v0.12 -