From 3f4e6d6a6fc24ea48223c1e8fe57202b9bac50ad Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Thu, 5 Mar 2015 08:04:34 +0000 Subject: [PATCH] Remove obsolete pkg_postinst() messages (bug #440586). Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- sys-fs/squashfs-tools/ChangeLog | 10 +++- sys-fs/squashfs-tools/Manifest | 23 ++-------- .../files/squashfs-tools-3.3-posix.patch | 46 ------------------- .../squashfs-tools-4.0-progress-bar.patch | 36 --------------- .../files/squashfs-tools-4.0-read-ret.patch | 23 ---------- .../squashfs-tools/squashfs-tools-4.3.ebuild | 10 +--- 6 files changed, 15 insertions(+), 133 deletions(-) delete mode 100644 sys-fs/squashfs-tools/files/squashfs-tools-3.3-posix.patch delete mode 100644 sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-bar.patch delete mode 100644 sys-fs/squashfs-tools/files/squashfs-tools-4.0-read-ret.patch diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog index 7251a5eff9c9..bddb3f32a7c7 100644 --- a/sys-fs/squashfs-tools/ChangeLog +++ b/sys-fs/squashfs-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/squashfs-tools -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.107 2014/09/28 11:02:46 blueness Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.108 2015/03/05 08:04:30 jer Exp $ + + 05 Mar 2015; Jeroen Roovers squashfs-tools-4.3.ebuild, + -files/squashfs-tools-3.3-posix.patch, + -files/squashfs-tools-4.0-progress-bar.patch, + -files/squashfs-tools-4.0-read-ret.patch: + Remove obsolete pkg_postinst() messages (bug #440586). 28 Sep 2014; Anthony G. Basile squashfs-tools-4.3.ebuild: diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest index 274035f214b1..8a5430107c1a 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -1,9 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX squashfs-tools-3.3-posix.patch 1596 SHA256 9e75c5d8aec9c36dd4096347cd258d957903d1c8f6bec36d98654bb42f868ed8 SHA512 6f934c3b20ada2ba689cc791fe5d1eaa570050653049604c50f712df7455aab228e93e3e378740f1d8f67e273dc9f6ebd8784004bd3a6806c3ee675f8efb2630 WHIRLPOOL 957bc352bcb49eb10d8c4ab730a000f2502a5209c75988959415536767d1976a5a6667a81dec2742e6a7927fb31486224f375f47d408b11b888d1a678725490b -AUX squashfs-tools-4.0-progress-bar.patch 1178 SHA256 c9dcfb9fda91f55bc379e5d55c2fa3f5b869b54a3dd25c80df17157dca6781fa SHA512 9024dfbc8b7a617739af3844fdb7566432c44b43db6650b53a81703e2e6c72711a3551ba0886a25d1aa53074f038db5b9d27140e82e8972e12c1ddedc5eb46d9 WHIRLPOOL 31e7d2f8d8d5353556466ce3d9da4cc958717b9b1b62db92eae03dcd354c5a2a0d6dac77dab63dc3e97b8f87283a6dc0c9d282f323f77481439a665cceb4d966 -AUX squashfs-tools-4.0-read-ret.patch 846 SHA256 ca968e8a2b4d59c1745a2ec1c076b988d675655abd47297bb83a076dfb7fc555 SHA512 5d619bbdebfe5162493bf6866de59cf828e2817a46ba9004527f37be8ac30bcc6f9a86264aeaa83d8649652b765805e1a9350955c817129d2addbe74e05305d2 WHIRLPOOL df3a43b40ade09c0552e26389eb2f0546ddb91749103f6b83fe097a896e4a387a1dfbaff8c4cbe099b5ee59d0c0f7f74ed08917644e737fea49d5f3859ce34a0 DIST squashfs-tools-4.2_p20140119.tar.xz 119496 SHA256 007382c4be734f923b7a0964c378b665d924adfd5537922452c455c0a2d4d20a SHA512 016c79000bb775c3ffb0a8eb9eefe11f9a82a0cd40be44b42c0c16f4184c4113538947d3677956f97313797ed9a7645380d05586afb0f6bd392cb4652e9fbe14 WHIRLPOOL 12ebdbb78053f0cc6863d1801ab964c0460966667a24f0eca39a63d73a5a313291981a39c5b6f539c33f0eb65ff34d7bbc00a06ae256173f9c4177fbfa3aacab DIST squashfs3.2-r2.tar.gz 314764 SHA256 8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7 SHA512 983f1fa966c15fb4929eaaf2d88401aac72f6d04e8c5523bd46397bc28928ff13b638e0e96bc09650627449c37f6a654ffa727445f1e9ca13cdc9de4fc43012f WHIRLPOOL 14b22cfc16e5c9bc91a5e02b9d4b64589339162d59613b12c2344acbed34690616a7a0254d9a63f839e96ff4b850f30fd7e1e855aecb76423356f4b1d8582129 DIST squashfs3.4.tar.gz 352660 SHA256 9ea1a9b3bd4f387ca11b5e96f00f8ae996fb81c4c7ad41f7c7f359917628a339 SHA512 5e126ea468271f54c62d473a04a355169514f2668b4dc0de4138a8ef2a6e633d373454e7b85c1c684b875d9dfc8afb17c05548dd5062d05f847ffef8e624d9fe WHIRLPOOL 7c113f3a66d0d28310302017e5f317d14bb5576e680a8f94e687193a376db92c54920be7d1121637f860cafa802d665ba419115e976b07029ca1f0c51953972d @@ -14,23 +11,13 @@ EBUILD squashfs-tools-3.4.ebuild 1101 SHA256 152e87091c76d2312057319cf1f0250154d EBUILD squashfs-tools-4.2-r1.ebuild 1469 SHA256 07a7963e89e3785c164f276e42fe5e01e94c7dc255ae34427a9bd7bc7124d452 SHA512 cbd8c215301e0d063f5dcf3049242fd7f2f2c79df17efca71e377dec57605ed21381edcd944474ff21c9da13bcf748242a141947151ffc4b15fb3c142b14671b WHIRLPOOL 297658a6eec918b03040f9a785c9f3f6d1d09484d1328510591c73cb38005469da8ed53b93749be466cf3a70e14a8e29a71576ac03f17c909b23eacc4c9f50c0 EBUILD squashfs-tools-4.2.ebuild 1396 SHA256 7fed23bab94b6b41c70a7ccb5ab57d22eb8fad9ebe191bade48a292eee2b5d5e SHA512 d2a857c4c7cc04268a906f77afbd82d5f13f4faf42a3a574352a9ee403e8716277499d0fb29bf2caeaa782f5352ad4acbb8bd29ddcb10747f705f61c1a83ba78 WHIRLPOOL c37f0cf29938e081bf01e3badc6a5e41f29af77e6ef33c955af14c54f9c53e187a4ddad22f46782ae86da7feaa166999109546d42cf59ab010ee5a846af31634 EBUILD squashfs-tools-4.2_p20140119.ebuild 1414 SHA256 11dea05ccfbf5d162fda27fd66e327426f40ee507526f7c1f75d39aa209ce037 SHA512 ab280eb0f2f5bfd384b55570193e46f6be9d4426280074846c7118486a43e8cd18c45dfccf0924b5d9fbd1404712a866421c87bc787b2fc777d8957bc365e8b7 WHIRLPOOL 0a921f928648a86a6b180d716b642e5af47d424fc90f10ad5104c446903c5b8e64871aaf5f2b35c4ee5e9b3cce729b2b5e002184a773e386586692b5d84372f3 -EBUILD squashfs-tools-4.3.ebuild 1460 SHA256 16366d13087375aae4d612d8423d971509a0273ee8bac374121c001644440481 SHA512 bbfb1347e906df1149358b7f58233025d2a935cc79bbe429cd68a41fe8bc27db8186366e9fbd5c0d11855d17994c5811ce2df1e1b0830fd2f922c9af66548057 WHIRLPOOL 72655818d3182e9195338e7e666a341d83c6f2c76045b653855e8714ba19a282d51917c295a21e9dd5d12378d04e97d8e37d5a524bde3fb551b2d76e6eaf8599 -MISC ChangeLog 17289 SHA256 47c299d8062396331f7f95a7c802f03af0cc74bf60b92c21e08638d82c3e3671 SHA512 4b7ff66a5ce96684f12a7efcb1671e423452a813b8a421518dc3bf3fa0c794b250640fa2204e0d85d1b1e47d8b72b649cf735af3c015296f6305b9ddf71b1a1c WHIRLPOOL 0cebf3cf3a79d97e6490af64ab9ff27088d0d4876fcbee3decd93a57c228891f4b4dad5ac8cb3ea9465b85f5b4b0ab035a42f031292741448e43232e0a5b811d +EBUILD squashfs-tools-4.3.ebuild 1297 SHA256 0f13e02a7d1d6c8705033c2f80fc730b5051f69746cbff3fd7ea75dbd1923a03 SHA512 89782fe919cc669cbacc1a41779ffabdf7e15201afd8ccc888b9924e43e832d309ea09fee24a0f0b6f0bf279d1db343d2a9dfc81ce449b9c60dd03de4fc7b947 WHIRLPOOL 87f61e1dd7348046c9af03cbf48361c69bea55bd8cf67feffd546672b3d08601cad0496336f077c2e92ded97ff21232a2b49b05fdba78640c2ff37ceedf4644c +MISC ChangeLog 17549 SHA256 fb4081667db136dc1c0805752368c41b0ecb0491862ec855618e4bbf630462df SHA512 a681685b34bf5ced767542700abbe341ccaa7a9dd9c9df1b9bdbf55dab8858113bccad00708a7a331f8a60309053c4f9446d9b12bb079c8f7c71387285d8e6f2 WHIRLPOOL 2b871dd1184446456c5160adf50f92e0412bc9c1a7470860a61faa312cb438cce5a2721f6e57197d50f3e3c83645b4aea8b10248c1841917742490ab191608eb MISC metadata.xml 377 SHA256 f55b4ff997009e1a694f9f78512dcce70e0fd1a111e25e758e6dc57dd19498cc SHA512 0fdc2d9306ee383b9e5220eab84478b19c7c7045909cedc9bfe823ea64e15f31f420062344ed6339dbd73a799b394097ac659d1e8dd6fb5da32f2c8bb0cdb72c WHIRLPOOL 5c57733fba7143afd7fe7351e2d8ae8a41f6ff1d4cdc8bc7152e270835713622303b9671ea2974c90c17e2f797e1b00ce68d80bfb5f396284cf3e8efb2a5cede -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUJ+rwAAoJEJOE+m71LUu6tYkQALVX3G7+aYVcEWlaP9xLZW+m -CaGIEMaw8OLcr3fP6/5965jDGz776Ka8b3MvYNtwM9uophVsPvhKjywkHjPzRIQg -M7UvOICBOwKu6pWnPcEE3BtFpfEqOmKmhjOC4WBop9rb81N7G3Ji7ZyXtVYCPQPg -DWw8q8yc0NendzOWzOE3xNDFLGxtZ1jyOKeAqa2cOAWtqlIpV6GbJU8DgFlqLFUI -H5z/vaqjWbo+qlwMDLI2ar364zqKRYlVefZGu7UTIQeo2s5mnrv0Y69dYCs7fE6e -DLZiCTqJaxaixekUGVzrnj9RPdVBXZ+wrqOG3kQWWJRV1Gck/De8uIcEoGTDj22Z -wBygk0W+YedEdj/zOllTEl2HT+5TgdLHDJSeGJR1IKUz2lpnrXMiUaCbEo6w4dvz -cwHLDo8Tc5rTv6WFdlQ0IQS7PWma943TUbHfDIU+bo/6Etwknha+SpLGHhXP2lvy -uCb0Fcbk50ZbfIQ3zXuaOaJKZHF4LNwwnSgL8GASq45BvtMQhz+taO4fu+N08H+f -WKpfBQLeJivYP0mLYKIQXaNek+OnexWbJ4wI2NpfH5OkTFdPask40qh8sZA/HqnI -2Ju5H/aA66yiu3xipa2k0zvZoM7oeoqsR9M117Xg4pS1uJOHOyEpA628L1U/gvoU -HazKg00D12AZahw2RAxZ -=PDpk +iEYEAREIAAYFAlT4DhEACgkQVWmRsqeSphNtlACbBzNQaZyqGZw30Aa7vBaLiCOQ +iN4AnioD/YttWNQtMcFaaEhH38DGYFg3 +=Bb+i -----END PGP SIGNATURE----- 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 deleted file mode 100644 index 735cecb14a9c..000000000000 --- a/sys-fs/squashfs-tools/files/squashfs-tools-3.3-posix.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- 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; - } diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-bar.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-bar.patch deleted file mode 100644 index 4efb8ff90a25..000000000000 --- a/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-bar.patch +++ /dev/null @@ -1,36 +0,0 @@ -http://bugs.gentoo.org/292011 - -revision 1.121 -date: 2010/03/08 01:30:17; author: plougher; state: Exp; lines: +10 -5 -Fix floating point error in progress_bar when max == 0 - -Index: unsquashfs.c -=================================================================== -RCS file: /cvsroot/squashfs/squashfs/squashfs-tools/unsquashfs.c,v -retrieving revision 1.120 -retrieving revision 1.121 -diff -u -p -r1.120 -r1.121 ---- squashfs-tools/unsquashfs.c 7 Mar 2010 03:16:46 -0000 1.120 -+++ squashfs-tools/unsquashfs.c 8 Mar 2010 01:30:17 -0000 1.121 -@@ -1871,12 +1871,17 @@ void update_progress_bar() - void progress_bar(long long current, long long max, int columns) - { - char rotate_list[] = { '|', '/', '-', '\\' }; -- int max_digits = floor(log10(max)) + 1; -- int used = max_digits * 2 + 11; -- int hashes = (current * (columns - used)) / max; -- int spaces = columns - used - hashes; -+ int max_digits, used, hashes, spaces; - static int tty = -1; - -+ if(max == 0) -+ return; -+ -+ max_digits = floor(log10(max)) + 1; -+ used = max_digits * 2 + 11; -+ hashes = (current * (columns - used)) / max; -+ spaces = columns - used - hashes; -+ - if((current > max) || (columns - used < 0)) - return; - diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.0-read-ret.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.0-read-ret.patch deleted file mode 100644 index f57d49c0eed5..000000000000 --- a/sys-fs/squashfs-tools/files/squashfs-tools-4.0-read-ret.patch +++ /dev/null @@ -1,23 +0,0 @@ -http://bugs.gentoo.org/292011 - -revision 1.21 -date: 2009/04/21 00:59:16; author: plougher; state: Exp; lines: +1 -1 -Fix return in read_fragment_table_4 - -Index: squashfs-tools/unsquash-4.c -=================================================================== -RCS file: /cvsroot/squashfs/squashfs/squashfs-tools/unsquash-4.c,v -retrieving revision 1.20 -retrieving revision 1.21 -diff -u -p -r1.20 -r1.21 ---- squashfs-tools/unsquash-4.c 31 Mar 2009 04:38:53 -0000 1.20 -+++ squashfs-tools/unsquash-4.c 21 Apr 2009 00:59:16 -0000 1.21 -@@ -38,7 +38,7 @@ int read_fragment_table_4() - sBlk.fragment_table_start); - - if(sBlk.fragments == 0) -- return; -+ return TRUE; - - if((fragment_table = malloc(sBlk.fragments * - sizeof(squashfs_fragment_entry))) == NULL) diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild index 81d1d2d7b806..a92dbb8be415 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild,v 1.6 2014/09/28 11:02:46 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild,v 1.7 2015/03/05 08:04:30 jer Exp $ EAPI=5 inherit eutils toolchain-funcs @@ -48,9 +48,3 @@ src_install() { dobin mksquashfs unsquashfs dodoc ../README } - -pkg_postinst() { - ewarn "This version of mksquashfs requires a 2.6.29 kernel or better" - use xz && - ewarn "XZ support requires a 2.6.38 kernel or better" -} -- 2.26.2