From 6dbc1bb24de47ec2c6fbb154d1a5ee6a04c6a86f Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 16 Aug 2013 09:29:31 +0000
Subject: [PATCH] Revert "[package] e2fsprogs: update to 1.42.8 and add
 e4defrag"

This reverts commit f6b0be49ba0d8eee29e098cc057ced57e7a26dd4.

SVN-Revision: 37798
---
 package/utils/e2fsprogs/Makefile                 | 16 ++--------------
 .../patches/001-link-against-libuuid.patch       |  8 ++++----
 .../e2fsprogs/patches/002-no_malloc_h.patch      | 10 ++++++++++
 .../e2fsprogs/patches/003-com_err_version.patch  | 13 +++++++++++++
 4 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 package/utils/e2fsprogs/patches/002-no_malloc_h.patch
 create mode 100644 package/utils/e2fsprogs/patches/003-com_err_version.patch

diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index 49e53f4588..0dca9808dd 100644
--- a/package/utils/e2fsprogs/Makefile
+++ b/package/utils/e2fsprogs/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.42.8
-PKG_MD5SUM:=8ef664b6eb698aa6b733df59b17b9ed4
+PKG_VERSION:=1.42.4
+PKG_MD5SUM:=b6e296f210d642361b7394437ff0f318
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -56,12 +56,6 @@ $(call Package/e2fsprogs)
   DEPENDS:= +e2fsprogs
 endef
 
-define Package/e4defrag
-$(call Package/e2fsprogs)
-  TITLE:=Ext4 Filesystem defrag utility
-  DEPENDS:= +e2fsprogs
-endef
-
 define Package/resize2fs
 $(call Package/e2fsprogs)
   TITLE:=Ext2 Filesystem resize utility
@@ -145,11 +139,6 @@ define Package/tune2fs/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/
 endef
 
-define Package/e4defrag/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e4defrag $(1)/usr/sbin/
-endef
-
 define Package/resize2fs/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/resize2fs $(1)/usr/sbin/
@@ -163,6 +152,5 @@ endef
 $(eval $(call BuildPackage,e2fsprogs))
 $(eval $(call BuildPackage,libext2fs))
 $(eval $(call BuildPackage,tune2fs))
-$(eval $(call BuildPackage,e4defrag))
 $(eval $(call BuildPackage,resize2fs))
 $(eval $(call BuildPackage,badblocks))
diff --git a/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch b/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch
index 2c84d95008..e0564dc355 100644
--- a/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch
+++ b/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -5111,7 +5111,7 @@ if ${ac_cv_lib_blkid_blkid_get_cache+:}
+@@ -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
@@ -11,7 +11,7 @@
  
 --- a/misc/Makefile.in
 +++ b/misc/Makefile.in
-@@ -147,10 +147,10 @@ partinfo: partinfo.o
+@@ -146,10 +146,10 @@ partinfo: partinfo.o
  	$(E) "	LD $@"
  	$(Q) $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
  
@@ -24,7 +24,7 @@
  
  tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \
  		$(DEPLIBUUID) $(DEPLIBQUOTA) $(LIBEXT2FS)
-@@ -290,9 +290,9 @@ dumpe2fs.profiled: $(DUMPE2FS_OBJS) $(PR
+@@ -289,9 +289,9 @@ dumpe2fs.profiled: $(PROFILED_DUMPE2FS_O
  		$(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \
  		$(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL)
  
@@ -34,5 +34,5 @@
 -	$(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
 +	$(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBUUID) $(LIBINTL)
  
- fsck.profiled: $(FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
+ 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
new file mode 100644
index 0000000000..209b47c1cc
--- /dev/null
+++ b/package/utils/e2fsprogs/patches/002-no_malloc_h.patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 0000000000..62f1e08e71
--- /dev/null
+++ b/package/utils/e2fsprogs/patches/003-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)
-- 
2.25.1