From 3560426bfc556f8462cd8ae726e14ca963186198 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sun, 16 Oct 2011 13:37:31 +0000 Subject: [PATCH] Stabilise latest on amd64 and x86. Drop overshadowed. Per bug #332417. Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64 --- app-admin/testdisk/ChangeLog | 8 +- app-admin/testdisk/Manifest | 45 +++--- ...testdisk-6.11-exif_bound_checking-v2.patch | 131 ------------------ .../testdisk/files/testdisk-6.8-jpeg.patch | 29 ---- app-admin/testdisk/testdisk-6.10.ebuild | 59 -------- app-admin/testdisk/testdisk-6.11-r1.ebuild | 62 --------- app-admin/testdisk/testdisk-6.11.3.ebuild | 63 --------- app-admin/testdisk/testdisk-6.12.ebuild | 45 +++--- app-admin/testdisk/testdisk-6.8-r1.ebuild | 63 --------- 9 files changed, 44 insertions(+), 461 deletions(-) delete mode 100644 app-admin/testdisk/files/testdisk-6.11-exif_bound_checking-v2.patch delete mode 100644 app-admin/testdisk/files/testdisk-6.8-jpeg.patch delete mode 100644 app-admin/testdisk/testdisk-6.10.ebuild delete mode 100644 app-admin/testdisk/testdisk-6.11-r1.ebuild delete mode 100644 app-admin/testdisk/testdisk-6.11.3.ebuild delete mode 100644 app-admin/testdisk/testdisk-6.8-r1.ebuild diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog index ec8b78772b33..98b77b244601 100644 --- a/app-admin/testdisk/ChangeLog +++ b/app-admin/testdisk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/testdisk # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.43 2011/07/21 18:12:26 c1pher Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.44 2011/10/16 13:37:31 scarabeus Exp $ + + 16 Oct 2011; Tomáš Chvátal -testdisk-6.8-r1.ebuild, + -files/testdisk-6.8-jpeg.patch, -testdisk-6.10.ebuild, + -testdisk-6.11-r1.ebuild, -testdisk-6.11.3.ebuild, + -files/testdisk-6.11-exif_bound_checking-v2.patch, testdisk-6.12.ebuild: + Stabilise latest on amd64 and x86. Drop overshadowed. Per bug #332417. 21 Jul 2011; Dane Smith testdisk-6.12.ebuild: QA: Fix configure sanity checks wrt bug 374009. Thanks Ian Abbott diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest index a728f785ee7d..d0d67afcda70 100644 --- a/app-admin/testdisk/Manifest +++ b/app-admin/testdisk/Manifest @@ -1,37 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 -AUX testdisk-6.11-exif_bound_checking-v2.patch 5379 RMD160 165ae6d65f885aa0996b113baceeedf290fa24b8 SHA1 48f20be4c7da37b5e6f6d859d1d59a3457bedf23 SHA256 6e31b22483aeabc8e8911825a8cc1fe04d594d8ad05ff43364c262ea44b36ef7 -AUX testdisk-6.8-jpeg.patch 906 RMD160 f7bd8d37075b56e9ecaf9d1229ac7158e903c903 SHA1 be62fb01f9e5f362175d504e128e9119f267e71f SHA256 d65b14f780b07d0f84cad44fd25d8f82ebf9b45ea0229b19c721cbdf53d7e1a8 -DIST testdisk-6.10.tar.bz2 1474157 RMD160 4280290ad49de525c59e92983256c7694541d622 SHA1 21104146148ab98ba2a5a757398336a2345eca36 SHA256 539e7ec274126a827dfa4df751d71d15e03cf66c3fa73aac8f552d486c779593 -DIST testdisk-6.11.3.tar.bz2 3460249 RMD160 4be84ba9de88f40329b2da49dae527dd6aa603fd SHA1 7ffb0528a9dbc4ecad662a998dd7cfa56df124a2 SHA256 203c2d39dea6e3a4b1a39c3f9d60fecf2f3525310da4c20ec854127892c950b9 -DIST testdisk-6.11.tar.bz2 1553183 RMD160 0021601688ec779debd0a225305845b42605aaf9 SHA1 6d25ceaed5a7f5e35466b0ad75a4bca104f66532 SHA256 1d49183063f811ab968658235252cfc3b623faa6188b8e4d6ff8c20e79564075 DIST testdisk-6.12.tar.bz2 554633 RMD160 f33a4aeb15124cd34e3d81b17e9b2c81561272f8 SHA1 ccb0e36dc338bb28e00491a6a7dab5ae2d3ac937 SHA256 bdfbe679146518a1321d64f512d6ec8980ac3a9f2296ef27a46c7743d0f9ea16 DIST testdisk-6.5.tar.bz2 628884 RMD160 df1778147b8b19719b90240b74674c3f438a9cac SHA1 b0c9db078588695879ca2dea55d24fec2d6d12b2 SHA256 dc898056087de5f453fadcba9770af76a1b0f0acff87b13adbb7c2d71b21c2ef -DIST testdisk-6.8-ntfsprogs2.patch.bz2 8751 RMD160 465a4b34f2f6f9f114c98011c07f15b7b8ab26fb SHA1 2405aaaed4bce405600046adf6e83dec6c4126a9 SHA256 6e30a089825b5271499be816de4b907bf62f790655c9c34bec49ddd9699d182a -DIST testdisk-6.8.tar.bz2 768698 RMD160 e9fd360e126cbce21c3a17711ea02dc33206cceb SHA1 7e461905fcd275edf019a87ac18bcb4401a2b379 SHA256 390a8c9d537105b8839e7dec60873b59c0a971f31be539c331f29be8d98cd833 -EBUILD testdisk-6.10.ebuild 2032 RMD160 5076bd0127c51cacb098f6478677c55fb048ceb6 SHA1 a41df6be14282434d9f6c010c2107fec7947631d SHA256 a5a6eab4221453e121ce6b4f650f007b8d33a1da0bd20b0aafdaec8562f653ea -EBUILD testdisk-6.11-r1.ebuild 2104 RMD160 0f81352a9de4894a3d5e16b7bb1823bd0a03a612 SHA1 51aa6ff1c66991a283fa4c634e60492a537fc2ff SHA256 d94ed38542084f1c15f093a9c2c50c16aae229cf6d3d9cdb63c20b23b07a4158 -EBUILD testdisk-6.11.3.ebuild 2124 RMD160 946864ae3ed1ffc95fbe80de4d73de3b58719b08 SHA1 1a8af09e86b1171a4bc160c8ea319560f31d5c09 SHA256 5e440783a942a69dfd444255b1bb817c7a29093d5bbd25dbc87e6b12ea96cc95 -EBUILD testdisk-6.12.ebuild 2169 RMD160 be60c15e1f34eb3c21fe6485e991c2f5ca744212 SHA1 587147e15ddef70a1663d3f944b91de3df328bbd SHA256 e50b70ac6109faa44bc67005d7a885c1d2d1cbe628f2784fd9c89d054eab1909 +EBUILD testdisk-6.12.ebuild 1892 RMD160 b7e85128d5ed758e0eef5ed2ea28ec235e62fe45 SHA1 f1c2c6b5f30c8ac64556b348f035f438e27f56a1 SHA256 1ab70fd70729e21b51a7d84ccd73571d72480a555ab294a0767f790fdf80ecb7 EBUILD testdisk-6.5.ebuild 1876 RMD160 6522bae95b6e3f4823e547c8aafc16f9e5c8e690 SHA1 f8f3c808e60d8174032b02a4fff3cf386d9886ff SHA256 7619c50c9a855f8204aeb280b20228b0c99607ec51e13a16b4a9347d6d31f3c4 -EBUILD testdisk-6.8-r1.ebuild 2085 RMD160 c9b9f2237293bb750b5d86b77cf4ee3ac44188f9 SHA1 85e33fa1ad287ca159e9f869bfc3cf7ee748ce3c SHA256 62f02d40aa49ae244b275dd485b2673fce8d3bdbdb5c5fc5ab50a897057bfec5 -MISC ChangeLog 7612 RMD160 eaed152d778b4af90c9943112b3f66ae36b7eff6 SHA1 ce731787a6981c7d04954431766f4a3f3ae607b3 SHA256 31873d0fb212606f59d748030d99f212c70c470ca495c0185325789ebb120dcf +MISC ChangeLog 7954 RMD160 0068859cba73cb1c547182f8c3efd6e317e191ec SHA1 5f37abb8d5599b7a7ecc8e9b76e0119d33478d0a SHA256 0af57442b50219fd1505316bef57fe352b58ac27d835e5a07e91e0b8c439e812 MISC metadata.xml 553 RMD160 f90665db935e735c1592a12100b645e13395b704 SHA1 4aa0bcef1ccd4f850fb830e40c6f81f7ade8b43d SHA256 109df2f0217ee40fae4245875a5d6820128378a15066cf5e4a422720cafba406 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCAAGBQJOKGvxAAoJEEsurZwMLhUxsAEP/3edf4YHagTvp1mEE4VmsNmF -fyBJrnwSuZoL7+qzsIN2cem7ShKpU7pKDvMw6IB6ukc7mt+MJIOgL8kzA2gAtX3S -P6dsgLylA+UNHJXrG0tJQameWkTzzUfPNMJ4ZJyZfejAe6JtlYSO8DqJ2/N7Fvt0 -24YiRZc5QsqoI3lN8bEkM7Uj1zjDA+xgx/eFKGmlQTUVSIcwZO69MJhypqPAn8/Z -F7gsvov0CgNpjEUqBSJtpyZAP0/uvBNYK+DxDhWwE48FLgEd7NqfMjmJquik/4Bz -RQtQpLGam6jei1b2xsMYbW4I78Ozz/BUyoNxMuY77b2ESlu5LTQ0Nu+flpQ7lwlS -FMp0fHuUf80KNQy3fJtt/YQfjEBGioIgIqocFGV0pNiVbc6VaHJT/ykvbfxPl0Yz -Y3R1F5IutD3acdbYwgBmZpWgZAuol029wbjYAdVebbndh9rGAV89TWI+DwCQNmeA -hraZ7boPKK6MtH4t2VcVSZ1VHMBbrUSbGXJdD9KemJZVj6JQhllcUEE1vflys3Am -t8PSbHIfWMkOHPqzwtu5qubvA1FWWiaCoPfVF0NNYS/Zqn/UZZfSx36+mekIRUVf -+/ncqCXFwHnvHwp32k6FJjLnyx8XyaZFaeK7uLtomS/+gfmGDIxYokUPucBosdsx -WXe3nUBB+ffchqltrLcv -=UdwM +iQIcBAEBAgAGBQJOmt3BAAoJEOSiRoyO7jvoeAwP+wTfTKUyBTSGd9N0w8jG85tK +I3VxhTrt5585U3r7kezEKVHZBoQCRCfN9nStaD1EeZe3xf07XgbKG4LOO4lNPi/V +eS/itZHjGfwCQiMRbIyzpoYzWkxQQY3+/635SHXal4ajCmq9Tcxohr+0CopVafwk +DYe4iqK7CneqxQBglp0AB8Ld4yddfqC9C+1IA6LdJzCsfmwVuTHo6hQYDkriEwGb +Q58QTkNNLYXtf2ZpdxhXxxAS3rtgvSZnw+qT2xq60Vqc4droRijamKTU0e3Kpl1A +ZMpltHjCSEb6t3pri0R31kksHHZYrHsiOtsFRmgGSSIFBtJzAXV+cKNo5thLsDeQ +k8W+1A/UusQn68MyZFoAkhXqeNiXuaKzolLCdN2QWZUyd2xg518WKmxFe97smZUN +t7h9fgtCQZ/Evnn60Xwx6ApUW4+MgqGDDiCatrOlsxFD+M1v0fiZrVVZwKPZ7FLr +E8UsCQKPzQ/pLgar7Ei1w3dL7hvvaCFszWiNV3NUtK0LiyH8IAE4seqXjEzKYFCb +E4ifZ5j9IvhubXNyLfhYqPKIciT+XR/wGHRMEKmdovysagnKMR4I5oUwJ5d47iaC +eH13IzINuE7X4Dr2rHdOnz2sC/xUMA2/bQz6FL8Qb6civaya+3FtAzh2rnzqHqDv +keH8QtpixzU9hLdX9wsD +=M//+ -----END PGP SIGNATURE----- diff --git a/app-admin/testdisk/files/testdisk-6.11-exif_bound_checking-v2.patch b/app-admin/testdisk/files/testdisk-6.11-exif_bound_checking-v2.patch deleted file mode 100644 index b0f5020999c3..000000000000 --- a/app-admin/testdisk/files/testdisk-6.11-exif_bound_checking-v2.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -ru testdisk-6.11/src/file_jpg.c testdisk-6.11.1/src/file_jpg.c ---- testdisk-6.11/src/file_jpg.c 2009-04-08 12:24:02.000000000 +0200 -+++ testdisk-6.11.1/src/file_jpg.c 2009-04-23 12:19:27.000000000 +0200 -@@ -100,14 +100,10 @@ - if(buffer[i]!=0xff) - return 0; - /* 0xe0 APP0 */ -+ /* 0xef APP15 */ - /* 0xfe COM */ - /* 0xdb DQT */ -- if(buffer[i+1]==0xe0 || -- buffer[i+1]==0xfe || -- buffer[i+1]==0xdb) -- { -- } -- else if(buffer[i+1]==0xe1) -+ if(buffer[i+1]==0xe1) - { /* APP1 Exif information */ - if(i+0x0A < buffer_size && 2+(buffer[i+2]<<8)+buffer[i+3] > 0x0A) - { -@@ -117,12 +113,17 @@ - file_recovery_new->time=get_date_from_tiff_header((const TIFFHeader*)&buffer[i+0x0A], tiff_size); - } - } -+ else if((buffer[i+1]>=0xe0 && buffer[i+1]<=0xef) || -+ buffer[i+1]==0xfe || -+ buffer[i+1]==0xdb) -+ { -+ } - else - { - reset_file_recovery(file_recovery_new); - file_recovery_new->extension=file_hint_jpg.extension; - file_recovery_new->file_check=&file_check_jpg; -- file_recovery_new->min_filesize=288; -+ file_recovery_new->min_filesize=(i>288?i:288); - file_recovery_new->data_check=&data_check_jpg; - file_recovery_new->calculated_file_size=2; - return 1; -@@ -511,7 +512,7 @@ - const unsigned int thumb_offset=thumb_data-(const char*)buffer; - const unsigned int thumb_size=ifbytecount-(const char*)tiff; - unsigned int j_old; -- if(thumb_offset+thumb_size < sizeof(buffer)) -+ if(thumb_offset < sizeof(buffer) && thumb_offset+thumb_size < sizeof(buffer)) - { - unsigned int j=thumb_offset+2; - unsigned int thumb_sos_found=0; -diff -ru testdisk-6.11/src/file_tiff.c testdisk-6.11.1/src/file_tiff.c ---- testdisk-6.11/src/file_tiff.c 2009-04-13 12:00:24.000000000 +0200 -+++ testdisk-6.11.1/src/file_tiff.c 2009-04-23 12:12:21.000000000 +0200 -@@ -65,6 +65,10 @@ - const uint32_t *tiff_next_diroff; - const TIFFDirEntry *ifd; - unsigned int j; -+ /* Bound checking */ -+ if((const char*)ifd0 < (const char*)tiff || -+ (const char*)(ifd0+1) > (const char*)tiff + tiff_size) -+ return NULL; - for(j=0, ifd=&ifd0->ifd; - (const char*)(ifd+1) <= (const char*)tiff+tiff_size && jnbr_fields); - j++, ifd++) -@@ -75,7 +79,9 @@ - exififd=(const struct ifd_header *)((const char*)tiff + be32(ifd->tdir_offset)); - } - tiff_next_diroff=(const uint32_t *)ifd; -- if(exififd!=NULL) -+ if(exififd!=NULL && -+ (const char*)exififd > (const char*)tiff && -+ (const char*)(exififd+1) <= (const char*)tiff + tiff_size) - { /* Exif */ - for(j=0, ifd=&exififd->ifd; - (const char*)(ifd+1) <= (const char*)tiff+tiff_size && jnbr_fields); -@@ -89,6 +95,9 @@ - if(be32(*tiff_next_diroff)>0) - { - const const struct ifd_header *ifd1=(const struct ifd_header*)((const char *)tiff+be32(*tiff_next_diroff)); -+ if((const char*)ifd1 <= (const char*)tiff || -+ (const char*)(ifd1+1) > (const char*)tiff+tiff_size) -+ return NULL; - for(j=0, ifd=&ifd1->ifd; - (const char*)(ifd+1) <= (const char*)tiff+tiff_size && jnbr_fields); - j++, ifd++) -@@ -107,6 +116,10 @@ - const uint32_t *tiff_next_diroff; - const TIFFDirEntry *ifd; - unsigned int j; -+ /* Bound checking */ -+ if((const char*)ifd0 < (const char*)tiff || -+ (const char*)(ifd0+1) > (const char*)tiff + tiff_size) -+ return NULL; - for(j=0, ifd=&ifd0->ifd; - (const char*)(ifd+1) <= (const char*)tiff+tiff_size && jnbr_fields); - j++, ifd++) -@@ -117,7 +130,9 @@ - exififd=(const struct ifd_header *)((const char*)tiff + le32(ifd->tdir_offset)); - } - tiff_next_diroff=(const uint32_t *)ifd; -- if(exififd!=NULL) -+ if(exififd!=NULL && -+ (const char*)exififd > (const char*)tiff && -+ (const char*)(exififd+1) <= (const char*)tiff + tiff_size) - { /* Exif */ - for(j=0, ifd=&exififd->ifd; - (const char*)(ifd+1) <= (const char*)tiff+tiff_size && jnbr_fields); -@@ -131,6 +146,10 @@ - if(le32(*tiff_next_diroff)>0) - { - const const struct ifd_header *ifd1=(const struct ifd_header*)((const char *)tiff+le32(*tiff_next_diroff)); -+ /* Bound checking */ -+ if((const char*)(ifd1) <= (const char*)tiff || -+ (const char*)(ifd1+1) > (const char*)tiff+tiff_size) -+ return NULL; - for(j=0, ifd=&ifd1->ifd; - (const char*)(ifd+1) <= (const char*)tiff+tiff_size && jnbr_fields); - j++, ifd++) -@@ -168,11 +187,11 @@ - /* DateTimeOriginal */ - date_asc=find_tag_from_tiff_header(tiff, tiff_size, 0x9003); - /* DateTimeDigitalized*/ -- if(date_asc==NULL || &date_asc[18] >= (const char *)tiff + tiff_size) -+ if(date_asc==NULL || date_asc < (const char *)tiff || &date_asc[18] >= (const char *)tiff + tiff_size) - date_asc=find_tag_from_tiff_header(tiff, tiff_size, 0x9004); -- if(date_asc==NULL || &date_asc[18] >= (const char *)tiff + tiff_size) -+ if(date_asc==NULL || date_asc < (const char *)tiff || &date_asc[18] >= (const char *)tiff + tiff_size) - date_asc=find_tag_from_tiff_header(tiff, tiff_size, 0x132); -- if(date_asc==NULL || &date_asc[18] >= (const char *)tiff + tiff_size) -+ if(date_asc==NULL || date_asc < (const char *)tiff || &date_asc[18] >= (const char *)tiff + tiff_size) - return (time_t)0; - memset(&tm_time, 0, sizeof(tm_time)); - tm_time.tm_sec=(date_asc[17]-'0')*10+(date_asc[18]-'0'); /* seconds 0-59 */ diff --git a/app-admin/testdisk/files/testdisk-6.8-jpeg.patch b/app-admin/testdisk/files/testdisk-6.8-jpeg.patch deleted file mode 100644 index b2dab00de138..000000000000 --- a/app-admin/testdisk/files/testdisk-6.8-jpeg.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- testdisk-6.8/src/file_jpg.c 2007-07-17 23:44:07.000000000 +0200 -+++ testdisk-6.8.new/src/file_jpg.c 2007-12-23 13:39:56.000000000 +0100 - -@@ -394,18 +393,18 @@ - (void) jpeg_read_scanlines(&cinfo, buffer, 1); - } - (void) jpeg_finish_decompress(&cinfo); -- jpeg_destroy_decompress(&cinfo); -- } --#endif -- /* Not accurate */ --// jpeg_size=ftell(infile); --// log_error("JPG offset %llu\n", (long long unsigned)jpeg_size); - { - my_source_mgr * src; - src = (my_source_mgr *) cinfo.src; - jpeg_size=src->file_size - src->pub.bytes_in_buffer; --// log_error("JPG size: %llu\n", (long long unsigned)jpeg_size); - } -+ jpeg_destroy_decompress(&cinfo); -+ } -+#else -+ /* Not accurate */ -+ jpeg_size=ftell(infile); -+#endif -+// log_error("JPG size: %llu\n", (long long unsigned)jpeg_size); - if(jpeg_size<=0) - return; - #if defined(HAVE_LIBJPEG) && defined(HAVE_JPEGLIB_H) diff --git a/app-admin/testdisk/testdisk-6.10.ebuild b/app-admin/testdisk/testdisk-6.10.ebuild deleted file mode 100644 index 0ec620677345..000000000000 --- a/app-admin/testdisk/testdisk-6.10.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.10.ebuild,v 1.3 2011/07/08 10:16:50 ssuominen Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool" -HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk" -SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2" -#SRC_URI="http://www.cgsecurity.org/${P}-WIP.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="static reiserfs ntfs jpeg" -# WARNING: reiserfs support does NOT work with reiserfsprogs -# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released). -DEPEND=">=sys-libs/ncurses-5.2 - jpeg? ( virtual/jpeg ) - ntfs? ( >=sys-fs/ntfsprogs-2.0.0 ) - reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) - >=sys-fs/e2fsprogs-1.35 - sys-libs/zlib" -RDEPEND="!static? ( ${DEPEND} )" - -#S=${WORKDIR}/${P}-WIP - -src_compile() { - local myconf="--without-ewf --enable-sudo" - # --with-foo are broken, any use of --with/--without disable the - # functionality. - # The following variation must be used. - use reiserfs || myconf="${myconf} --without-reiserfs" - use ntfs || myconf="${myconf} --without-ntfs" - use jpeg || myconf="${myconf} --without-jpeg" - - # this is static method is the same used by upstream for their 'static' make - # target, but better, as it doesn't break. - use static && append-ldflags -static - - econf ${myconf} || die - - # perform safety checks for NTFS and REISERFS - if use ntfs && egrep -q 'undef HAVE_LIBNTFS\>' "${S}"/config.h ; then - die "Failed to find NTFS library." - fi - if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then - die "Failed to find reiserfs library." - fi - if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then - die "Failed to find jpeg library." - fi - - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die - [ "$PF" != "$P" ] && mv "${D}"/usr/share/doc/${P} "${D}"/usr/share/doc/${PF} -} diff --git a/app-admin/testdisk/testdisk-6.11-r1.ebuild b/app-admin/testdisk/testdisk-6.11-r1.ebuild deleted file mode 100644 index 2851d9ffd437..000000000000 --- a/app-admin/testdisk/testdisk-6.11-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.11-r1.ebuild,v 1.4 2011/07/08 10:16:50 ssuominen Exp $ - -EAPI=2 -inherit eutils flag-o-matic - -DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool" -HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk" -SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2" -#SRC_URI="http://www.cgsecurity.org/${P}-WIP.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="static reiserfs ntfs jpeg" -# WARNING: reiserfs support does NOT work with reiserfsprogs -# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released). -DEPEND=">=sys-libs/ncurses-5.2 - jpeg? ( virtual/jpeg ) - ntfs? ( >=sys-fs/ntfsprogs-2.0.0 ) - reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) - >=sys-fs/e2fsprogs-1.35 - sys-libs/zlib" -RDEPEND="!static? ( ${DEPEND} )" - -#S=${WORKDIR}/${P}-WIP - -src_prepare() { - epatch "${FILESDIR}"/${P}-exif_bound_checking-v2.patch -} - -src_configure() { - local myconf="--without-ewf --enable-sudo" - # --with-foo are broken, any use of --with/--without disable the - # functionality. - # The following variation must be used. - use reiserfs || myconf="${myconf} --without-reiserfs" - use ntfs || myconf="${myconf} --without-ntfs" - use jpeg || myconf="${myconf} --without-jpeg" - - # this is static method is the same used by upstream for their 'static' make - # target, but better, as it doesn't break. - use static && append-ldflags -static - - econf ${myconf} || die - - # perform safety checks for NTFS and REISERFS - if use ntfs && egrep -q 'undef HAVE_LIBNTFS\>' "${S}"/config.h ; then - die "Failed to find NTFS library." - fi - if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then - die "Failed to find reiserfs library." - fi - if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then - die "Failed to find jpeg library." - fi -} - -src_install() { - emake DESTDIR="${D}" install || die - [ "$PF" != "$P" ] && mv "${D}"/usr/share/doc/${P} "${D}"/usr/share/doc/${PF} -} diff --git a/app-admin/testdisk/testdisk-6.11.3.ebuild b/app-admin/testdisk/testdisk-6.11.3.ebuild deleted file mode 100644 index 8cf639a15930..000000000000 --- a/app-admin/testdisk/testdisk-6.11.3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.11.3.ebuild,v 1.3 2011/07/08 10:16:50 ssuominen Exp $ - -EAPI=2 -inherit eutils flag-o-matic - -DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool" -HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk" -SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2" -#SRC_URI="http://www.cgsecurity.org/${P}-WIP.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="static reiserfs ntfs jpeg" -# WARNING: reiserfs support does NOT work with reiserfsprogs -# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released). -DEPEND=">=sys-libs/ncurses-5.2 - jpeg? ( virtual/jpeg ) - ntfs? ( >=sys-fs/ntfsprogs-2.0.0 ) - reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) - >=sys-fs/e2fsprogs-1.35 - sys-libs/zlib" -RDEPEND="!static? ( ${DEPEND} )" - -#S=${WORKDIR}/${P}-WIP - -# merged upstream -#src_prepare() { -# epatch "${FILESDIR}"/${P}-exif_bound_checking-v2.patch -#} - -src_configure() { - local myconf="--without-ewf --enable-sudo" - # --with-foo are broken, any use of --with/--without disable the - # functionality. - # The following variation must be used. - use reiserfs || myconf="${myconf} --without-reiserfs" - use ntfs || myconf="${myconf} --without-ntfs" - use jpeg || myconf="${myconf} --without-jpeg" - - # this is static method is the same used by upstream for their 'static' make - # target, but better, as it doesn't break. - use static && append-ldflags -static - - econf ${myconf} || die - - # perform safety checks for NTFS and REISERFS - if use ntfs && egrep -q 'undef HAVE_LIBNTFS\>' "${S}"/config.h ; then - die "Failed to find NTFS library." - fi - if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then - die "Failed to find reiserfs library." - fi - if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then - die "Failed to find jpeg library." - fi -} - -src_install() { - emake DESTDIR="${D}" install || die - [ "$PF" != "$P" ] && mv "${D}"/usr/share/doc/${P} "${D}"/usr/share/doc/${PF} -} diff --git a/app-admin/testdisk/testdisk-6.12.ebuild b/app-admin/testdisk/testdisk-6.12.ebuild index 6f5f74ae9783..65a5217d35e0 100644 --- a/app-admin/testdisk/testdisk-6.12.ebuild +++ b/app-admin/testdisk/testdisk-6.12.ebuild @@ -1,18 +1,20 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.12.ebuild,v 1.3 2011/07/21 18:12:26 c1pher Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.12.ebuild,v 1.4 2011/10/16 13:37:31 scarabeus Exp $ + +EAPI=4 -EAPI=2 inherit eutils flag-o-matic DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool" HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk" SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2" -#SRC_URI="http://www.cgsecurity.org/${P}-WIP.tar.bz2" + LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="static reiserfs ntfs jpeg" + # WARNING: reiserfs support does NOT work with reiserfsprogs # you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released). DEPEND=">=sys-libs/ncurses-5.2 @@ -23,29 +25,27 @@ DEPEND=">=sys-libs/ncurses-5.2 sys-libs/zlib" RDEPEND="!static? ( ${DEPEND} )" -#S=${WORKDIR}/${P}-WIP - -# merged upstream -#src_prepare() { -# epatch "${FILESDIR}"/${P}-exif_bound_checking-v2.patch -#} - src_configure() { - local myconf="--without-ewf --enable-sudo" - # --with-foo are broken, any use of --with/--without disable the - # functionality. - # The following variation must be used. - use reiserfs || myconf="${myconf} --without-reiserfs" - use ntfs || myconf="${myconf} --without-ntfs" - use jpeg || myconf="${myconf} --without-jpeg" + local myconf # this is static method is the same used by upstream for their 'static' make # target, but better, as it doesn't break. use static && append-ldflags -static - econf ${myconf} || die + # --with-foo are broken, any use of --with/--without disable the + # functionality. + # The following variation must be used. + use reiserfs || myconf+=" --without-reiserfs" + use ntfs || myconf+=" --without-ntfs" + use jpeg || myconf+=" --without-jpeg" - # perform safety checks for NTFS and REISERFS + econf \ + --docdir="${ED}/usr/share/doc/${PF}" \ + --without-ewf \ + --enable-sudo \ + ${myconf} + + # perform safety checks for NTFS, REISERFS and JPEG if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then die "Failed to find either NTFS or NTFS-3G library." fi @@ -56,8 +56,3 @@ src_configure() { die "Failed to find jpeg library." fi } - -src_install() { - emake DESTDIR="${D}" install || die - [ "$PF" != "$P" ] && mv "${D}"/usr/share/doc/${P} "${D}"/usr/share/doc/${PF} -} diff --git a/app-admin/testdisk/testdisk-6.8-r1.ebuild b/app-admin/testdisk/testdisk-6.8-r1.ebuild deleted file mode 100644 index fcce14192167..000000000000 --- a/app-admin/testdisk/testdisk-6.8-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.8-r1.ebuild,v 1.7 2011/07/08 10:16:50 ssuominen Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool" -HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk" -SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2 - mirror://gentoo/${P}-ntfsprogs2.patch.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="static reiserfs ntfs jpeg" -# WARNING: reiserfs support does NOT work with reiserfsprogs -# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released). -DEPEND=">=sys-libs/ncurses-5.2 - jpeg? ( virtual/jpeg ) - ntfs? ( >=sys-fs/ntfsprogs-2.0.0 ) - reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) - >=sys-fs/e2fsprogs-1.35" -RDEPEND="!static? ( ${DEPEND} )" - -src_unpack() { - unpack ${A} - - epatch "${DISTDIR}"/${P}-ntfsprogs2.patch.bz2 - epatch "${FILESDIR}"/${P}-jpeg.patch -} - -src_compile() { - local myconf="--without-ewf" - # --with-foo are broken, any use of --with/--without disable the - # functionality. - # The following variation must be used. - use reiserfs || myconf="${myconf} --without-reiserfs" - use ntfs || myconf="${myconf} --without-ntfs" - use jpeg || myconf="${myconf} --without-jpeg" - - # this is static method is the same used by upstream for their 'static' make - # target, but better, as it doesn't break. - use static && append-ldflags -static - - econf ${myconf} || die - - # perform safety checks for NTFS and REISERFS - if use ntfs && egrep -q 'undef HAVE_LIBNTFS\>' "${S}"/config.h ; then - die "Failed to find NTFS library." - fi - if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then - die "Failed to find reiserfs library." - fi - if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then - die "Failed to find jpeg library." - fi - - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die - [ "$PF" != "$P" ] && mv "${D}"/usr/share/doc/${P} "${D}"/usr/share/doc/${PF} -} -- 2.26.2