package/e2fsprogs: update to 1.42.12, add subpackages for static tune2fs and e2fsck

package/e2fsprogs/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		e2fsprogs
-PKG_VERSION:=		1.42.10
-PKG_RELEASE:=		3
-PKG_HASH:=		7b6e85c666d8fdd6062c75ba953de0e5481673bebef5f40f749a52a46476e29f
+PKG_VERSION:=		1.42.12
+PKG_RELEASE:=		1
+PKG_HASH:=		6dadcd3b759195150d20154ab9d6516e3b3cbb35d66d461f55ae94a2854e7de8
 PKG_DESCR:=		ext2/3/4 filesystem utilities
 PKG_SECTION:=		sys/fs
 PKG_DEPENDS:=		libpthread
@@ -16,16 +16,19 @@ PKG_SITES:=		$(MASTER_SITE_SOURCEFORGE:=e2fsprogs/)
 PKG_OPTS:=		dev
 PKG_NOPARALLEL:=	1
 
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
-
 PKG_SUBPKGS:=		LIBE2FS LIBCOM_ERR LIBSS
 PKG_SUBPKGS+=		RESIZE2FS TUNE2FS E2FSCK MKE2FS
+PKG_SUBPKGS+=		E2FSCK_STATIC TUNE2FS_STATIC
 PKGSD_LIBE2FS:=		e2fsprogs library
 PKGSC_LIBE2FS:=		libs/misc
 PKGSD_LIBCOM_ERR:=	common error library
 PKGSC_LIBCOM_ERR:=	libs/misc
 PKGSD_LIBSS:=		subsystem command parsing library
 PKGSC_LIBSS:=		libs/misc
+PKGSD_E2FSCK_STATIC:=	Static build of e2fsck
+PKGSC_E2FSCK_STATIC:=	sys/fs
+PKGSD_TUNE2FS_STATIC:=	Static build of tune2fs
+PKGSC_TUNE2FS_STATIC:=	sys/fs
 PKGSD_RESIZE2FS:=	ext2/3/4 resize utility
 PKGSC_RESIZE2FS:=	sys/fs
 PKGSS_RESIZE2FS:=	libe2fs libcom-err libblkid
@@ -48,21 +51,26 @@ $(eval $(call PKG_template,TUNE2FS,tune2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS
 $(eval $(call PKG_template,RESIZE2FS,resize2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_RESIZE2FS),$(PKGSD_RESIZE2FS),$(PKGSC_RESIZE2FS)))
 $(eval $(call PKG_template,MKE2FS,mke2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MKE2FS),$(PKGSD_MKE2FS),$(PKGSC_MKE2FS)))
 $(eval $(call PKG_template,E2FSCK,e2fsck,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_E2FSCK),$(PKGSD_E2FSCK),$(PKGSC_E2FSCK)))
+$(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC}))
+$(eval $(call PKG_template,TUNE2FS_STATIC,tune2fs-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC}))
+
 
 ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
-CONFIGURE_ARGS+=	--disable-elf-shlibs \
-			--enable-libblkid
+CONFIGURE_ARGS+=	--disable-elf-shlibs
 else
-CONFIGURE_ARGS+=	--enable-elf-shlibs \
-			--disable-libblkid 
+CONFIGURE_ARGS+=	--enable-elf-shlibs
 endif
 
 CONFIGURE_ARGS+=	--disable-rpath \
-			--disable-libuuid \
+			--enable-libuuid \
+			--disable-uuidd \
+			--enable-libblkid \
 			--disable-testio-debug \
 			--disable-debugfs \
+			--enable-verbose-makecmds \
 			--disable-defrag
 TARGET_CFLAGS+=		$(TARGET_CPPFLAGS) -I$(STAGING_TARGET_DIR)/usr/include
+#TARGET_LDFLAGS+=	-L${WRKSRC}/lib -L${WRKSRC}/lib/ext2fs
 MAKE_FLAGS+=		BUILD_CC="$(HOST_CC)" \
 			BUILD_CFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -I$(WRKSRC)/lib -I." \
 			BUILD_LDFLAGS="$(HOST_LDFLAGS)"
@@ -106,4 +114,16 @@ libss-install:
 	$(CP) $(WRKINST)/usr/lib/libss.so* \
 		$(IDIR_LIBSS)/usr/lib
 
+e2fsck-static-install:
+	${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static
+	${INSTALL_DIR} ${IDIR_E2FSCK_STATIC}/usr/sbin
+	${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static \
+			${IDIR_E2FSCK_STATIC}/usr/sbin/e2fsck
+
+tune2fs-static-install:
+	${MAKE} -C ${WRKBUILD}/misc tune2fs.static
+	${INSTALL_DIR} ${IDIR_TUNE2FS_STATIC}/usr/sbin
+	${INSTALL_BIN} ${WRKBUILD}/misc/tune2fs.static \
+		${IDIR_TUNE2FS_STATIC}/usr/sbin/tune2fs
+
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/e2fsprogs/patches/patch-debugfs_dump_c

@@ -1,5 +1,5 @@
---- e2fsprogs-1.42.4.orig/debugfs/dump.c	2012-05-29 03:29:43.000000000 +0200
-+++ e2fsprogs-1.42.4/debugfs/dump.c	2012-07-26 18:48:09.000000000 +0200
+--- e2fsprogs-1.42.12.orig/debugfs/dump.c	2014-08-05 00:58:23.000000000 +0200
++++ e2fsprogs-1.42.12/debugfs/dump.c	2015-02-24 13:49:24.673532944 +0100
 @@ -22,7 +22,6 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -16,10 +16,10 @@
  	int i;
  
  	if (fd != -1)
-@@ -93,11 +91,6 @@ static void fix_perms(const char *cmd, c
- 
- 	if (fd != -1)
- 		close(fd);
+@@ -90,11 +88,6 @@ static void fix_perms(const char *cmd, c
+ #endif
+ 	if (i == -1)
+ 		com_err(cmd, errno, "while changing ownership of %s", name);
 -
 -	ut.actime = inode->i_atime;
 -	ut.modtime = inode->i_mtime;

package/e2fsprogs/patches/patch-debugfs_logdump_c

@@ -1,5 +1,5 @@
---- e2fsprogs-1.42.4.orig/debugfs/logdump.c	2012-06-04 18:42:23.000000000 +0200
-+++ e2fsprogs-1.42.4/debugfs/logdump.c	2012-07-26 18:48:09.000000000 +0200
+--- e2fsprogs-1.42.12.orig/debugfs/logdump.c	2014-07-06 06:13:18.000000000 +0200
++++ e2fsprogs-1.42.12/debugfs/logdump.c	2015-02-24 13:49:37.416495054 +0100
 @@ -22,7 +22,6 @@
  #include <sys/types.h>
  #include <sys/stat.h>

package/e2fsprogs/patches/patch-debugfs_set_fields_c

@@ -1,5 +1,5 @@
---- e2fsprogs-1.42.4.orig/debugfs/set_fields.c	2012-06-04 18:42:23.000000000 +0200
-+++ e2fsprogs-1.42.4/debugfs/set_fields.c	2012-07-26 18:48:09.000000000 +0200
+--- e2fsprogs-1.42.12.orig/debugfs/set_fields.c	2014-08-19 14:24:52.000000000 +0200
++++ e2fsprogs-1.42.12/debugfs/set_fields.c	2015-02-24 13:49:44.483474041 +0100
 @@ -34,7 +34,6 @@
  #include <strings.h>
  #endif

package/e2fsprogs/patches/patch-e2fsck_Makefile_in

@@ -0,0 +1,11 @@
+--- e2fsprogs-1.42.12.orig/e2fsck/Makefile.in	2014-08-02 22:26:22.000000000 +0200
++++ e2fsprogs-1.42.12/e2fsck/Makefile.in	2015-02-24 13:53:08.463908514 +0100
+@@ -120,7 +120,7 @@ e2fsck: $(OBJS)  $(DEPLIBS)
+ 
+ e2fsck.static: $(OBJS) $(STATIC_DEPLIBS)
+ 	$(E) "	LD $@"
+-	$(Q) $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) 
++	$(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) 
+ 
+ e2fsck.profiled: $(OBJS)  $(PROFILED_DEPLIBS)
+ 	$(E) "	LD $@"

package/e2fsprogs/patches/patch-misc_Makefile_in

@@ -1,50 +1,15 @@
---- e2fsprogs-1.42.10.orig/misc/Makefile.in	2014-05-15 19:04:08.000000000 +0200
-+++ e2fsprogs-1.42.10/misc/Makefile.in	2014-07-08 21:15:18.000000000 +0200
-@@ -17,9 +17,6 @@ INSTALL = @INSTALL@
- @IMAGER_CMT@E2IMAGE_PROG= e2image
- @IMAGER_CMT@E2IMAGE_MAN= e2image.8
- 
--@UUIDD_CMT@UUIDD_PROG= uuidd
--@UUIDD_CMT@UUIDD_MAN= uuidd.8
--
- @BLKID_CMT@BLKID_PROG= blkid
- @BLKID_CMT@BLKID_MAN= blkid.8
- 
-@@ -35,8 +32,8 @@ SMANPAGES=	tune2fs.8 mklost+found.8 mke2
- 			$(UUIDD_MAN) $(E4DEFRAG_MAN) @FSCK_MAN@
- FMANPAGES=	mke2fs.conf.5 ext4.5
- 
--UPROGS=		chattr lsattr @UUID_CMT@ uuidgen
--UMANPAGES=	chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
-+UPROGS=		chattr lsattr 
-+UMANPAGES=	chattr.1 lsattr.1
- 
- LPROGS=		@E2INITRD_PROG@
- 
-@@ -46,8 +43,6 @@ MKE2FS_OBJS=	mke2fs.o util.o profile.o p
- 			mk_hugefiles.o
- CHATTR_OBJS=	chattr.o
- LSATTR_OBJS=	lsattr.o
--UUIDGEN_OBJS=	uuidgen.o
--UUIDD_OBJS=	uuidd.o
- DUMPE2FS_OBJS=	dumpe2fs.o
- BADBLOCKS_OBJS=	badblocks.o
- E2IMAGE_OBJS=	e2image.o
-@@ -64,8 +59,6 @@ PROFILED_MKE2FS_OBJS=	profiled/mke2fs.o 
- 			profiled/prof_err.o profiled/default_profile.o
- PROFILED_CHATTR_OBJS=	profiled/chattr.o
- PROFILED_LSATTR_OBJS=	profiled/lsattr.o
--PROFILED_UUIDGEN_OBJS=	profiled/uuidgen.o
--PROFILED_UUIDD_OBJS=	profiled/uuidd.o
- PROFILED_DUMPE2FS_OBJS=	profiled/dumpe2fs.o
- PROFILED_BADBLOCKS_OBJS=	profiled/badblocks.o
- PROFILED_E2IMAGE_OBJS=	profiled/e2image.o
-@@ -80,7 +73,7 @@ PROFILED_E4DEFRAG_OBJS=	profiled/e4defra
- SRCS=	$(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c $(srcdir)/mk_hugefiles.c \
- 		$(srcdir)/chattr.c $(srcdir)/lsattr.c $(srcdir)/dumpe2fs.c \
- 		$(srcdir)/badblocks.c $(srcdir)/fsck.c $(srcdir)/util.c \
--		$(srcdir)/uuidgen.c $(srcdir)/blkid.c $(srcdir)/logsave.c \
-+		$(srcdir)/blkid.c $(srcdir)/logsave.c \
- 		$(srcdir)/filefrag.c $(srcdir)/base_device.c \
- 		$(srcdir)/ismounted.c $(srcdir)/../e2fsck/profile.c \
- 		$(srcdir)/e2undo.c $(srcdir)/e2freefrag.c
+	when linking tune2fs.static, pass libs in the correct order
+	(libuuid.a depends on libext2fs.a and therefore needs to come before that)
+--- e2fsprogs-1.42.12.orig/misc/Makefile.in	2014-08-03 01:41:18.000000000 +0200
++++ e2fsprogs-1.42.12/misc/Makefile.in	2015-02-10 18:19:51.022952937 +0100
+@@ -165,8 +165,8 @@ tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DE
+ tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID)
+ 	$(E) "	LD $@"
+ 	$(Q) $(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \
+-		$(STATIC_LIBS) $(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
+-		$(STATIC_LIBQUOTA) $(STATIC_LIBE2P) $(LIBINTL) $(SYSLIBS)
++		$(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
++		$(STATIC_LIBQUOTA) $(STATIC_LIBE2P) $(STATIC_LIBS) $(LIBINTL) $(SYSLIBS)
+ 
+ tune2fs.profiled: $(TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \
+ 		$(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) \

package/e2fsprogs/patches/patch-misc_e2initrd_helper_c

@@ -1,5 +1,5 @@
---- e2fsprogs-1.42.4.orig/misc/e2initrd_helper.c	2012-03-18 19:18:33.000000000 +0100
-+++ e2fsprogs-1.42.4/misc/e2initrd_helper.c	2012-07-26 18:48:09.000000000 +0200
+--- e2fsprogs-1.42.12.orig/misc/e2initrd_helper.c	2014-07-03 16:33:48.000000000 +0200
++++ e2fsprogs-1.42.12/misc/e2initrd_helper.c	2015-02-24 13:53:24.429861041 +0100
 @@ -24,7 +24,6 @@
  #include <sys/types.h>
  #include <sys/stat.h>

package/e2fsprogs/patches/patch-misc_e2undo_c

@@ -1,6 +1,6 @@
 	optind seems to need unistd.h, not only getopt.h
---- e2fsprogs-1.42.4.orig/misc/e2undo.c	2012-03-18 19:18:33.000000000 +0100
-+++ e2fsprogs-1.42.4/misc/e2undo.c	2012-07-26 18:48:09.000000000 +0200
+--- e2fsprogs-1.42.12.orig/misc/e2undo.c	2014-07-03 16:33:48.000000000 +0200
++++ e2fsprogs-1.42.12/misc/e2undo.c	2015-02-24 13:53:30.092844203 +0100
 @@ -20,6 +20,7 @@
  #if HAVE_ERRNO_H
  #include <errno.h>

package/e2fsprogs/patches/patch-util_subst_c

@@ -1,6 +1,6 @@
---- e2fsprogs-1.42.10.orig/util/subst.c	2014-05-15 19:04:08.000000000 +0200
-+++ e2fsprogs-1.42.10/util/subst.c	2014-07-08 21:18:41.000000000 +0200
-@@ -358,7 +358,7 @@ int main(int argc, char **argv)
+--- e2fsprogs-1.42.12.orig/util/subst.c	2014-08-02 22:26:22.000000000 +0200
++++ e2fsprogs-1.42.12/util/subst.c	2015-02-24 13:53:42.034808695 +0100
+@@ -363,7 +363,7 @@ int main(int argc, char **argv)
  		if (fd > 0) {
  			/* save the original atime, if possible */
  			if (fstat(fd, &stbuf) == 0) {