From patchwork Sun Nov 8 15:30:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannu Nyman X-Patchwork-Id: 541457 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3A081141400 for ; Mon, 9 Nov 2015 02:30:35 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 27983281482; Sun, 8 Nov 2015 16:28:31 +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 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 973E328021B for ; Sun, 8 Nov 2015 16:28:25 +0100 (CET) X-policyd-weight: using cached result; rate: -5.5 Received: from filtteri6.pp.htv.fi (filtteri6.pp.htv.fi [213.243.153.189]) by arrakis.dune.hu (Postfix) with ESMTP for ; Sun, 8 Nov 2015 16:28:25 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by filtteri6.pp.htv.fi (Postfix) with ESMTP id B36FF56FB1F; Sun, 8 Nov 2015 17:30:16 +0200 (EET) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp5.welho.com ([213.243.153.39]) by localhost (filtteri6.pp.htv.fi [213.243.153.189]) (amavisd-new, port 10024) with ESMTP id tHlUban9lmRv; Sun, 8 Nov 2015 17:30:12 +0200 (EET) Received: from localhost.localdomain (87-100-236-80.bb.dnainternet.fi [87.100.236.80]) by smtp5.welho.com (Postfix) with ESMTP id C09D05BC006; Sun, 8 Nov 2015 17:30:12 +0200 (EET) From: Hannu Nyman To: openwrt-devel@lists.openwrt.org Date: Sun, 8 Nov 2015 17:30:08 +0200 Message-Id: <1446996608-30186-1-git-send-email-hannu.nyman@iki.fi> X-Mailer: git-send-email 2.5.0 Cc: Hannu Nyman Subject: [OpenWrt-Devel] [PATCH] tools/e2fsprogs: update to 1.42.13 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" Update e2fsprogs to 1.42.13. Refresh and cleanup patches. Signed-off-by: Hannu Nyman --- Changelogs 1.42.8-1.42.13: http://e2fsprogs.sourceforge.net/e2fsprogs-release.html tools/e2fsprogs/Makefile | 6 +++--- tools/e2fsprogs/patches/003-openbsd-compat.patch | 12 +++++------- tools/e2fsprogs/patches/004-freebsd-compat.patch | 5 ++--- tools/e2fsprogs/patches/005-darwin-compat.patch | 9 +++++---- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile index 5632e19..0ecd952 100644 --- a/tools/e2fsprogs/Makefile +++ b/tools/e2fsprogs/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2013 OpenWrt.org +# Copyright (C) 2010-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs -PKG_VERSION:=1.42.8 -PKG_MD5SUM:=8ef664b6eb698aa6b733df59b17b9ed4 +PKG_VERSION:=1.42.13 +PKG_MD5SUM:=bc759fc62666786f5436e2075beb3265 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/tools/e2fsprogs/patches/003-openbsd-compat.patch b/tools/e2fsprogs/patches/003-openbsd-compat.patch index 1f7cdca..ded0eca 100644 --- a/tools/e2fsprogs/patches/003-openbsd-compat.patch +++ b/tools/e2fsprogs/patches/003-openbsd-compat.patch @@ -1,7 +1,6 @@ -diff -Nur e2fsprogs-1.42.7.orig/lib/blkid/getsize.c e2fsprogs-1.42.7/lib/blkid/getsize.c ---- e2fsprogs-1.42.7.orig/lib/blkid/getsize.c Fri Nov 30 03:40:18 2012 -+++ e2fsprogs-1.42.7/lib/blkid/getsize.c Thu Mar 7 14:21:59 2013 -@@ -26,6 +26,9 @@ +--- a/lib/blkid/getsize.c ++++ b/lib/blkid/getsize.c +@@ -25,6 +25,9 @@ #include #ifdef HAVE_SYS_IOCTL_H #include @@ -11,9 +10,8 @@ diff -Nur e2fsprogs-1.42.7.orig/lib/blkid/getsize.c e2fsprogs-1.42.7/lib/blkid/g #endif #ifdef HAVE_LINUX_FD_H #include -diff -Nur e2fsprogs-1.42.7.orig/lib/quota/mkquota.c e2fsprogs-1.42.7/lib/quota/mkquota.c ---- e2fsprogs-1.42.7.orig/lib/quota/mkquota.c Wed Jan 2 01:47:20 2013 -+++ e2fsprogs-1.42.7/lib/quota/mkquota.c Thu Mar 7 14:21:59 2013 +--- a/lib/quota/mkquota.c ++++ b/lib/quota/mkquota.c @@ -8,6 +8,7 @@ #include #include diff --git a/tools/e2fsprogs/patches/004-freebsd-compat.patch b/tools/e2fsprogs/patches/004-freebsd-compat.patch index 5eff499..c6435d4 100644 --- a/tools/e2fsprogs/patches/004-freebsd-compat.patch +++ b/tools/e2fsprogs/patches/004-freebsd-compat.patch @@ -1,6 +1,5 @@ -diff -Nur e2fsprogs-1.42.7.orig/lib/ext2fs/tdb.c e2fsprogs-1.42.7/lib/ext2fs/tdb.c ---- e2fsprogs-1.42.7.orig/lib/ext2fs/tdb.c 2012-07-06 15:37:27.000000000 +0200 -+++ e2fsprogs-1.42.7/lib/ext2fs/tdb.c 2013-03-07 14:54:59.000000000 +0100 +--- a/lib/ext2fs/tdb.c ++++ b/lib/ext2fs/tdb.c @@ -56,7 +56,9 @@ #include #endif diff --git a/tools/e2fsprogs/patches/005-darwin-compat.patch b/tools/e2fsprogs/patches/005-darwin-compat.patch index bc81d86..c5d0e28 100644 --- a/tools/e2fsprogs/patches/005-darwin-compat.patch +++ b/tools/e2fsprogs/patches/005-darwin-compat.patch @@ -6,9 +6,9 @@ +#include + + #ifndef HAVE___U8 + #define HAVE___U8 #ifdef __U8_TYPEDEF - typedef __U8_TYPEDEF __u8; - #else --- a/lib/ext2fs/ext2_types.h.in +++ b/lib/ext2fs/ext2_types.h.in @@ -9,6 +9,8 @@ @@ -17,6 +17,7 @@ +#include + + #ifndef HAVE___U8 + #define HAVE___U8 #ifdef __U8_TYPEDEF - typedef __U8_TYPEDEF __u8; - #else +