diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2013-10-13 14:03:44 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2013-10-13 14:03:44 +0000 |
| commit | c35fdf51772ce04af395b5362b260de30ff2e050 (patch) | |
| tree | 266fc0f28df08faa7d8b71aeb4f095d7d7571fd7 /sys-fs/fatsort | |
| parent | Respect AR/CC/CFLAGS, build verbosely (in src_test() as well). Remove unneede... (diff) | |
| download | historical-c35fdf51772ce04af395b5362b260de30ff2e050.tar.gz historical-c35fdf51772ce04af395b5362b260de30ff2e050.tar.bz2 historical-c35fdf51772ce04af395b5362b260de30ff2e050.zip | |
Fix bug #486176. Thanks to Sergey Popov for the report.
Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D
Diffstat (limited to 'sys-fs/fatsort')
| -rw-r--r-- | sys-fs/fatsort/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/fatsort/Manifest | 13 | ||||
| -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 |
4 files changed, 35 insertions, 9 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/Manifest b/sys-fs/fatsort/Manifest index 2b3d5b5fd479..2b857b7570ff 100644 --- a/sys-fs/fatsort/Manifest +++ b/sys-fs/fatsort/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX fatsort-1.1.1-test-results.patch 802 SHA256 afb322b4cbe999d2e00277d7d1e191d34193a03eff1d1aeb4fe4655da274161c SHA512 028d6dd63121d73529599cbe39ca9b1bc069a46480950215bac940706063cf78535a441c352711359b34a7463183e4db375c9cc5f5290de65dad4c8a15ff1b49 WHIRLPOOL a14c5c18aae4e4cabd533100a1646b61e39e340ac6aeb53fa5fed3422da160e22f7cd847470aa5f8b5537f96f12f479f795650978c7e4a02d596bb6a6ebfa39e DIST fatsort-1.1.1.336.tar.gz 55232 SHA256 e4c8212dffc94f62a15b557133e7a9acaf55ff17f5f22a655a67ac8cc36aee7c SHA512 8079cebf29cfd9995e6b5152f4e16c3ae7621949b38b3b8e0d438e97dc9081ddf613dd3189eb11fad6e00dab0064d962f41414b1adacb4a6923df4802db7a797 WHIRLPOOL 3174b552e1ac79ce3165b34777f6408c62c4803d6d9e3f15e62c82111a87d85e69ffb80799a22a5d0e67702e9ea2c09614ca4a0649a87a6a25510c604a80f9bd -EBUILD fatsort-1.1.1.ebuild 883 SHA256 ae57a2c10b69269b6d7e0ead33dec3828336b59a5e767bfa92850c0ed60657c9 SHA512 a914cfdf411387261d2b7410f1670a84602a48aea00d85d34a5efd45ebc7031a07915e6ac07a843bab6b30431f87c0aa4f98091c4b7d3310ae3a5d775a11d428 WHIRLPOOL ca41cbe91ddad777aeb46aa599ff0a6e33a09fbf038a3a33729dee126bc2f33d4c47cf5c7880c2d5afd0212de4d8ef632679996143f3e3921f688785b07a5375 -MISC ChangeLog 5054 SHA256 96dec5781f739605c3dc4e9aad84d780407c1bc931a411f401afc97e0807000b SHA512 d81e6c044404635eb8c5529c24c1575b4ff82148c6dca9036cca9235a12799fa00b622b36f539a18b29b779b148e118fe2a98f46d9431bc167ab69168f609aa6 WHIRLPOOL 5ea50ef8c68d4b59939abc1a3fa3e5662dfab2b12967ceec6b7820f07c5b23f53dc2a03c7e14a1d6a82861953dde4cc03b60b3dd38e34b2de32e3e7460b6b017 +EBUILD fatsort-1.1.1.ebuild 936 SHA256 dd2e274ddf165876032f1e4108977b72828f0f92b50f89082ad149441e73cc4e SHA512 bcdacefbd771490033f97d2ed9fd17911ebadb13a4ce2d2f69ab84a936fc14db5630b4ffb0e08dbc989b7ce4b84cd19bf025cbe931428701ea9ec87449fc2824 WHIRLPOOL 8a5db193389fe7945447ec20fc74c01caa04c2a5fa45a77be3846c4b1917ecb1f9a1bc3768a9cffd534a5198b9eeba8787f953e9cf61ebd8f8fd9f5f82cbb1fc +MISC ChangeLog 5230 SHA256 df10867afb1445931ce18a6a6b0155425ef2866c63dfe65f3083479f069c99ee SHA512 978058d8a26074a4878b7b4808886b021a89985c4dca5a37ebc880cdc62c18c4a24a11b6d2f9ff579533e8bd8ee1999021d3aa0f513d3984e8112578f1bb60af WHIRLPOOL 2e408dff61dcb54b9a2ee93a48c9473324cd4a368e0dbce4b9a75eb2b6b550bb8e7fc53d79581c5e1f20a441106570d6eb5a96265929d22c046c023e02a8455a MISC metadata.xml 649 SHA256 692b5e44fff655da359023ac38f686c8c4c0064977f04d02e1bd424103a92a80 SHA512 64fa1d9804a755457006a0cfc6e2e416644222504d8b55da9b005c3b3b7fc224ab4a1fe958eb814393468647f374c3750fa313063ecddc7bc7bde5bba062fc3f WHIRLPOOL 6f220b0683f7a1a6665586fdcc88cda25b3403783dbccfdbd890f502cdebab5c4e04b84e193bec845a6ad59704e95c041c571834eff46f1610bf51aae35824a9 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlJGkYEACgkQlcuUeyFa0U3O8ACdGe8j7l9qg2PFmcixRFavZKak -6/cAoJJd6wYsP8Dbsxgj0iXs6TRH6v6G -=GIN7 +iEYEAREIAAYFAlJaqEAACgkQlcuUeyFa0U2TRwCg10pIRXCdBF7ArHU5AS/RUqtG +Cn0AoNsj5jBfBRyUbV6QoxVzCvfr1KhV +=QBEU -----END PGP SIGNATURE----- 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 |