From 6031bf43008b29604a4fbeb7c4c0a4840487ad62 Mon Sep 17 00:00:00 2001 From: landry <landry@openbsd.org> Date: Sun, 21 Mar 2010 12:13:08 +0000 Subject: [PATCH] Update to testdisk 6.11.3, which adds as a security fix a missing boundary check in EXIF processing. Prompted by a diff from Vadim Zhukov, thanks! --- sysutils/testdisk/Makefile | 4 +- sysutils/testdisk/distinfo | 10 ++--- sysutils/testdisk/pkg/PLIST | 88 ++++++++++++++++++++++++++++++------- 3 files changed, 78 insertions(+), 24 deletions(-) diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile index 6552c09d329..564d63c0866 100644 --- a/sysutils/testdisk/Makefile +++ b/sysutils/testdisk/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2009/07/15 13:45:17 landry Exp $ +# $OpenBSD: Makefile,v 1.4 2010/03/21 12:13:08 landry Exp $ COMMENT = data recovery software -VERSION = 6.11 +VERSION = 6.11.3 DISTNAME = testdisk-${VERSION} CATEGORIES = sysutils diff --git a/sysutils/testdisk/distinfo b/sysutils/testdisk/distinfo index dd3b491d757..881507927a7 100644 --- a/sysutils/testdisk/distinfo +++ b/sysutils/testdisk/distinfo @@ -1,5 +1,5 @@ -MD5 (testdisk-6.11.tar.bz2) = Efj+ldzRkLabeC76ZbKboQ== -RMD160 (testdisk-6.11.tar.bz2) = ACFgFojsd53r0KIlMFhFtCYFqvk= -SHA1 (testdisk-6.11.tar.bz2) = bSXOrtWn9eNUZrCtdaS8oQT2ZTI= -SHA256 (testdisk-6.11.tar.bz2) = HUkYMGP4EauWhlgjUlLPw7Yj+qYYi45Nb/jCDnlWQHU= -SIZE (testdisk-6.11.tar.bz2) = 1553183 +MD5 (testdisk-6.11.3.tar.bz2) = zu44SoYT2Pf//1zPo/ulEA== +RMD160 (testdisk-6.11.3.tar.bz2) = S+hLqd6I9AMpstpJ2uUn3WqmA/0= +SHA1 (testdisk-6.11.3.tar.bz2) = f/sFKKnbxOytZiqZjdfPpW3xJKI= +SHA256 (testdisk-6.11.3.tar.bz2) = IDwtOd6m46Sxo5w/nWD+zy81JTENpMIOyFQSeJLJULk= +SIZE (testdisk-6.11.3.tar.bz2) = 3460249 diff --git a/sysutils/testdisk/pkg/PLIST b/sysutils/testdisk/pkg/PLIST index d81b8933852..560b13204f5 100644 --- a/sysutils/testdisk/pkg/PLIST +++ b/sysutils/testdisk/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2009/07/15 13:45:17 landry Exp $ +@comment $OpenBSD: PLIST,v 1.3 2010/03/21 12:13:08 landry Exp $ @man man/man1/photorec.1 @man man/man1/testdisk.1 @bin sbin/photorec @@ -10,6 +10,8 @@ share/doc/testdisk-${VERSION}/NEWS share/doc/testdisk-${VERSION}/README share/doc/testdisk-${VERSION}/THANKS share/doc/testdisk-${VERSION}/html/ +share/doc/testdisk-${VERSION}/html/1.html +share/doc/testdisk-${VERSION}/html/2.html share/doc/testdisk-${VERSION}/html/20071113081925_analyse.gif share/doc/testdisk-${VERSION}/html/20071113082557_search_menu.gif share/doc/testdisk-${VERSION}/html/20080103231020_photorec_options.png @@ -17,6 +19,20 @@ share/doc/testdisk-${VERSION}/html/30px_damaged_file_system.gif share/doc/testdisk-${VERSION}/html/32px_package.png share/doc/testdisk-${VERSION}/html/70px_damaged_file_system.gif share/doc/testdisk-${VERSION}/html/70px_quick_search.gif +share/doc/testdisk-${VERSION}/html/800px_ext2_select_advanced.png +share/doc/testdisk-${VERSION}/html/800px_ext2_select_undelete.png +share/doc/testdisk-${VERSION}/html/800px_ext2_undelete_copy.png +share/doc/testdisk-${VERSION}/html/800px_ext2_undelete_done.png +share/doc/testdisk-${VERSION}/html/800px_ext2_undelete_select_file.png +share/doc/testdisk-${VERSION}/html/800px_fat_select_advanced.png +share/doc/testdisk-${VERSION}/html/800px_fat_select_undelete.png +share/doc/testdisk-${VERSION}/html/800px_fat_undelete_done.png +share/doc/testdisk-${VERSION}/html/800px_fat_undelete_select_file.png +share/doc/testdisk-${VERSION}/html/800px_ntfs_select_advanced.png +share/doc/testdisk-${VERSION}/html/800px_ntfs_select_undelete.png +share/doc/testdisk-${VERSION}/html/800px_ntfs_undelete_copy.png +share/doc/testdisk-${VERSION}/html/800px_ntfs_undelete_done.png +share/doc/testdisk-${VERSION}/html/800px_ntfs_undelete_select_file.png share/doc/testdisk-${VERSION}/html/Common.css share/doc/testdisk-${VERSION}/html/Monobook.css share/doc/testdisk-${VERSION}/html/_intel.html @@ -27,18 +43,16 @@ share/doc/testdisk-${VERSION}/html/advanced_ntfs_boot_and_mft_repair.html share/doc/testdisk-${VERSION}/html/after_backup_bs.gif share/doc/testdisk-${VERSION}/html/after_using_photorec.html share/doc/testdisk-${VERSION}/html/after_using_testdisk.html -share/doc/testdisk-${VERSION}/html/ajax.js share/doc/testdisk-${VERSION}/html/analyse.gif share/doc/testdisk-${VERSION}/html/aplicaci_n_goback.html +share/doc/testdisk-${VERSION}/html/apres_l_utilisation_de_photorec.html share/doc/testdisk-${VERSION}/html/apres_utilisation_de_testdisk.html -share/doc/testdisk-${VERSION}/html/audio.png share/doc/testdisk-${VERSION}/html/ausfehren_von_skript.html share/doc/testdisk-${VERSION}/html/ausfehren_von_testdisk.html share/doc/testdisk-${VERSION}/html/ausfehrliches_wiederherstellungsbeispiel.html share/doc/testdisk-${VERSION}/html/backup_bs.gif share/doc/testdisk-${VERSION}/html/beschadigte_festplatte.html share/doc/testdisk-${VERSION}/html/boot_sector.gif -share/doc/testdisk-${VERSION}/html/bullet.gif share/doc/testdisk-${VERSION}/html/busqueda_avanzada_del_superblock_de_backup_ext2_ext3.html share/doc/testdisk-${VERSION}/html/c_mo_ayudar.html share/doc/testdisk-${VERSION}/html/cdrw.html @@ -47,6 +61,7 @@ share/doc/testdisk-${VERSION}/html/cdrw_es.html share/doc/testdisk-${VERSION}/html/cdrw_fr.html share/doc/testdisk-${VERSION}/html/comment_aider.html share/doc/testdisk-${VERSION}/html/commentaider.html +share/doc/testdisk-${VERSION}/html/commonprint.css_164.css share/doc/testdisk-${VERSION}/html/commonprint.css_97.css share/doc/testdisk-${VERSION}/html/compilar_dos.html share/doc/testdisk-${VERSION}/html/compilar_linux.html @@ -60,6 +75,7 @@ share/doc/testdisk-${VERSION}/html/compile_dos.html share/doc/testdisk-${VERSION}/html/compile_linux.html share/doc/testdisk-${VERSION}/html/compile_mac_os_x.html share/doc/testdisk-${VERSION}/html/compile_win.html +share/doc/testdisk-${VERSION}/html/create_a_testdisk_freedos_livecd.html share/doc/testdisk-${VERSION}/html/create_log.gif share/doc/testdisk-${VERSION}/html/current_limitations.html share/doc/testdisk-${VERSION}/html/damaged_file_system.gif @@ -72,16 +88,18 @@ share/doc/testdisk-${VERSION}/html/de.png share/doc/testdisk-${VERSION}/html/digital_photos_recovery_using_photorec.html share/doc/testdisk-${VERSION}/html/discos_r_gidos_danificados.html share/doc/testdisk-${VERSION}/html/discos_rigidos_rotos.html -share/doc/testdisk-${VERSION}/html/discussionitem_icon.gif share/doc/testdisk-${VERSION}/html/disque_dur_endommage.html share/doc/testdisk-${VERSION}/html/disquette_de_boot_dos.html -share/doc/testdisk-${VERSION}/html/document.png +share/doc/testdisk-${VERSION}/html/donaci_n.html share/doc/testdisk-${VERSION}/html/donation.html +share/doc/testdisk-${VERSION}/html/donazione.html share/doc/testdisk-${VERSION}/html/dos.png share/doc/testdisk-${VERSION}/html/dos_bootdisk.html share/doc/testdisk-${VERSION}/html/dos_bootdiskette.html share/doc/testdisk-${VERSION}/html/dos_kompilieren.html +share/doc/testdisk-${VERSION}/html/download_testdisk.html share/doc/testdisk-${VERSION}/html/dyn.css +share/doc/testdisk-${VERSION}/html/eine_testdisk_freedos_livecd_erstellen.html share/doc/testdisk-${VERSION}/html/ejecuci_n_con_scripts.html share/doc/testdisk-${VERSION}/html/ejecucion_con_scripts.html share/doc/testdisk-${VERSION}/html/ejecutando_testdisk.html @@ -95,40 +113,68 @@ share/doc/testdisk-${VERSION}/html/es.png share/doc/testdisk-${VERSION}/html/executer_testdisk.html share/doc/testdisk-${VERSION}/html/execution_automatisee.html share/doc/testdisk-${VERSION}/html/exemples_de_restauration.html +share/doc/testdisk-${VERSION}/html/ext2_select_advanced.png +share/doc/testdisk-${VERSION}/html/ext2_select_undelete.png +share/doc/testdisk-${VERSION}/html/ext2_undelete_copy.png +share/doc/testdisk-${VERSION}/html/ext2_undelete_done.png +share/doc/testdisk-${VERSION}/html/ext2_undelete_select_file.png share/doc/testdisk-${VERSION}/html/ext3_superblocks_finden.html share/doc/testdisk-${VERSION}/html/external.png +share/doc/testdisk-${VERSION}/html/fat_select_advanced.png +share/doc/testdisk-${VERSION}/html/fat_select_undelete.png +share/doc/testdisk-${VERSION}/html/fat_undelete_copy.png +share/doc/testdisk-${VERSION}/html/fat_undelete_done.png +share/doc/testdisk-${VERSION}/html/fat_undelete_select_file.png +share/doc/testdisk-${VERSION}/html/favicon.ico share/doc/testdisk-${VERSION}/html/fdisk_de_microsoft.html share/doc/testdisk-${VERSION}/html/file_formats_recovered_by_photorec.html -share/doc/testdisk-${VERSION}/html/file_icon.gif share/doc/testdisk-${VERSION}/html/first_results.gif share/doc/testdisk-${VERSION}/html/formats_de_fichier_recuperes_par_photorec.html share/doc/testdisk-${VERSION}/html/fr.png +share/doc/testdisk-${VERSION}/html/function.imagepng.html share/doc/testdisk-${VERSION}/html/gegenwartige_einschrankungen.html share/doc/testdisk-${VERSION}/html/geometry.gif share/doc/testdisk-${VERSION}/html/gnu_fdl.png share/doc/testdisk-${VERSION}/html/goback.html share/doc/testdisk-${VERSION}/html/goback_de.html share/doc/testdisk-${VERSION}/html/goback_fr.html -share/doc/testdisk-${VERSION}/html/headbg.jpg share/doc/testdisk-${VERSION}/html/hinweise_und_tipps.html share/doc/testdisk-${VERSION}/html/howtohelp.html +share/doc/testdisk-${VERSION}/html/ie50fixes.css_164.css share/doc/testdisk-${VERSION}/html/ie50fixes.css_97.css +share/doc/testdisk-${VERSION}/html/ie55fixes.css_164.css share/doc/testdisk-${VERSION}/html/ie55fixes.css_97.css +share/doc/testdisk-${VERSION}/html/ie60fixes.css_164.css share/doc/testdisk-${VERSION}/html/ie60fixes.css_97.css +share/doc/testdisk-${VERSION}/html/ie70fixes.css_164.css share/doc/testdisk-${VERSION}/html/ie70fixes.css_97.css -share/doc/testdisk-${VERSION}/html/iefixes.js share/doc/testdisk-${VERSION}/html/image_after_backup_bs.gif.html share/doc/testdisk-${VERSION}/html/image_analyse.gif.html share/doc/testdisk-${VERSION}/html/image_backup_bs.gif.html share/doc/testdisk-${VERSION}/html/image_boot_sector.gif.html share/doc/testdisk-${VERSION}/html/image_create_log.gif.html share/doc/testdisk-${VERSION}/html/image_damaged_file_system.gif.html +share/doc/testdisk-${VERSION}/html/image_ext2_select_advanced.png.html +share/doc/testdisk-${VERSION}/html/image_ext2_select_undelete.png.html +share/doc/testdisk-${VERSION}/html/image_ext2_undelete_copy.png.html +share/doc/testdisk-${VERSION}/html/image_ext2_undelete_done.png.html +share/doc/testdisk-${VERSION}/html/image_ext2_undelete_select_file.png.html +share/doc/testdisk-${VERSION}/html/image_fat_select_advanced.png.html +share/doc/testdisk-${VERSION}/html/image_fat_select_undelete.png.html +share/doc/testdisk-${VERSION}/html/image_fat_undelete_copy.png.html +share/doc/testdisk-${VERSION}/html/image_fat_undelete_done.png.html +share/doc/testdisk-${VERSION}/html/image_fat_undelete_select_file.png.html share/doc/testdisk-${VERSION}/html/image_first_results.gif.html share/doc/testdisk-${VERSION}/html/image_geometry.gif.html share/doc/testdisk-${VERSION}/html/image_list_files.gif.html share/doc/testdisk-${VERSION}/html/image_menu_write.gif.html share/doc/testdisk-${VERSION}/html/image_menus.gif.html share/doc/testdisk-${VERSION}/html/image_no_partition.gif.html +share/doc/testdisk-${VERSION}/html/image_ntfs_select_advanced.png.html +share/doc/testdisk-${VERSION}/html/image_ntfs_select_undelete.png.html +share/doc/testdisk-${VERSION}/html/image_ntfs_undelete_copy.png.html +share/doc/testdisk-${VERSION}/html/image_ntfs_undelete_done.png.html +share/doc/testdisk-${VERSION}/html/image_ntfs_undelete_select_file.png.html share/doc/testdisk-${VERSION}/html/image_package.png.html share/doc/testdisk-${VERSION}/html/image_partition_table_type.gif.html share/doc/testdisk-${VERSION}/html/image_photorec_dst.png.html @@ -155,6 +201,7 @@ share/doc/testdisk-${VERSION}/html/in_the_news.html share/doc/testdisk-${VERSION}/html/intel_partition_table.html share/doc/testdisk-${VERSION}/html/intel_partitionstabelle.html share/doc/testdisk-${VERSION}/html/it.png +share/doc/testdisk-${VERSION}/html/l_equipe_de_testdisk.html share/doc/testdisk-${VERSION}/html/limitaciones_actuales.html share/doc/testdisk-${VERSION}/html/limitations_courantes.html share/doc/testdisk-${VERSION}/html/linux.png @@ -162,17 +209,13 @@ share/doc/testdisk-${VERSION}/html/linux_a_ppc_darwin_cross_compiler.html share/doc/testdisk-${VERSION}/html/linux_bootdisk.html share/doc/testdisk-${VERSION}/html/linux_bootdiskette.html share/doc/testdisk-${VERSION}/html/linux_kompilieren.html -share/doc/testdisk-${VERSION}/html/linux_kompilieren1.html share/doc/testdisk-${VERSION}/html/linux_to_ppc_darwin_cross_compiler.html share/doc/testdisk-${VERSION}/html/linux_zu_ppc_darwin_kreuz_compiler.html share/doc/testdisk-${VERSION}/html/list_files.gif -share/doc/testdisk-${VERSION}/html/lock_icon.gif share/doc/testdisk-${VERSION}/html/logo.png share/doc/testdisk-${VERSION}/html/luego_de_usar_testdisk.html share/doc/testdisk-${VERSION}/html/mac_os_x_kompilieren.html share/doc/testdisk-${VERSION}/html/macosx.png -share/doc/testdisk-${VERSION}/html/mail_icon.gif -share/doc/testdisk-${VERSION}/html/main.css share/doc/testdisk-${VERSION}/html/media_image.html share/doc/testdisk-${VERSION}/html/media_image_fr.html share/doc/testdisk-${VERSION}/html/mene_analyse.html @@ -206,10 +249,14 @@ share/doc/testdisk-${VERSION}/html/monitoreo_smart.html share/doc/testdisk-${VERSION}/html/monitoring_smart_fr.html share/doc/testdisk-${VERSION}/html/nach_dem_gebrauch_von_photorec.html share/doc/testdisk-${VERSION}/html/nach_dem_gebrauch_von_testdisk.html -share/doc/testdisk-${VERSION}/html/news_icon.png share/doc/testdisk-${VERSION}/html/no_partition.gif share/doc/testdisk-${VERSION}/html/notas_so.html share/doc/testdisk-${VERSION}/html/notes_specifiques_os.html +share/doc/testdisk-${VERSION}/html/ntfs_select_advanced.png +share/doc/testdisk-${VERSION}/html/ntfs_select_undelete.png +share/doc/testdisk-${VERSION}/html/ntfs_undelete_copy.png +share/doc/testdisk-${VERSION}/html/ntfs_undelete_done.png +share/doc/testdisk-${VERSION}/html/ntfs_undelete_select_file.png share/doc/testdisk-${VERSION}/html/opensearch_desc.xml share/doc/testdisk-${VERSION}/html/os2.png share/doc/testdisk-${VERSION}/html/os_notes.html @@ -244,6 +291,7 @@ share/doc/testdisk-${VERSION}/html/pt.png share/doc/testdisk-${VERSION}/html/quick_search.gif share/doc/testdisk-${VERSION}/html/reboot.gif share/doc/testdisk-${VERSION}/html/reconna_tre_les_partitions_primaires_et_logiques.html +share/doc/testdisk-${VERSION}/html/recuperation_des_photos_numeriques_avec_photorec.html share/doc/testdisk-${VERSION}/html/reiserfs_datei_wiederherstellung_kurzanleitung.html share/doc/testdisk-${VERSION}/html/reiserfs_file_undelete_howto.html share/doc/testdisk-${VERSION}/html/reiserfs_howto_de_recuperacion_de_archivos.html @@ -263,6 +311,7 @@ share/doc/testdisk-${VERSION}/html/scripted_run.html share/doc/testdisk-${VERSION}/html/search_menu.gif share/doc/testdisk-${VERSION}/html/select_disk_update.gif share/doc/testdisk-${VERSION}/html/set_partition_to_recover.gif +share/doc/testdisk-${VERSION}/html/shared.css_164.css share/doc/testdisk-${VERSION}/html/shared.css_97.css share/doc/testdisk-${VERSION}/html/smart_monitoring.html share/doc/testdisk-${VERSION}/html/smart_monitoring_de.html @@ -278,6 +327,7 @@ share/doc/testdisk-${VERSION}/html/template_infobox_testdisk.html share/doc/testdisk-${VERSION}/html/testdisk.html share/doc/testdisk-${VERSION}/html/testdisk1.html share/doc/testdisk-${VERSION}/html/testdisk_6.10_release.html +share/doc/testdisk-${VERSION}/html/testdisk_6.11_release.html share/doc/testdisk-${VERSION}/html/testdisk_6.4_release.html share/doc/testdisk-${VERSION}/html/testdisk_6.5_release.html share/doc/testdisk-${VERSION}/html/testdisk_6.6_release.html @@ -294,27 +344,31 @@ share/doc/testdisk-${VERSION}/html/testdisk_es.html share/doc/testdisk-${VERSION}/html/testdisk_etape_par_etape.html share/doc/testdisk-${VERSION}/html/testdisk_fr.html share/doc/testdisk-${VERSION}/html/testdisk_herunterladen.html +share/doc/testdisk-${VERSION}/html/testdisk_it.html share/doc/testdisk-${VERSION}/html/testdisk_kompilation.html share/doc/testdisk-${VERSION}/html/testdisk_kompilieren.html share/doc/testdisk-${VERSION}/html/testdisk_livecd.html share/doc/testdisk-${VERSION}/html/testdisk_livecd_de.html share/doc/testdisk-${VERSION}/html/testdisk_livecd_fr.html share/doc/testdisk-${VERSION}/html/testdisk_pt.html +share/doc/testdisk-${VERSION}/html/testdisk_ru.html share/doc/testdisk-${VERSION}/html/testdisk_step_by_step.html share/doc/testdisk-${VERSION}/html/testdisk_team.html +share/doc/testdisk-${VERSION}/html/testdisk_undelete_file_for_ext2.html +share/doc/testdisk-${VERSION}/html/testdisk_undelete_file_for_fat.html +share/doc/testdisk-${VERSION}/html/testdisk_undelete_file_for_ntfs.html share/doc/testdisk-${VERSION}/html/testdisk_y_cd_de_live_rescue.html share/doc/testdisk-${VERSION}/html/testdisklogo2.gif share/doc/testdisk-${VERSION}/html/testdisklogo_clear_100.gif share/doc/testdisk-${VERSION}/html/unidades_cdrw.html share/doc/testdisk-${VERSION}/html/unterstetzung.html -share/doc/testdisk-${VERSION}/html/user.gif -share/doc/testdisk-${VERSION}/html/video.png +share/doc/testdisk-${VERSION}/html/user_builtbackwards.html +share/doc/testdisk-${VERSION}/html/user_kmaster.html share/doc/testdisk-${VERSION}/html/vista_check.gif share/doc/testdisk-${VERSION}/html/wie_kann_ich_helfen.html share/doc/testdisk-${VERSION}/html/wiederherstellbare_dateiformate_unter_photorec.html share/doc/testdisk-${VERSION}/html/wiederherstellung_digitaler_fotos_mit_photorec.html share/doc/testdisk-${VERSION}/html/wiederherstellungs_beispiele.html -share/doc/testdisk-${VERSION}/html/wikibits.js share/doc/testdisk-${VERSION}/html/win.png share/doc/testdisk-${VERSION}/html/win_kompilieren.html share/doc/testdisk-${VERSION}/html/winxp_created.gif