Merge branch '2.5' into 2.6

Conflicts:
	coreutils/.md5sum
This commit is contained in:
Juergen Daubert 2009-08-24 21:40:27 +02:00
commit 48053be572
7 changed files with 23 additions and 16 deletions

View File

@ -76,6 +76,7 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/sort
-rwxr-xr-x root/root usr/bin/split
-rwxr-xr-x root/root usr/bin/stat
-rwxr-xr-x root/root usr/bin/stdbuf
-rwxr-xr-x root/root usr/bin/sum
-rwxr-xr-x root/root usr/bin/tac
-rwxr-xr-x root/root usr/bin/tail
@ -95,6 +96,9 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/who
-rwxr-xr-x root/root usr/bin/whoami
-rwxr-xr-x root/root usr/bin/yes
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/coreutils/
-rwxr-xr-x root/root usr/lib/coreutils/libstdbuf.so
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/base64.1.gz
@ -166,6 +170,7 @@ drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/sort.1.gz
-rw-r--r-- root/root usr/man/man1/split.1.gz
-rw-r--r-- root/root usr/man/man1/stat.1.gz
-rw-r--r-- root/root usr/man/man1/stdbuf.1.gz
-rw-r--r-- root/root usr/man/man1/stty.1.gz
-rw-r--r-- root/root usr/man/man1/sum.1.gz
-rw-r--r-- root/root usr/man/man1/sync.1.gz

View File

@ -1,2 +1,2 @@
e8d906c153f271430e3efb2b9a35a35f coreutils-7.4.tar.xz
ca9219c5b7efa533d552f61a3880f458 coreutils-7.5.tar.xz
1fb685fdb0b9d4c082e1b2bdfe932b7a coreutils-uname.patch

View File

@ -4,7 +4,7 @@
# Depends on: libgmp
name=coreutils
version=7.4
version=7.5
release=1
source=(http://ftp.gnu.org/pub/gnu/$name/$name-$version.tar.xz
coreutils-uname.patch)

View File

@ -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/

View File

@ -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

View File

@ -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)

View File

@ -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"