Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu

6 files changed, 519 insertions, 2 deletions

diff --git a/extra/fvwm/.md5sum b/extra/fvwm/.md5sum
index 11e47a893..9f24d94c4 100644
--- a/extra/fvwm/.md5sum
+++ b/extra/fvwm/.md5sum
@@ -17,5 +17,5 @@ c12d238cbefc25bd19879401c327e6fe  16-FirstItemUnderPointer.patch
 d41d8cd98f00b204e9800998ecf8427e  17-TextOffset.patch
 9df3958e5b2e1f3c5ed3721e2f3a5cdd  18-ThinGeometryProxy.patch
 3cd0642f2e9183e031963d04f2418106  MenuTranslucency.patch
-3011b85cbd60588ceaf11dd713064cfa  fvwm-2.5.28.tar.gz
+6b06faaff07d5e0e578143ed64b697b7  fvwm-2.5.30.tar.gz
 c8c5b83e636a0e3928d72813e25078d7  fvwm.desktop
diff --git a/extra/fvwm/Pkgfile b/extra/fvwm/Pkgfile
index 62e7fb56f..64194a05e 100644
--- a/extra/fvwm/Pkgfile
+++ b/extra/fvwm/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: librsgv, xorg
 
 name=fvwm
-version=2.5.28
+version=2.5.30
 release=1
 group=app
 source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/$name-$version.tar.gz \
diff --git a/extra/testdisk/.footprint b/extra/testdisk/.footprint
new file mode 100644
index 000000000..d251dd1c1
--- /dev/null
+++ b/extra/testdisk/.footprint
@@ -0,0 +1,327 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/sbin/
+-rwxr-xr-x	root/root	usr/sbin/photorec
+-rwxr-xr-x	root/root	usr/sbin/testdisk
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/testdisk-6.11/
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/AUTHORS
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/ChangeLog
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/NEWS
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/README
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/THANKS
+drwxr-xr-x	root/root	usr/share/doc/testdisk-6.11/html/
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/20071113081925_analyse.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/20071113082557_search_menu.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/20080103231020_photorec_options.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/30px_damaged_file_system.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/32px_package.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/70px_damaged_file_system.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/70px_quick_search.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/Common.css
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/Monobook.css
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/_intel.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/_testdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/advanced_fat_repair.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/advanced_find_ext2_ext3_backup_superblock.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/advanced_ntfs_boot_and_mft_repair.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/after_backup_bs.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/after_using_photorec.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/after_using_testdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ajax.js
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/analyse.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/aplicaci_n_goback.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/apres_utilisation_de_testdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/audio.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ausfehren_von_skript.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ausfehren_von_testdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ausfehrliches_wiederherstellungsbeispiel.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/backup_bs.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/beschadigte_festplatte.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/boot_sector.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/bullet.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/busqueda_avanzada_del_superblock_de_backup_ext2_ext3.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/c_mo_ayudar.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/cdrw.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/cdrw_de.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/cdrw_es.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/cdrw_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/comment_aider.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/commentaider.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/commonprint.css_97.css
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/compilar_dos.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/compilar_linux.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/compilar_mac_os_x.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/compilar_win.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/compilation_sous_dos.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/compilation_sous_linux.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/compilation_sous_mac_os_x.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/compilation_sous_windows.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/compile_dos.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/compile_linux.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/compile_mac_os_x.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/compile_win.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/create_log.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/current_limitations.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/damaged_file_system.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/damaged_hard_disk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/dans_les_journaux.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/das_testdisk_team.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/data_recovery_examples.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/datentrager_abbilder.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/de.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/digital_photos_recovery_using_photorec.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/discos_r_gidos_danificados.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/discos_rigidos_rotos.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/discussionitem_icon.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/disque_dur_endommage.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/disquette_de_boot_dos.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/document.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/donation.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/dos.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/dos_bootdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/dos_bootdiskette.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/dos_kompilieren.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/dyn.css
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ejecuci_n_con_scripts.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ejecucion_con_scripts.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ejecutando_testdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ejemplos_de_recuperaci_n_de_datos.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/en.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/en_las_noticias.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/equipo_testdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/erweiterte_boot_und_mft_reparatur_bei_ntfs.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/erweiterte_fat_reparatur.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/es.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/executer_testdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/execution_automatisee.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/exemples_de_restauration.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ext3_superblocks_finden.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/external.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/fdisk_de_microsoft.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/file_formats_recovered_by_photorec.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/file_icon.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/first_results.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/formats_de_fichier_recuperes_par_photorec.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/fr.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/gegenwartige_einschrankungen.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/geometry.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/gnu_fdl.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/goback.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/goback_de.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/goback_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/headbg.jpg
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/hinweise_und_tipps.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/howtohelp.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ie50fixes.css_97.css
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ie55fixes.css_97.css
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ie60fixes.css_97.css
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ie70fixes.css_97.css
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/iefixes.js
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_after_backup_bs.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_analyse.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_backup_bs.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_boot_sector.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_create_log.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_damaged_file_system.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_first_results.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_geometry.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_list_files.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_menu_write.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_menus.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_no_partition.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_package.png.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_partition_table_type.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_photorec_dst.png.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_photorec_end.png.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_photorec_files.png.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_photorec_filesystem.png.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_photorec_free.png.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_photorec_options.png.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_photorec_part_type.png.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_photorec_running.png.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_photorec_src.png.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_photorec_startup.png.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_quick_search.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_reboot.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_results_deeper_search.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_search_menu.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_select_disk_update.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_set_partition_to_recover.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_vista_check.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/image_winxp_created.gif.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/imagen_de_medio.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/in_den_nachrichten.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/in_the_news.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/intel_partition_table.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/intel_partitionstabelle.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/it.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/limitaciones_actuales.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/limitations_courantes.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/linux.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/linux_a_ppc_darwin_cross_compiler.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/linux_bootdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/linux_bootdiskette.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/linux_kompilieren.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/linux_kompilieren1.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/linux_to_ppc_darwin_cross_compiler.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/linux_zu_ppc_darwin_kreuz_compiler.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/list_files.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/lock_icon.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/logo.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/luego_de_usar_testdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/mac_os_x_kompilieren.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/macosx.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/mail_icon.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/main.css
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/media_image.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/media_image_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/mene_analyse.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/mene_delete.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/mene_geometrie.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/mene_mbr_code.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/mene_optionen.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_analizar.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_analyse.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_analyse_de.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_analyse_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_borrar.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_codigo_mbr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_delete.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_delete_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_geometria.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_geometrie.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_geometry.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_mbrcode.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_mbrcode_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_opciones.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_options.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_options_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menu_write.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/menus.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/merkmale_von_betriebssystemen.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/microsoft_fdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/microsoft_fdisk_de.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/microsoft_fdisk_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/monitoreo_smart.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/monitoring_smart_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/nach_dem_gebrauch_von_photorec.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/nach_dem_gebrauch_von_testdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/news_icon.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/no_partition.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/notas_so.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/notes_specifiques_os.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/opensearch_desc.xml
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/os2.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/os_notes.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/package.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/partition_recognition_primary_and_logical.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/partition_table_type.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/partitionserkennung_primar_und_logisch.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec.ico
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec1.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_de.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_dst.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_end.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_etape_par_etape.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_files.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_filesystem.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_free.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_it.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_logo.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_options.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_part_type.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_passo_dopo_passo.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_running.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_schritt_fer_schritt.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_small.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_src.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_startup.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/photorec_step_by_step.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/pt.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/quick_search.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/reboot.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/reconna_tre_les_partitions_primaires_et_logiques.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/reiserfs_datei_wiederherstellung_kurzanleitung.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/reiserfs_file_undelete_howto.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/reiserfs_howto_de_recuperacion_de_archivos.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/reiserfs_recuperation_de_fichier.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/reparacion_avanzada_de_fat.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/reparacion_avanzada_del_sector_de_booteo_y_mft.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/reparacion_avanzada_del_sector_de_booteo_y_mft_de_ntfs.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/reparation_d_une_partition_ext2_ext3.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/reparation_d_une_partition_fat.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/reparation_d_une_partition_ntfs.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/results_deeper_search.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/rpm.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/ru.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/running_testdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/schritt_fer_schritt_wiederherstellungsbeispiel.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/scripted_run.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/search_menu.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/select_disk_update.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/set_partition_to_recover.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/shared.css_97.css
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/smart_monitoring.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/smart_monitoring_de.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/soporte.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/spenden.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/support.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/support_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/tabla_de_particiones_de_intel.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/table_de_partition_intel.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/telecharger_testdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/template_infobox_photorec.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/template_infobox_testdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk1.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_6.10_release.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_6.4_release.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_6.5_release.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_6.6_release.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_6.7_release.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_6.8_release.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_6.9_release.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_compilaci_n.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_compilation.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_compilation_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_de.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_descargar.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_download.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_es.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_etape_par_etape.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_herunterladen.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_kompilation.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_kompilieren.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_livecd.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_livecd_de.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_livecd_fr.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_pt.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_step_by_step.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_team.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisk_y_cd_de_live_rescue.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisklogo2.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/testdisklogo_clear_100.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/unidades_cdrw.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/unterstetzung.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/user.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/video.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/vista_check.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/wie_kann_ich_helfen.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/wiederherstellbare_dateiformate_unter_photorec.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/wiederherstellung_digitaler_fotos_mit_photorec.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/wiederherstellungs_beispiele.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/wikibits.js
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/win.png
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/win_kompilieren.html
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/winxp_created.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/x_click_but04.gif
+-rw-r--r--	root/root	usr/share/doc/testdisk-6.11/html/x_click_but11.gif
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/photorec.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/testdisk.1.gz
diff --git a/extra/testdisk/.md5sum b/extra/testdisk/.md5sum
new file mode 100644
index 000000000..bd234bb3a
--- /dev/null
+++ b/extra/testdisk/.md5sum
@@ -0,0 +1 @@
+11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
diff --git a/extra/testdisk/Pkgfile b/extra/testdisk/Pkgfile
new file mode 100644
index 000000000..f243d5a80
--- /dev/null
+++ b/extra/testdisk/Pkgfile
@@ -0,0 +1,19 @@
+# Description: TestDisk logiciel performant de récupération de données
+# URL: http://www.cgsecurity.org/wiki/TestDisk
+# Maintainer: NuTyX core team
+# Packager: geantbrun at gmail dot com
+# Depends on: libjpeg>=8 openssl progsreiserfs ntfsprogs
+
+name=testdisk
+version=6.11
+release=1
+source=(http://www.cgsecurity.org/testdisk-6.11.tar.bz2)
+
+build() {
+        
+	cd $name-$version
+	./configure --prefix=/usr \
+		  
+	make
+	make DESTDIR=$PKG install
+}
diff --git a/extra/testdisk/testdisk.log b/extra/testdisk/testdisk.log
new file mode 100644
index 000000000..1886c5ee3
--- /dev/null
+++ b/extra/testdisk/testdisk.log
@@ -0,0 +1,170 @@
+
+
+Wed Jul 21 14:05:07 2010
+Command line: TestDisk
+
+TestDisk 6.11, Data Recovery Utility, April 2009
+Christophe GRENIER <grenier@cgsecurity.org>
+http://www.cgsecurity.org
+OS: Linux, kernel 2.6.34-NuTyX (#1 SMP PREEMPT Thu Jul 15 16:02:03 CEST 2010)
+Compiler: GCC 4.5 - Jul 21 2010 13:43:31
+ext2fs lib: 1.41.12, ntfs lib: 10:0:0, reiserfs lib: none, ewf lib: none
+/dev/sda: LBA, HPA support
+/dev/sda: size       39876480 sectors
+/dev/sda: user_max   39876480 sectors
+/dev/sda: native_max 39876480 sectors
+/dev/sdb: LBA, HPA, DCO support
+/dev/sdb: size       160086528 sectors
+/dev/sdb: user_max   160086528 sectors
+/dev/sdb: native_max 160086528 sectors
+/dev/sdb: dco        160086528 sectors
+Warning: can't get size for Disk /dev/mapper/control - 0 B - CHS 1 1 1, sector size=512
+Hard disk list
+Disk /dev/sda - 20 GB / 19 GiB - CHS 2482 255 63, sector size=512 - ATA QUANTUM FIREBALL
+Disk /dev/sdb - 81 GB / 76 GiB - CHS 9964 255 63, sector size=512 - ATA Maxtor 6L080L0
+Disk /dev/sdc - 4007 MB / 3822 MiB - CHS 3822 64 32, sector size=512 - Verbatim STORE N GO
+Disk /dev/sdd - 4005 MB / 3819 MiB - CHS 486 255 63, sector size=512 -  USB Flash Memory
+
+Partition table type (auto): None
+Disk /dev/sdb - 81 GB / 76 GiB - ATA Maxtor 6L080L0
+Partition table type: Intel
+
+Analyse Disk /dev/sdb - 81 GB / 76 GiB - CHS 9964 255 63
+Geometry from i386 MBR: head=255 sector=63
+
+ReiserFS Marker at 148/0/1
+
+ReiserFS Marker at 2570/0/1
+
+ReiserFS Marker at 4992/1/1
+get_geometry_from_list_part_aux head=255 nbr=30
+get_geometry_from_list_part_aux head=8 nbr=4
+get_geometry_from_list_part_aux head=16 nbr=4
+get_geometry_from_list_part_aux head=32 nbr=4
+get_geometry_from_list_part_aux head=64 nbr=4
+get_geometry_from_list_part_aux head=128 nbr=4
+get_geometry_from_list_part_aux head=240 nbr=3
+get_geometry_from_list_part_aux head=255 nbr=30
+Current partition structure:
+ 1 * Linux Swap               0   1  1   147 254 63    2377557
+ 2 P Linux                  148   0  1  2569 254 63   38909430
+ 3 P Linux                 2570   0  1  4991 254 63   38909430
+ 4 E extended LBA          4992   0  1  9964 254 63   79891245
+ 5 L Linux                 4992   1  1  5246 254 63    4096512
+   X extended              5247   0  1  6393 254 63   18426555
+ 6 L Linux                 5247   1  1  6393 254 63   18426492
+   X extended              6394   0  1  7541 254 63   18442620
+ 7 L Linux                 6394   1  1  7541 254 63   18442557
+   X extended              7542   0  1  7938 254 63    6377805
+ 8 L Linux                 7542   1  1  7938 254 63    6377742
+   X extended              7939   0  1  9068 254 63   18153450
+ 9 L Linux                 7939   1  1  9068 254 63   18153387
+   X extended              9069   0  1  9963 254 63   14378175
+10 L Linux                 9069   1  1  9963 254 63   14378112
+Ask the user for vista mode
+Allow partial last cylinder : No
+search_vista_part: 0
+
+search_part()
+Disk /dev/sdb - 81 GB / 76 GiB - CHS 9964 255 63
+     Linux Swap               0   1  1   147 254 42    2377536
+     SWAP2 version 1, 1217 MB / 1160 MiB
+
+ReiserFS Marker at 148/0/1
+
+recover_rfs
+block_count=4863664
+block_size=4096
+     Linux                  148   0  1  2569 253  8   38909312
+     ReiserFS 3.6 with standard journal, need recovery, 19 GB / 18 GiB
+
+ReiserFS Marker at 2570/0/1
+
+recover_rfs
+block_count=4863664
+block_size=4096
+     Linux                 2570   0  1  4991 253  8   38909312
+     ReiserFS 3.6 with standard journal, need recovery, 19 GB / 18 GiB
+
+ReiserFS Marker at 4992/1/1
+
+recover_rfs
+block_count=512064
+block_size=4096
+     Linux                 4992   1  1  5246 254 63    4096512
+     ReiserFS 3.6 with standard journal, need recovery, 2097 MB / 2000 MiB
+
+recover_EXT2: s_block_group_nr=0/70, s_mnt_count=63/35, s_blocks_per_group=32768, s_inodes_per_group=8176
+recover_EXT2: s_blocksize=4096
+recover_EXT2: s_blocks_count 2303311
+recover_EXT2: part_size 18426488
+     Linux                 5247   1  1  6393 254 59   18426488
+     EXT4 Large file Sparse superblock Recover, 9434 MB / 8997 MiB
+
+recover_EXT2: s_block_group_nr=0/70, s_mnt_count=37/35, s_blocks_per_group=32768, s_inodes_per_group=8128
+recover_EXT2: s_blocksize=4096
+recover_EXT2: s_blocks_count 2305319
+recover_EXT2: part_size 18442552
+     Linux                 6394   1  1  7541 254 58   18442552
+     EXT4 Large file Sparse superblock Recover, 9442 MB / 9005 MiB
+
+recover_EXT2: s_block_group_nr=0/24, s_mnt_count=68/21, s_blocks_per_group=32768, s_inodes_per_group=7984
+recover_EXT2: s_blocksize=4096
+recover_EXT2: s_blocks_count 797217
+recover_EXT2: part_size 6377736
+     Linux                 7542   1  1  7938 254 57    6377736
+     EXT4 Large file Sparse superblock Recover, 3265 MB / 3114 MiB
+
+recover_EXT2: s_block_group_nr=0/69, s_mnt_count=1/25, s_blocks_per_group=32768, s_inodes_per_group=8144
+recover_EXT2: s_blocksize=4096
+recover_EXT2: s_blocks_count 2269173
+recover_EXT2: part_size 18153384
+     Linux                 7939   1  1  9068 254 60   18153384
+     EXT3 Large file Sparse superblock, 9294 MB / 8863 MiB
+
+recover_EXT2: s_block_group_nr=0/54, s_mnt_count=13/25, s_blocks_per_group=32768, s_inodes_per_group=8176
+recover_EXT2: s_blocksize=4096
+recover_EXT2: s_blocks_count 1797264
+recover_EXT2: part_size 14378112
+     Linux                 9069   1  1  9963 254 63   14378112
+     EXT4 Large file Sparse superblock Recover, 7361 MB / 7020 MiB
+get_geometry_from_list_part_aux head=255 nbr=16
+get_geometry_from_list_part_aux head=8 nbr=2
+get_geometry_from_list_part_aux head=16 nbr=2
+get_geometry_from_list_part_aux head=32 nbr=2
+get_geometry_from_list_part_aux head=64 nbr=2
+get_geometry_from_list_part_aux head=128 nbr=2
+get_geometry_from_list_part_aux head=240 nbr=2
+get_geometry_from_list_part_aux head=255 nbr=16
+
+Results
+   * Linux Swap               0   1  1   147 254 63    2377557
+     SWAP2 version 1, 1217 MB / 1160 MiB
+   P Linux                  148   0  1  2569 254 63   38909430
+     ReiserFS 3.6 with standard journal, need recovery, 19 GB / 18 GiB
+   P Linux                 2570   0  1  4991 254 63   38909430
+     ReiserFS 3.6 with standard journal, need recovery, 19 GB / 18 GiB
+   L Linux                 4992   1  1  5246 254 63    4096512
+     ReiserFS 3.6 with standard journal, need recovery, 2097 MB / 2000 MiB
+   L Linux                 5247   1  1  6393 254 63   18426492
+     EXT4 Large file Sparse superblock Recover, 9434 MB / 8997 MiB
+   L Linux                 6394   1  1  7541 254 63   18442557
+     EXT4 Large file Sparse superblock Recover, 9442 MB / 9005 MiB
+   L Linux                 7542   1  1  7938 254 63    6377742
+     EXT4 Large file Sparse superblock Recover, 3265 MB / 3114 MiB
+   L Linux                 7939   1  1  9068 254 63   18153387
+     EXT3 Large file Sparse superblock, 9294 MB / 8863 MiB
+   L Linux                 9069   1  1  9963 254 63   14378112
+     EXT4 Large file Sparse superblock Recover, 7361 MB / 7020 MiB
+
+interface_write()
+ 1 * Linux Swap               0   1  1   147 254 63    2377557
+ 2 P Linux                  148   0  1  2569 254 63   38909430
+ 3 P Linux                 2570   0  1  4991 254 63   38909430
+ 4 E extended LBA          4992   0  1  9963 254 63   79875180
+ 5 L Linux                 4992   1  1  5246 254 63    4096512
+ 6 L Linux                 5247   1  1  6393 254 63   18426492
+ 7 L Linux                 6394   1  1  7541 254 63   18442557
+ 8 L Linux                 7542   1  1  7938 254 63    6377742
+ 9 L Linux                 7939   1  1  9068 254 63   18153387
+10 L Linux                 9069   1  1  9963 254 63   14378112