From patchwork Sat Dec 20 13:49:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Szakmeister X-Patchwork-Id: 423064 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6062F140082 for ; Sun, 21 Dec 2014 00:51:58 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 8C49D280D8F; Sat, 20 Dec 2014 14:49:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 6B8C2280411 for ; Sat, 20 Dec 2014 14:49:53 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-qa0-f46.google.com (mail-qa0-f46.google.com [209.85.216.46]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sat, 20 Dec 2014 14:49:52 +0100 (CET) Received: by mail-qa0-f46.google.com with SMTP id w8so1704765qac.5 for ; Sat, 20 Dec 2014 05:51:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=/Qz4PlcNfd0lsyLZUUtmPG97e5OBWUfTDffw4RL5owQ=; b=h1NIOmyxPTU0Uxma0CmCXB2rTYKlgRy6LgP7/NDAMzMk1rXneaWWLOigJyG2UFD+G+ NNEfONb2PvKYTy8T9zVrYhmgfHaU6zsMlVvtKammxtMNAgLQgTiDr0vkztqltdSlWQrX 5XvGpFykc6UkhT0gqFU87Eb6+iiwYA895UQd34Pyhnr7HsOybMJRhMM03M9/JAeKaCW2 GASxSJzA2QbwoJbGZzFMLFCaQ3WfpMnkdj2RMbwtHD3Nr/Xmz3rKsg+S8BCxQrJl6iJY Qzz6N69/zBIMMGOsUMdubqttZOknA5e5sJPl62Q98VebjmORsw66IHjXz/0vm4JpAs1a MbIg== X-Received: by 10.229.63.71 with SMTP id a7mr22733559qci.24.1419083504859; Sat, 20 Dec 2014 05:51:44 -0800 (PST) Received: from pangolin.intelesys.local (74-92-144-137-WashingtonDC.hfc.comcastbusiness.net. [74.92.144.137]) by mx.google.com with ESMTPSA id p7sm10768973qat.4.2014.12.20.05.51.43 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Dec 2014 05:51:43 -0800 (PST) From: John Szakmeister To: openwrt-devel@lists.openwrt.org Date: Sat, 20 Dec 2014 08:49:27 -0500 Message-Id: <1419083368-32054-1-git-send-email-john@szakmeister.net> X-Mailer: git-send-email 2.1.1 Subject: [OpenWrt-Devel] [PATCH] [package] busybox: add another upstream fix X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Without this, modprobe doesn't work with uncompressed kernel modules. Signed-off-by: John Szakmeister --- .../008-upstream_no_fail_uncompressed.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/utils/busybox/patches/008-upstream_no_fail_uncompressed.patch diff --git a/package/utils/busybox/patches/008-upstream_no_fail_uncompressed.patch b/package/utils/busybox/patches/008-upstream_no_fail_uncompressed.patch new file mode 100644 index 0000000..46df028 --- /dev/null +++ b/package/utils/busybox/patches/008-upstream_no_fail_uncompressed.patch @@ -0,0 +1,31 @@ +From b664f740d90880560ce46b11f766625341342e80 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Mon, 27 Jan 2014 12:02:18 +0000 +Subject: libbb: open_zipped() should not fail on non-compressed files + +Signed-off-by: Denys Vlasenko +--- +diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c +index 1aeba13..27854af 100644 +--- a/archival/libarchive/open_transformer.c ++++ b/archival/libarchive/open_transformer.c +@@ -200,7 +200,16 @@ int FAST_FUNC open_zipped(const char *fname) + || (ENABLE_FEATURE_SEAMLESS_BZ2) + || (ENABLE_FEATURE_SEAMLESS_XZ) + ) { +- setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1); ++ /* ++ * Do we want to fail_if_not_detected? ++ * In most cases, no: think "insmod non_compressed_module". ++ * A case which would like to fail is "zcat uncompressed_file": ++ * otherwise, it happily outputs uncompressed_file as-is, ++ * which is, strictly speaking, not what is expected. ++ * If this ever becomes a problem, we can add ++ * fail_if_not_detected bool argument to open_zipped(). ++ */ ++ setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 0); + } + + return fd; +-- +cgit v0.9.1