diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2013-10-13 14:03:38 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2013-10-13 14:03:38 +0000 |
| commit | c67983ab9ebaa96bc477dc0267d2664b3e8057d5 (patch) | |
| tree | a4bdb3d62046737d4e405bcafdba4a9c2d335639 /sys-fs | |
| parent | Respect AR/CC/CFLAGS, build verbosely (in src_test() as well). Remove unneede... (diff) | |
| download | gentoo-2-c67983ab9ebaa96bc477dc0267d2664b3e8057d5.tar.gz gentoo-2-c67983ab9ebaa96bc477dc0267d2664b3e8057d5.tar.bz2 gentoo-2-c67983ab9ebaa96bc477dc0267d2664b3e8057d5.zip | |
Fix bug #486176. Thanks to Sergey Popov for the report.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 215AD14D)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/fatsort/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/fatsort/fatsort-1.1.1.ebuild | 5 | ||||
| -rw-r--r-- | sys-fs/fatsort/files/fatsort-1.1.1-test-results.patch | 20 |
3 files changed, 28 insertions, 3 deletions
diff --git a/sys-fs/fatsort/ChangeLog b/sys-fs/fatsort/ChangeLog index f29d5cbce662..dd3e6a5b1a63 100644 --- a/sys-fs/fatsort/ChangeLog +++ b/sys-fs/fatsort/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/fatsort # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/ChangeLog,v 1.35 2013/09/28 08:21:16 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/ChangeLog,v 1.36 2013/10/13 14:03:38 billie Exp $ + + 13 Oct 2013; Daniel Pielmeier <billie@gentoo.org> fatsort-1.1.1.ebuild, + +files/fatsort-1.1.1-test-results.patch: + Fix bug #486176. Thanks to Sergey Popov for the report. 28 Sep 2013; Daniel Pielmeier <billie@gentoo.org> fatsort-1.1.1.ebuild: The tests require superuser privileges. diff --git a/sys-fs/fatsort/fatsort-1.1.1.ebuild b/sys-fs/fatsort/fatsort-1.1.1.ebuild index a41a9a7f80e3..989ef3ef6921 100644 --- a/sys-fs/fatsort/fatsort-1.1.1.ebuild +++ b/sys-fs/fatsort/fatsort-1.1.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/fatsort-1.1.1.ebuild,v 1.4 2013/09/28 08:21:16 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/fatsort-1.1.1.ebuild,v 1.5 2013/10/13 14:03:38 billie Exp $ EAPI=5 -inherit toolchain-funcs +inherit eutils toolchain-funcs SVN_REV=336 MY_P=${P}.${SVN_REV} @@ -27,6 +27,7 @@ S=${WORKDIR}/${MY_P} src_prepare() { sed -i -e '/^\(MANDIR=\|SBINDIR=\)/s|/usr/local|/usr|' \ $(find ./ -name Makefile) || die + epatch "${FILESDIR}/${P}-test-results.patch" } src_compile() { diff --git a/sys-fs/fatsort/files/fatsort-1.1.1-test-results.patch b/sys-fs/fatsort/files/fatsort-1.1.1-test-results.patch new file mode 100644 index 000000000000..0a55e73390a9 --- /dev/null +++ b/sys-fs/fatsort/files/fatsort-1.1.1-test-results.patch @@ -0,0 +1,20 @@ +Index: tests/tc_pos_print_fs_info_fat32/stdout_expected.txt +=================================================================== +--- tests/tc_pos_print_fs_info_fat32/stdout_expected.txt (revision 337) ++++ tests/tc_pos_print_fs_info_fat32/stdout_expected.txt (working copy) +@@ -2,12 +2,12 @@ + Device: fs.img + Type: FAT32 + Sector size: 512 bytes +-FAT size: 758 sectors (388096 bytes) ++FAT size: 757 sectors (387584 bytes) + Number of FATs: 2 + Cluster size: 1024 bytes + Max. cluster chain length: 4194303 clusters +-Data clusters (total / used / bad): 96882 / 13 / 4 ++Data clusters (total / used / bad): 96883 / 13 / 4 + FS size: 94.61 MiBytes + FAT32 root first cluster: 0x2 +-First cluster data offset: 0xc1800 ++First cluster data offset: 0xc1400 + First cluster FAT entry: 0x7 |