From: Victor Martinez <pitillo@ono.com>
Date: Tue, 15 Mar 2011 07:30:44 +0000 (+0000)
Subject: e2fsprogs: update to 1.41.14
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=de1cbf20dc37f71f2da9a3606148433cc5700ea7;p=crossrootfs.git

e2fsprogs: update to 1.41.14
---

diff --git a/e2fsprogs/.md5sum b/e2fsprogs/.md5sum
index 08d191c..e085006 100644
--- a/e2fsprogs/.md5sum
+++ b/e2fsprogs/.md5sum
@@ -1,2 +1 @@
-f9c7bb5c036a119453ce02fa871038da  e2fsprogs-1.41.10.tar.gz
-7836f87497b68611fde5b375c5812e32  e2fsprogs-symlink.patch
+05f70470aea2ef7efbb0845b2b116720  e2fsprogs-1.41.14.tar.gz
diff --git a/e2fsprogs/Pkgfile b/e2fsprogs/Pkgfile
index 0841d88..15039ce 100644
--- a/e2fsprogs/Pkgfile
+++ b/e2fsprogs/Pkgfile
@@ -5,20 +5,19 @@
 # Depends on: util-linux-ng
 
 name=e2fsprogs
-version=1.41.10
+version=1.41.14
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz \
-        $name-symlink.patch)
+source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
 
 build() {
   cd $name-$version
-  patch -p1 -i $SRC/$name-symlink.patch
 
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
               --with-root-prefix= \
               --mandir=/usr/man \
+              --enable-symlink-install \
               --enable-elf-shlibs \
               --disable-e2initrd-helper \
               --disable-evms \
diff --git a/e2fsprogs/e2fsprogs-symlink.patch b/e2fsprogs/e2fsprogs-symlink.patch
deleted file mode 100644
index d8f5872..0000000
--- a/e2fsprogs/e2fsprogs-symlink.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -Nru e2fsprogs-1.41.9.orig/e2fsck/Makefile.in e2fsprogs-1.41.9/e2fsck/Makefile.in
---- e2fsprogs-1.41.9.orig/e2fsck/Makefile.in	2009-08-24 20:56:23.512062398 +0200
-+++ e2fsprogs-1.41.9/e2fsck/Makefile.in	2009-08-24 20:57:10.332053609 +0200
-@@ -202,16 +202,16 @@
- 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
- 	done
- 	$(E) "	LINK $(root_sbindir)/fsck.ext2"
--	$(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
-+	$(Q) $(LN_S) -f e2fsck \
- 			$(DESTDIR)$(root_sbindir)/fsck.ext2
- 	$(E) "	LINK $(root_sbindir)/fsck.ext3"
--	$(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
-+	$(Q) $(LN_S) -f e2fsck \
- 			$(DESTDIR)$(root_sbindir)/fsck.ext3
- 	$(E) "	LINK $(root_sbindir)/fsck.ext4"
--	$(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
-+	$(Q) $(LN_S) -f e2fsck \
- 			$(DESTDIR)$(root_sbindir)/fsck.ext4
- 	$(E) "	LINK $(root_sbindir)/fsck.ext4dev"
--	$(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
-+	$(Q) $(LN_S) -f e2fsck \
- 			$(DESTDIR)$(root_sbindir)/fsck.ext4dev
- 	$(Q) for i in $(MANPAGES); do \
- 		for j in $(COMPRESS_EXT); do \
-@@ -228,16 +228,16 @@
- 		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
- 	done
- 	$(E) "	LINK $(man8dir)/fsck.ext2.8"
--	$(Q) $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
-+	$(Q) $(LN_S) -f e2fsck.8 \
- 		$(DESTDIR)$(man8dir)/fsck.ext2.8
- 	$(E) "	LINK $(man8dir)/fsck.ext3.8"
--	$(Q) $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
-+	$(Q) $(LN_S) -f e2fsck.8 \
- 		$(DESTDIR)$(man8dir)/fsck.ext3.8
- 	$(E) "	LINK $(man8dir)/fsck.ext4.8"
--	$(Q) $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
-+	$(Q) $(LN_S) -f e2fsck.8 \
- 		$(DESTDIR)$(man8dir)/fsck.ext4.8
- 	$(E) "	LINK $(man8dir)/fsck.ext4.8"
--	$(Q) $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
-+	$(Q) $(LN_S) -f e2fsck.8 \
- 		$(DESTDIR)$(man8dir)/fsck.ext4dev.8
- 
- install-strip: install
-diff -Nru e2fsprogs-1.41.9.orig/lib/uuid/Makefile.in e2fsprogs-1.41.9/lib/uuid/Makefile.in
---- e2fsprogs-1.41.9.orig/lib/uuid/Makefile.in	2009-08-24 20:56:23.522055416 +0200
-+++ e2fsprogs-1.41.9/lib/uuid/Makefile.in	2009-08-24 20:57:10.332053609 +0200
-@@ -146,9 +146,9 @@
- 	$(Q) $(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
- 		$(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
- 	$(E) "	LINK $(man3dir)/uuid_generate_random.3"
--	$(Q) $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
-+	$(Q) $(LN_S) -f uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
- 	$(E) "	LINK $(man3dir)/uuid_generate_time.3"
--	$(Q) $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
-+	$(Q) $(LN_S) -f uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
- 	$(E) "	INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
- 	$(Q) $(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
- 
-diff -Nru e2fsprogs-1.41.9.orig/misc/Makefile.in e2fsprogs-1.41.9/misc/Makefile.in
---- e2fsprogs-1.41.9.orig/misc/Makefile.in	2009-08-24 20:56:23.552053442 +0200
-+++ e2fsprogs-1.41.9/misc/Makefile.in	2009-08-24 20:57:10.352062592 +0200
-@@ -404,23 +404,23 @@
- 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
- 	done
- 	$(E) "	LINK $(root_sbindir)/mkfs.ext2"
--	$(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
-+	$(Q) $(LN_S) -f mke2fs \
- 		$(DESTDIR)$(root_sbindir)/mkfs.ext2
- 	$(E) "	LINK $(root_sbindir)/mkfs.ext3"
--	$(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
-+	$(Q) $(LN_S) -f mke2fs \
- 		$(DESTDIR)$(root_sbindir)/mkfs.ext3
- 	$(E) "	LINK $(root_sbindir)/mkfs.ext4"
--	$(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
-+	$(Q) $(LN_S) -f mke2fs \
- 		$(DESTDIR)$(root_sbindir)/mkfs.ext4
- 	$(E) "	LINK $(root_sbindir)/mkfs.ext4dev"
--	$(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
-+	$(Q) $(LN_S) -f mke2fs \
- 		$(DESTDIR)$(root_sbindir)/mkfs.ext4dev
- 	$(E) "	LINK $(root_sbindir)/e2label"
--	$(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
-+	$(Q) $(LN_S) -f tune2fs \
- 		$(DESTDIR)$(root_sbindir)/e2label
- 	$(Q) if test -n "$(FINDFS_LINK)"; then \
- 		echo "  LINK $(root_sbindir)/findfs"; \
--		$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
-+		$(LN_S) -f tune2fs \
- 			$(DESTDIR)$(root_sbindir)/$(FINDFS_LINK); \
- 	fi
- 	$(Q) for i in $(UPROGS); do \
-@@ -441,16 +441,16 @@
- 	$(Q) $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
- 		$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
- 	$(E) "	LINK mkfs.ext2.8"
--	$(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
-+	$(Q) $(LN_S) -f mke2fs.8 \
- 		$(DESTDIR)$(man8dir)/mkfs.ext2.8
- 	$(E) "	LINK mkfs.ext3.8"
--	$(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
-+	$(Q) $(LN_S) -f mke2fs.8 \
- 		$(DESTDIR)$(man8dir)/mkfs.ext3.8
- 	$(E) "	LINK mkfs.ext4.8"
--	$(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
-+	$(Q) $(LN_S) -f mke2fs.8 \
- 		$(DESTDIR)$(man8dir)/mkfs.ext4.8
- 	$(E) "	LINK mkfs.ext4dev.8"
--	$(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
-+	$(Q) $(LN_S) -f mke2fs.8 \
- 		$(DESTDIR)$(man8dir)/mkfs.ext4dev.8
- 	$(Q) for i in $(UMANPAGES); do \
- 		for j in $(COMPRESS_EXT); do \