diff options
| author | Juergen Daubert <jue@jue.li> | 2009-08-24 21:40:27 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2009-08-24 21:40:27 +0200 |
| commit | 48053be5723538ff40e3b29bd00658f5f33eccf8 (patch) | |
| tree | 75a812679142d8870cc0813e518109e4d35189b2 /e2fsprogs | |
| parent | f2a9c5d0a899ccbdaa01ba7f844ee23abf1935e9 (diff) | |
| parent | 83f91dcba11e23955b6875c0c0b70590a0e30f7b (diff) | |
| download | core-48053be5723538ff40e3b29bd00658f5f33eccf8.tar.gz core-48053be5723538ff40e3b29bd00658f5f33eccf8.tar.xz | |
Merge branch '2.5' into 2.6
Conflicts:
coreutils/.md5sum
Diffstat (limited to 'e2fsprogs')
| -rw-r--r-- | e2fsprogs/.footprint | 2 | ||||
| -rw-r--r-- | e2fsprogs/.md5sum | 4 | ||||
| -rw-r--r-- | e2fsprogs/Pkgfile | 2 | ||||
| -rw-r--r-- | e2fsprogs/e2fsprogs-symlink.patch | 22 |
4 files changed, 16 insertions, 14 deletions
diff --git a/e2fsprogs/.footprint b/e2fsprogs/.footprint index 0198d669..24c61fc3 100644 --- a/e2fsprogs/.footprint +++ b/e2fsprogs/.footprint @@ -79,6 +79,7 @@ drwxr-xr-x root/root usr/man/man5/ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/badblocks.8.gz -rw-r--r-- root/root usr/man/man8/dumpe2fs.8.gz +-rw-r--r-- root/root usr/man/man8/e2freefrag.8.gz -rw-r--r-- root/root usr/man/man8/e2fsck.8.gz -rw-r--r-- root/root usr/man/man8/e2label.8.gz -rw-r--r-- root/root usr/man/man8/e2undo.8.gz @@ -97,6 +98,7 @@ lrwxrwxrwx root/root usr/man/man8/mkfs.ext4dev.8.gz -> mke2fs.8.gz -rw-r--r-- root/root usr/man/man8/resize2fs.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/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 3748930a..2a519964 100644 --- a/e2fsprogs/.md5sum +++ b/e2fsprogs/.md5sum @@ -1,2 +1,2 @@ -6708cc8e484809fc5cfb232882e48489 e2fsprogs-1.41.8.tar.gz -a96227870a264ec677e790ecc76749da e2fsprogs-symlink.patch +52f60a9e19a02f142f5546f1b5681927 e2fsprogs-1.41.9.tar.gz +7836f87497b68611fde5b375c5812e32 e2fsprogs-symlink.patch diff --git a/e2fsprogs/Pkgfile b/e2fsprogs/Pkgfile index c64cdd57..ea40398a 100644 --- a/e2fsprogs/Pkgfile +++ b/e2fsprogs/Pkgfile @@ -4,7 +4,7 @@ # Depends on: util-linux-ng name=e2fsprogs -version=1.41.8 +version=1.41.9 release=1 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz \ $name-symlink.patch) diff --git a/e2fsprogs/e2fsprogs-symlink.patch b/e2fsprogs/e2fsprogs-symlink.patch index 8188ae05..d8f5872c 100644 --- a/e2fsprogs/e2fsprogs-symlink.patch +++ b/e2fsprogs/e2fsprogs-symlink.patch @@ -1,6 +1,6 @@ -diff -Nru e2fsprogs-1.41.8.orig/e2fsck/Makefile.in e2fsprogs-1.41.8/e2fsck/Makefile.in ---- e2fsprogs-1.41.8.orig/e2fsck/Makefile.in 2009-07-16 13:20:07.000000000 +0200 -+++ e2fsprogs-1.41.8/e2fsck/Makefile.in 2009-07-16 13:30:47.000000000 +0200 +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 @@ -43,9 +43,9 @@ diff -Nru e2fsprogs-1.41.8.orig/e2fsck/Makefile.in e2fsprogs-1.41.8/e2fsck/Makef $(DESTDIR)$(man8dir)/fsck.ext4dev.8 install-strip: install -diff -Nru e2fsprogs-1.41.8.orig/lib/uuid/Makefile.in e2fsprogs-1.41.8/lib/uuid/Makefile.in ---- e2fsprogs-1.41.8.orig/lib/uuid/Makefile.in 2009-07-16 13:20:07.000000000 +0200 -+++ e2fsprogs-1.41.8/lib/uuid/Makefile.in 2009-07-16 13:29:17.000000000 +0200 +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 @@ -58,10 +58,10 @@ diff -Nru e2fsprogs-1.41.8.orig/lib/uuid/Makefile.in e2fsprogs-1.41.8/lib/uuid/M $(E) " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc" $(Q) $(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc -diff -Nru e2fsprogs-1.41.8.orig/misc/Makefile.in e2fsprogs-1.41.8/misc/Makefile.in ---- e2fsprogs-1.41.8.orig/misc/Makefile.in 2009-07-16 13:20:07.000000000 +0200 -+++ e2fsprogs-1.41.8/misc/Makefile.in 2009-07-16 13:28:35.000000000 +0200 -@@ -395,23 +395,23 @@ +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" @@ -91,7 +91,7 @@ diff -Nru e2fsprogs-1.41.8.orig/misc/Makefile.in e2fsprogs-1.41.8/misc/Makefile. $(DESTDIR)$(root_sbindir)/$(FINDFS_LINK); \ fi $(Q) for i in $(UPROGS); do \ -@@ -432,16 +432,16 @@ +@@ -441,16 +441,16 @@ $(Q) $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \ $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz $(E) " LINK mkfs.ext2.8" |