From patchwork Wed Jun 19 16:42:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1118834 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.b="WmyEiHHh"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45TW4m0vfyz9s5c for ; Thu, 20 Jun 2019 02:44:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 84D2685D8D; Wed, 19 Jun 2019 16:44:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wjydYU0_GFS6; Wed, 19 Jun 2019 16:44:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C919785DDC; Wed, 19 Jun 2019 16:44:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 8BFDE1BF355 for ; Wed, 19 Jun 2019 16:44:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 894C787AFE for ; Wed, 19 Jun 2019 16:44:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xtTBY2bn0jhv for ; Wed, 19 Jun 2019 16:44:17 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 0156185707 for ; Wed, 19 Jun 2019 16:44:16 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id g135so180516wme.4 for ; Wed, 19 Jun 2019 09:44:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=of/PZ+mAt/pkc80BndJ9FZoAk2HyCdqoEHEMA0iexcs=; b=WmyEiHHhhk0Uqg8qEf4CPPSiFITahTC/1+MY6hnvDN5YAiTM1OQUor5d8+eQ7pQAit 0Ax65TflDRwB5pd3BaCq74u/8NgDWxg16+EkSm2rXF2NDTwo0AP8a7XfTnw+5INDkQaR G3Q/XmLKXFUXvW0kxOusWyJGa1G+fEGhHtoKr2Faf8YM8VeuxzDjhmPpRuDpPQzs4fiP N6l0GvKFJXAsgT71l06gpgF91CPyBK1tXmpyPbrIzy3A1DLTgmwNUcm/JcxhNd8ktbtQ CDM+4E9BqjpvuR8/qO7FKvfIlODGQAvC+e8qs6yaU/9hL7M5hw0OUvDKq/6XOi5IQmYd Td6Q== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=of/PZ+mAt/pkc80BndJ9FZoAk2HyCdqoEHEMA0iexcs=; b=Q2+q7qa5NUrq6Bg+nP1/UIt+6FFsSkNJK76TVYVu6tH6/yP2XF5za4C4OUOZ7VvFZR 1kUZ5I4gB6GFWhH7h1XCx12h1ddh5vj+CXs85iYun93vnkNRy9ksn3x+QzHHKp+/nHES t9hHexAtqtcjoBTVVEdZHXm1mxsPZ+DactGdd1yl1umW9Rhc9kQ3jgnAQvfcKHHQngzT qugg5RIZcRRKI5S5MGTBluCwGb/eLrg4IieVTDgfWpxzSklyDNS8Qn27DOHlBimtjDhJ 81hmseL9/55rId54Yk7/sTJxUEZwgRSSZ5l6x60HiTo9Fq9ZLef/IsrzeKiBZdYnnXBJ H6CA== X-Gm-Message-State: APjAAAWZonu5QvCvz6NDlWbjEhAdlYxRxAew6eeogvHDusUOl5jF7FI4 9oZKlQe7wIzQJFWRy8TpVX05Z/zNgy52KB86 X-Google-Smtp-Source: APXvYqwFlJpmaCAqszJiTcfzs96cKV2uMJ0WxMfL9NtmEYumPDiHi73XjrE3SdwgthvXSLQepRcxew== X-Received: by 2002:a1c:452:: with SMTP id 79mr9447574wme.149.1560962655043; Wed, 19 Jun 2019 09:44:15 -0700 (PDT) Received: from localhost.localdomain ([91.183.118.145]) by smtp.gmail.com with ESMTPSA id j7sm19949822wru.54.2019.06.19.09.44.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jun 2019 09:44:14 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Wed, 19 Jun 2019 18:42:55 +0200 Message-Id: <20190619164257.183607-2-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190619164257.183607-1-titouan.christophe@railnova.eu> References: <20190619164257.183607-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/3] package/busybox: bump version to 1.31.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Adam Duskett , Titouan Christophe , Andy Shevchenko , "Yann E . MORIN" , Ron Yorston Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove 0003-libbb-mark-scripted_main-as-externally-visible.patch as it was committed upstream in 3193cb56d6 Signed-off-by: Titouan Christophe --- ...-scripted_main-as-externally-visible.patch | 53 ------------------- package/busybox/busybox.hash | 4 +- package/busybox/busybox.mk | 2 +- 3 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 package/busybox/0003-libbb-mark-scripted_main-as-externally-visible.patch diff --git a/package/busybox/0003-libbb-mark-scripted_main-as-externally-visible.patch b/package/busybox/0003-libbb-mark-scripted_main-as-externally-visible.patch deleted file mode 100644 index d3b174dd4a..0000000000 --- a/package/busybox/0003-libbb-mark-scripted_main-as-externally-visible.patch +++ /dev/null @@ -1,53 +0,0 @@ -From eb5830223d452944b96e526b2f44158bda5c5c56 Mon Sep 17 00:00:00 2001 -From: Ron Yorston -Date: Sat, 30 Mar 2019 07:47:12 +0000 -Subject: [PATCH] libbb: mark scripted_main() as externally visible - -Building with individual binaries enabled fails when embedded -script applets are included: - - /tmp/ccIvMFZg.o: In function `main': - applet.c:(.text.main+0x20): undefined reference to `scripted_main' - -Mark scripted_main() as externally visible. - -Reported-by: Yann E. MORIN -Signed-off-by: Ron Yorston -Signed-off-by: "Yann E. MORIN" ---- -Upstream status: reported, patch pending; - http://lists.busybox.net/pipermail/busybox/2019-March/087148.html - http://lists.busybox.net/pipermail/busybox/2019-March/087149.html ---- - include/libbb.h | 2 +- - libbb/appletlib.c | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/libbb.h b/include/libbb.h -index e0d5521e4..a20d5e403 100644 ---- a/include/libbb.h -+++ b/include/libbb.h -@@ -1347,7 +1347,7 @@ void bb_logenv_override(void) FAST_FUNC; - - /* Embedded script support */ - char *get_script_content(unsigned n) FAST_FUNC; --int scripted_main(int argc, char** argv); -+int scripted_main(int argc, char** argv) MAIN_EXTERNALLY_VISIBLE; - - /* Applets which are useful from another applets */ - int bb_cat(char** argv) FAST_FUNC; -diff --git a/libbb/appletlib.c b/libbb/appletlib.c -index c15014a34..fa19e8488 100644 ---- a/libbb/appletlib.c -+++ b/libbb/appletlib.c -@@ -770,6 +770,7 @@ static int find_script_by_name(const char *name) - return -1; - } - -+int scripted_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE; - int scripted_main(int argc UNUSED_PARAM, char **argv) - { - int script = find_script_by_name(applet_name); --- -2.14.1 - diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index c6804dc1fe..2b346e685d 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,3 +1,3 @@ -# From https://busybox.net/downloads/busybox-1.30.1.tar.bz2.sha256 -sha256 3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc busybox-1.30.1.tar.bz2 +# From https://busybox.net/downloads/busybox-1.31.0.tar.bz2.sha256 +sha256 0e4925392fd9f3743cc517e031b68b012b24a63b0cf6c1ff03cce7bb3846cc99 busybox-1.31.0.tar.bz2 sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index e606068a90..7a5a37a05d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.30.1 +BUSYBOX_VERSION = 1.31.0 BUSYBOX_SITE = http://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0