From: Victor Martinez <pitillo@ono.com>
Date: Sat, 24 Nov 2012 00:13:51 +0000 (+0000)
Subject: e2fsprogs: updated to 1.42.5 and aligned with upstream
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=af6d6162ad6b0464afddc5fe6fe2d8c73e44d021;p=crossrootfs.git

e2fsprogs: updated to 1.42.5 and aligned with upstream
---

diff --git a/e2fsprogs/.footprint b/e2fsprogs/.footprint
index 32cc669..80a46af 100644
--- a/e2fsprogs/.footprint
+++ b/e2fsprogs/.footprint
@@ -36,6 +36,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/lsattr
 -rwxr-xr-x	root/root	usr/bin/mk_cmds
 drwxr-xr-x	root/root	usr/include/
+lrwxrwxrwx	root/root	usr/include/com_err.h -> et/com_err.h
 drwxr-xr-x	root/root	usr/include/e2p/
 -rw-r--r--	root/root	usr/include/e2p/e2p.h
 drwxr-xr-x	root/root	usr/include/et/
@@ -49,6 +50,7 @@ drwxr-xr-x	root/root	usr/include/ext2fs/
 -rw-r--r--	root/root	usr/include/ext2fs/ext2_types.h
 -rw-r--r--	root/root	usr/include/ext2fs/ext2fs.h
 -rw-r--r--	root/root	usr/include/ext2fs/ext3_extents.h
+-rw-r--r--	root/root	usr/include/ext2fs/qcow2.h
 -rw-r--r--	root/root	usr/include/ext2fs/tdb.h
 drwxr-xr-x	root/root	usr/include/ss/
 -rw-r--r--	root/root	usr/include/ss/ss.h
@@ -87,6 +89,7 @@ drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/e2image.8.gz
 -rw-r--r--	root/root	usr/man/man8/e2label.8.gz
 -rw-r--r--	root/root	usr/man/man8/e2undo.8.gz
+-rw-r--r--	root/root	usr/man/man8/e4defrag.8.gz
 -rw-r--r--	root/root	usr/man/man8/filefrag.8.gz
 lrwxrwxrwx	root/root	usr/man/man8/fsck.ext2.8.gz -> e2fsck.8.gz
 lrwxrwxrwx	root/root	usr/man/man8/fsck.ext3.8.gz -> e2fsck.8.gz
@@ -103,6 +106,7 @@ lrwxrwxrwx	root/root	usr/man/man8/mkfs.ext4dev.8.gz -> mke2fs.8.gz
 -rw-r--r--	root/root	usr/man/man8/tune2fs.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/e2freefrag
+-rwxr-xr-x	root/root	usr/sbin/e4defrag
 -rwxr-xr-x	root/root	usr/sbin/filefrag
 -rwxr-xr-x	root/root	usr/sbin/mklost+found
 drwxr-xr-x	root/root	usr/share/
diff --git a/e2fsprogs/.md5sum b/e2fsprogs/.md5sum
index e085006..43f6551 100644
--- a/e2fsprogs/.md5sum
+++ b/e2fsprogs/.md5sum
@@ -1 +1 @@
-05f70470aea2ef7efbb0845b2b116720  e2fsprogs-1.41.14.tar.gz
+aca828bb4bcca20991a442deb950b670  e2fsprogs-1.42.5.tar.gz
diff --git a/e2fsprogs/Pkgfile b/e2fsprogs/Pkgfile
index 15039ce..8a66c0e 100644
--- a/e2fsprogs/Pkgfile
+++ b/e2fsprogs/Pkgfile
@@ -2,12 +2,12 @@
 # URL: http://e2fsprogs.sourceforge.net/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
-# Depends on: util-linux-ng
+# Depends on: util-linux
 
 name=e2fsprogs
-version=1.41.14
+version=1.42.5
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
+source=(http://downloads.sourceforge.net/project/$name/$name/v$version/$name-$version.tar.gz)
 
 build() {
   cd $name-$version
@@ -20,7 +20,6 @@ build() {
               --enable-symlink-install \
               --enable-elf-shlibs \
               --disable-e2initrd-helper \
-              --disable-evms \
               --disable-nls \
               --disable-fsck \
               --disable-libblkid \
@@ -28,7 +27,13 @@ build() {
               --disable-uuidd
 
   make
-  make DESTDIR=$PKG install install-libs
+  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/share/info
+
   chmod +w -R $PKG
 }