diff options
author | 2007-12-30 19:00:04 +0000 | |
---|---|---|
committer | 2007-12-30 19:00:04 +0000 | |
commit | cce2121ff1ea5afbeaff88c6a64dbe4f9928954c (patch) | |
tree | 77e6f603e547bf64bf402eb4e5f8bf657cb1d703 /sys-fs/squashfs-tools/files | |
parent | Stable on ppc wrt bug 203661 (diff) | |
download | gentoo-2-cce2121ff1ea5afbeaff88c6a64dbe4f9928954c.tar.gz gentoo-2-cce2121ff1ea5afbeaff88c6a64dbe4f9928954c.tar.bz2 gentoo-2-cce2121ff1ea5afbeaff88c6a64dbe4f9928954c.zip |
- Version bump.. get_nprocs() is a glibc only function and there is no reason to use it when sysconf(_SC_NPROCESSORS_CONF) exists. Also fixed some format mistakes.
(Portage version: 2.1.3.9)
Diffstat (limited to 'sys-fs/squashfs-tools/files')
-rw-r--r-- | sys-fs/squashfs-tools/files/digest-squashfs-tools-3.3 | 3 | ||||
-rw-r--r-- | sys-fs/squashfs-tools/files/squashfs-tools-3.3-posix.patch | 46 |
2 files changed, 49 insertions, 0 deletions
diff --git a/sys-fs/squashfs-tools/files/digest-squashfs-tools-3.3 b/sys-fs/squashfs-tools/files/digest-squashfs-tools-3.3 new file mode 100644 index 000000000000..54c54a56a10b --- /dev/null +++ b/sys-fs/squashfs-tools/files/digest-squashfs-tools-3.3 @@ -0,0 +1,3 @@ +MD5 62d3ff7c067a5aa82f57711b3a4ab86a squashfs3.3.tar.gz 323279 +RMD160 d324b6dd779820c2b54eddf087860096c0dbb68c squashfs3.3.tar.gz 323279 +SHA256 496049c7e5fd361d8fec814ee05005591380bbcb03a565957b78161cdefe84e5 squashfs3.3.tar.gz 323279 diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.3-posix.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.3-posix.patch new file mode 100644 index 000000000000..735cecb14a9c --- /dev/null +++ b/sys-fs/squashfs-tools/files/squashfs-tools-3.3-posix.patch @@ -0,0 +1,46 @@ +--- squashfs-tools/mksquashfs.c 2007-11-01 06:48:13 +0000 ++++ squashfs-tools/mksquashfs.c 2007-12-30 18:47:28 +0000 +@@ -991,12 +991,12 @@ + char buff[65536]; + + if((byte = readlink(filename, buff, 65536)) == -1) { +- ERROR("Failed to read symlink %d, creating empty symlink\n", filename); ++ ERROR("Failed to read symlink %s, creating empty symlink\n", filename); + byte = 0; + } + + if(byte == 65536) { +- ERROR("Symlink %d is greater than 65536 bytes! Creating empty symlink\n", filename); ++ ERROR("Symlink %s is greater than 65536 bytes! Creating empty symlink\n", filename); + byte = 0; + } + +@@ -1022,7 +1022,7 @@ + SQUASHFS_SWAP_IPC_INODE_HEADER(ipc, inode); + TRACE("ipc inode, type %s, nlink %d\n", type == SQUASHFS_FIFO_TYPE ? "fifo" : "socket", nlink); + } else +- BAD_ERROR("Unrecognised inode %d in create_inode\n"); ++ BAD_ERROR("Unrecognised inode in create_inode\n"); + + *i_no = MKINODE(inode); + inode_count ++; +@@ -2845,7 +2845,7 @@ + processors = 1; + } + #else +- processors = get_nprocs(); ++ processors = sysconf(_SC_NPROCESSORS_CONF); + #endif + } + +--- squashfs-tools/unsquashfs.c 2007-11-01 06:53:46 +0000 ++++ squashfs-tools/unsquashfs.c 2007-12-30 18:47:31 +0000 +@@ -921,7 +921,7 @@ + set_attributes(pathname, i->mode, i->uid, i->gid, i->time, TRUE); + dev_count ++; + } else +- ERROR("create_inode: could not create %s device %s, because you're not superuser!\n", ++ ERROR("create_inode: could not create %s device %s, because you're not superuser! %s\n", + chrdev ? "character" : "block", pathname, strerror(errno)); + break; + } |