diff options
Diffstat (limited to 'sys-fs/hfsutils')
| -rw-r--r-- | sys-fs/hfsutils/Manifest | 3 | ||||
| -rw-r--r-- | sys-fs/hfsutils/files/hfsutils-3.2.6-test-tcl-8.6.patch | 62 | ||||
| -rw-r--r-- | sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild | 9 |
3 files changed, 73 insertions, 1 deletions
diff --git a/sys-fs/hfsutils/Manifest b/sys-fs/hfsutils/Manifest index 30f1734b0f02..79e08b69a2b3 100644 --- a/sys-fs/hfsutils/Manifest +++ b/sys-fs/hfsutils/Manifest @@ -1,6 +1,7 @@ AUX hfsutils-3.2.6-fix-tcl-8.6.patch 158 BLAKE2B bb12d05629bede97e0d0eedcf42cbabd3d4e5c682253002b726db1d33a72f70f4cade4a2cbfbde810ac0481419c6a1561e4a3e29a81e0b0f48152e4b3b9830c1 SHA512 7b9cb4cb04fad7c092e2061568ba804f0c7035160c6213d3b069deefab8789d624e4b51b39c8bc77a2504279c641b72fad92ceff0a3e2049dad3c9b65e0163fa +AUX hfsutils-3.2.6-test-tcl-8.6.patch 1651 BLAKE2B bc86ddce138beb81f3d70d43bc4c2fc4696543d70d4cc60ffc60598cafc4cd6573d9813ffd1443fd9bdedc3d99ba5fdbc4b3704d360b6cd9cd0672b4185770d6 SHA512 da19f521696bd837fd03b513f1439472cd2566a1992c92d03804f0aed794767a1b7ad97fa51f3e27488d22dfed5f3214a6270d778d1eb2853dd9f2fae86fb835 AUX largerthan2gb.patch 216 BLAKE2B d8f9edd367883df8ad1e88660f6f2e0d0d0654cfefe38da0b846ae136f141047b99c9251e9ef63e1fcb11bfc56f6ff739007a81d9cdf655e11270dfd7499db76 SHA512 f20e52f571995a0fc0b0e0a7b804717a1d501fbaecf80460cdbb69cbf2e956a2b8f33ec8c9fa637af2e857edc1d2565797d4a6f2c3ce2ace0359311ef8dc0882 DIST hfsutils_3.2.6-14.debian.tar.xz 6780 BLAKE2B 00474d328f5ec2614ec429052e6940b9eb10d04f433399f686ccc24d66ca1559e7ca45c4ab3ebe6386e02fc4de5ffd96242a7aa6f58d6032798d5536da912a61 SHA512 33d44f7b9094743031fc9315cf9380e158225ee2cd5af7a5ec7c55a2ae9af42e16f9cad3c667b153a1d3d9484d4ea773d34b88b78bfe9499df52a8b9d77defb2 DIST hfsutils_3.2.6.orig.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173 -EBUILD hfsutils-3.2.6_p14.ebuild 1393 BLAKE2B 6c0981a18fedd2c7c9ed27eed5e7b85dbbebb4639837bd976c0fb06580d1f4180b053d13810bd9e44c8bd65dc0ada48b8e45505ca4b029365f5f5a2e8f8791cd SHA512 bc5da1ce959572c8824f976f4cb309d1ba80b02f218e6a9a864f3a989230f9daf422283a018022d39a44eb1acc49860818e0fa690e2d453c972edc0e114bc2cd +EBUILD hfsutils-3.2.6_p14.ebuild 1590 BLAKE2B 8c208c89cf03fbafe7e5472d6dda27839c2c7b0069e0abc6c949363c505f60c9a26c7db99659a8da91d6451f85afece51d1e804215066338dfb500eaa81905c0 SHA512 29d951b1c231d5c941b86cd020ba92714799ce4e2ec5eb730211947f4efcc537e77b9364320b31fb67d3a8afac2c95e4d56e8812b5b2c11415b16da65e2a8076 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6-test-tcl-8.6.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6-test-tcl-8.6.patch new file mode 100644 index 000000000000..fc2a5542ce40 --- /dev/null +++ b/sys-fs/hfsutils/files/hfsutils-3.2.6-test-tcl-8.6.patch @@ -0,0 +1,62 @@ +Use Tcl_Free() for arguments allocated with Tcl_SplitList(). +Use Tcl_Alloc() for arguments passed to tcl to be freed by TCL_DYNAMIC. + +https://bugs.gentoo.org/757924 +--- a/tclhfs.c ++++ b/tclhfs.c +@@ -1313,7 +1313,7 @@ int cmd_hfs(ClientData clientData, Tcl_Interp *interp, + badblocks = ALLOCX(unsigned long, listc); + if (listc && badblocks == 0) + { +- free(listv); ++ Tcl_Free((char *) listv); + + interp->result = "out of memory"; + return TCL_ERROR; +@@ -1324,13 +1324,13 @@ int cmd_hfs(ClientData clientData, Tcl_Interp *interp, + if (Tcl_ExprLong(interp, listv[i], + (long *) &badblocks[i]) != TCL_OK) + { +- free(listv); ++ Tcl_Free((char *) listv); + FREE(badblocks); + return TCL_ERROR; + } + } + +- free(listv); ++ Tcl_Free((char *) listv); + + if (do_format(argv[2], partno, 0, argv[4], listc, badblocks) == -1) + { +--- a/tclhfs.c ++++ b/tclhfs.c +@@ -378,7 +378,7 @@ int file_cmd(ClientData clientData, Tcl_Interp *interp, + return TCL_ERROR; + } + +- mem = ALLOC(char, bytes + 1); ++ mem = Tcl_Alloc(bytes + 1); + if (mem == 0) + { + interp->result = "out of memory"; +--- a/tclhfs.c ++++ b/tclhfs.c +@@ -902,7 +902,7 @@ int vol_cmd(ClientData clientData, Tcl_Interp *interp, + } + + result = Tcl_Merge(listc, listv); +- free(listv); ++ Tcl_Free((char *)listv); + + Tcl_SetResult(interp, result, TCL_DYNAMIC); + } +@@ -1038,7 +1038,7 @@ int vol_cmd(ClientData clientData, Tcl_Interp *interp, + return TCL_ERROR; + + fargv = hfs_glob(vol, listc, listv, &fargc); +- free(listv); ++ Tcl_Free((char*)listv); + + if (fargv == 0) + { diff --git a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild index 663f0b115d7d..5df159088c92 100644 --- a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild +++ b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild @@ -24,11 +24,15 @@ RDEPEND=" ${DEPEND} " +# tests are enabled only with USE=tcl +RESTRICT="!tcl? ( test )" + # use tk requires tcl - bug #150437 REQUIRED_USE="tk? ( tcl )" PATCHES=( "${FILESDIR}"/largerthan2gb.patch "${FILESDIR}"/${P/_p*}-fix-tcl-8.6.patch + "${FILESDIR}"/${PN}-3.2.6-test-tcl-8.6.patch ) S=${WORKDIR}/${P/_p*} @@ -54,6 +58,11 @@ src_compile() { emake CC="$(tc-getCC)" -C hfsck } +src_test() { + # Tests reuse the same image name. Let's serialize. + emake check -j1 +} + src_install() { dodir /usr/bin /usr/lib /usr/share/man/man1 emake \ |