From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 28 Mar 2015 10:19:10 +0000 (+0000)
Subject: e2fsprogs: update to the latest version, fixes musl build failure
X-Git-Tag: reboot~3662
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=262ebee9430ca2e685626be12793ede81fa773f4;p=openwrt%2Fstaging%2Fblogic.git

e2fsprogs: update to the latest version, fixes musl build failure

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 45075
---

diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index a2ce9993266d..59e45eb23fb4 100644
--- a/package/utils/e2fsprogs/Makefile
+++ b/package/utils/e2fsprogs/Makefile
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.42.4
-PKG_MD5SUM:=b6e296f210d642361b7394437ff0f318
-PKG_RELEASE:=2
+PKG_VERSION:=1.42.12
+PKG_MD5SUM:=68255f51be017a93f2f6402fab06c2bf
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/e2fsprogs
diff --git a/package/utils/e2fsprogs/patches/001-com_err_version.patch b/package/utils/e2fsprogs/patches/001-com_err_version.patch
new file mode 100644
index 000000000000..62f1e08e71df
--- /dev/null
+++ b/package/utils/e2fsprogs/patches/001-com_err_version.patch
@@ -0,0 +1,13 @@
+--- a/lib/et/Makefile.in
++++ b/lib/et/Makefile.in
+@@ -25,8 +25,8 @@ SHARE_FILES= et_c.awk et_h.awk
+ LIBRARY= libcom_err
+ LIBDIR= et
+ 
+-ELF_VERSION = 2.1
+-ELF_SO_VERSION = 2
++ELF_VERSION = 0.0
++ELF_SO_VERSION = 0
+ ELF_IMAGE = libcom_err
+ ELF_MYDIR = et
+ ELF_INSTALL_DIR = $(root_libdir)
diff --git a/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch b/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch
deleted file mode 100644
index e0564dc35533..000000000000
--- a/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -5038,7 +5038,7 @@ if test "${ac_cv_lib_blkid_blkid_get_cac
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lblkid $LIBBLKID $LIBS"
-+LIBS="-lblkid $LIBBLKID $LIBUUID $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
---- a/misc/Makefile.in
-+++ b/misc/Makefile.in
-@@ -146,10 +146,10 @@ partinfo: partinfo.o
- 	$(E) "	LD $@"
- 	$(Q) $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
- 
--e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(LIBEXT2FS)
-+e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(DEPLIBUUID) $(LIBEXT2FS)
- 	$(E) "	LD $@"
- 	$(Q) $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
--		$(LIBBLKID) $(LIBEXT2FS) $(LIBINTL)
-+		$(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL)
- 
- tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \
- 		$(DEPLIBUUID) $(DEPLIBQUOTA) $(LIBEXT2FS)
-@@ -289,9 +289,9 @@ dumpe2fs.profiled: $(PROFILED_DUMPE2FS_O
- 		$(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \
- 		$(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL)
- 
--fsck: $(FSCK_OBJS) $(DEPLIBBLKID)
-+fsck: $(FSCK_OBJS) $(DEPLIBBLKID) $(DEPLIBUUID)
- 	$(E) "	LD $@"
--	$(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
-+	$(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBUUID) $(LIBINTL)
- 
- fsck.profiled: $(PROFILED_FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
- 	$(E) "	LD $@"
diff --git a/package/utils/e2fsprogs/patches/002-no_malloc_h.patch b/package/utils/e2fsprogs/patches/002-no_malloc_h.patch
deleted file mode 100644
index 209b47c1ccd7..000000000000
--- a/package/utils/e2fsprogs/patches/002-no_malloc_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/util/symlinks.c
-+++ b/util/symlinks.c
-@@ -8,7 +8,6 @@
- #endif
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include <string.h>
- #include <fcntl.h>
- #include <sys/param.h>
diff --git a/package/utils/e2fsprogs/patches/003-com_err_version.patch b/package/utils/e2fsprogs/patches/003-com_err_version.patch
deleted file mode 100644
index 62f1e08e71df..000000000000
--- a/package/utils/e2fsprogs/patches/003-com_err_version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/lib/et/Makefile.in
-+++ b/lib/et/Makefile.in
-@@ -25,8 +25,8 @@ SHARE_FILES= et_c.awk et_h.awk
- LIBRARY= libcom_err
- LIBDIR= et
- 
--ELF_VERSION = 2.1
--ELF_SO_VERSION = 2
-+ELF_VERSION = 0.0
-+ELF_SO_VERSION = 0
- ELF_IMAGE = libcom_err
- ELF_MYDIR = et
- ELF_INSTALL_DIR = $(root_libdir)