From 6e6c9b74318b6d9b9f890204619276681e92f509 Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Tue, 30 Sep 2014 15:28:41 +0000
Subject: [PATCH] e2fsprogs: updated to 1.42.10. Fixed config.h: no such file
 error

---
 e2fsprogs/.footprint                     |  3 +++
 e2fsprogs/.md5sum                        |  3 ++-
 e2fsprogs/Pkgfile                        | 15 ++++++++-------
 e2fsprogs/e2fsprogs-1.42.10-config.patch | 20 ++++++++++++++++++++
 4 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 e2fsprogs/e2fsprogs-1.42.10-config.patch

diff --git a/e2fsprogs/.footprint b/e2fsprogs/.footprint
index 80a46af..02a0851 100644
--- a/e2fsprogs/.footprint
+++ b/e2fsprogs/.footprint
@@ -79,6 +79,9 @@ drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/com_err.3.gz
 drwxr-xr-x	root/root	usr/man/man5/
 -rw-r--r--	root/root	usr/man/man5/e2fsck.conf.5.gz
+lrwxrwxrwx	root/root	usr/man/man5/ext2.5.gz -> ext4.5.gz
+lrwxrwxrwx	root/root	usr/man/man5/ext3.5.gz -> ext4.5.gz
+-rw-r--r--	root/root	usr/man/man5/ext4.5.gz
 -rw-r--r--	root/root	usr/man/man5/mke2fs.conf.5.gz
 drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/badblocks.8.gz
diff --git a/e2fsprogs/.md5sum b/e2fsprogs/.md5sum
index 43f6551..49c766a 100644
--- a/e2fsprogs/.md5sum
+++ b/e2fsprogs/.md5sum
@@ -1 +1,2 @@
-aca828bb4bcca20991a442deb950b670  e2fsprogs-1.42.5.tar.gz
+7756d9c1b823e4b1f9344a6f59d47bd3  e2fsprogs-1.42.10-config.patch
+62bfe2fe0a194c5c37165789ac2825a8  e2fsprogs-1.42.10.tar.gz
diff --git a/e2fsprogs/Pkgfile b/e2fsprogs/Pkgfile
index 8a66c0e..4246864 100644
--- a/e2fsprogs/Pkgfile
+++ b/e2fsprogs/Pkgfile
@@ -5,13 +5,14 @@
 # Depends on: util-linux
 
 name=e2fsprogs
-version=1.42.5
-release=1
-source=(http://downloads.sourceforge.net/project/$name/$name/v$version/$name-$version.tar.gz)
+version=1.42.10
+release=2
+source=(http://downloads.sourceforge.net/project/$name/$name/v$version/$name-$version.tar.gz
+        $name-$version-config.patch)
 
 build() {
   cd $name-$version
-
+  patch -p1 -i $SRC/$name-$version-config.patch
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
@@ -26,12 +27,12 @@ build() {
               --disable-libuuid \
               --disable-uuidd
 
-  make
+  make -j1
   make -j1 DESTDIR=$PKG install install-libs
 
   # quota support is disabled by default
-  rm -r $PKG/usr/include/quota
-  rm $PKG/usr/lib/{libquota.a,pkgconfig/quota.pc}
+  #rm -r $PKG/usr/include/quota
+  #rm $PKG/usr/lib/{libquota.a,pkgconfig/quota.pc}
 
   rm -r $PKG/usr/share/info
 
diff --git a/e2fsprogs/e2fsprogs-1.42.10-config.patch b/e2fsprogs/e2fsprogs-1.42.10-config.patch
new file mode 100644
index 0000000..8ccd7d1
--- /dev/null
+++ b/e2fsprogs/e2fsprogs-1.42.10-config.patch
@@ -0,0 +1,20 @@
+2014-06-30 18:40:02.000000000 +0200
+@@ -0,0 +1,19 @@
+Subject: need to add includes to BUILD_CFLAGS for cross-building
+Author: Helmut Grohne <hel...@subdivi.de>
+Last-Modified: 2014-06-30
+
+Otherwise compiling util/subst.c fails because config.h cannot be found.
+
+Index: e2fsprogs-1.42.10/configure
+===================================================================
+--- e2fsprogs-1.42.10.orig/configure   2014-05-15 19:04:08.000000000 +0200
++++ e2fsprogs-1.42.10/configure        2014-06-30 18:36:53.451482000 +0200
+@@ -11479,7 +11479,7 @@
+    BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
+    BUILD_LDFLAGS="$LDFLAGS"
+ else
+-   BUILD_CFLAGS=
++   BUILD_CFLAGS="$INCLUDES"
+    BUILD_LDFLAGS=
+ fi
-- 
2.26.2