mirror of
https://abf.rosa.ru/djam/testdisk.git
synced 2025-02-23 09:42:48 +00:00
Updated to 7.0
This commit is contained in:
Denis Silakov
parent
aed9efdf0e
commit
7a8dfb84b7
5 changed files with 95 additions and 27 deletions
3
.abf.yml
3
.abf.yml
|
|
@ -1,5 +1,6 @@
|
|||
removed_sources:
|
||||
testdisk-6.13.tar.bz2: b08ace0257e3e437b6fc140360d75807ca4d46ae
|
||||
testdisk-6.14.tar.bz2: a2359406db5e3e3f9db81d8e8fce2a125dcc3677
|
||||
sources:
|
||||
progsreiserfs-0.3.1-rc8.tar.bz2: 24d3863d3b80a2b08da56bbf07df7f0ae327d7a8
|
||||
testdisk-6.14.tar.bz2: a2359406db5e3e3f9db81d8e8fce2a125dcc3677
|
||||
testdisk-7.0.tar.bz2: 3badfd88fea3d785f0d14ba0368866a085041c50
|
||||
|
|
|
|||
12
progsreiserfs-file-read.patch
Normal file
12
progsreiserfs-file-read.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -ru progsreiserfs-0.3.1-rc8.org/libreiserfs/file.c progsreiserfs-0.3.1-rc8/libreiserfs/file.c
|
||||
--- progsreiserfs-0.3.1-rc8.org/libreiserfs/file.c 2002-12-12 13:32:35.000000000 +0100
|
||||
+++ progsreiserfs-0.3.1-rc8/libreiserfs/file.c 2011-03-30 08:00:37.000000000 +0200
|
||||
@@ -172,7 +172,7 @@
|
||||
return readed;
|
||||
|
||||
offset = file->offset;
|
||||
- while (reiserfs_file_seek(file, file->offset)) {
|
||||
+ while (readed < size && reiserfs_file_seek(file, file->offset)) {
|
||||
|
||||
if (!reiserfs_file_read_item(file, buffer + readed, size - readed))
|
||||
return readed;
|
||||
12
testdisk-7.00-qphotorec-show-partitions-at-start.patch
Normal file
12
testdisk-7.00-qphotorec-show-partitions-at-start.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -Naur testdisk-7.0.orig/src/qphotorec.cpp testdisk-7.0/src/qphotorec.cpp
|
||||
--- testdisk-7.0.orig/src/qphotorec.cpp 2015-07-13 16:58:40.290424281 +0300
|
||||
+++ testdisk-7.0/src/qphotorec.cpp 2015-07-13 16:58:40.296424281 +0300
|
||||
@@ -574,6 +574,8 @@
|
||||
connect(PartListWidget, SIGNAL(itemSelectionChanged()), this, SLOT(partition_selected()));
|
||||
connect(dst_button, SIGNAL(clicked()), this, SLOT(setExistingDirectory()));
|
||||
connect(directoryLabel, SIGNAL(editingFinished()), this, SLOT(buttons_updateUI()));
|
||||
+
|
||||
+ disk_changed(0);
|
||||
}
|
||||
|
||||
void QPhotorec::clearWidgets()
|
||||
|
|
@ -4,16 +4,18 @@
|
|||
|
||||
Summary: Tool to check and undelete partition
|
||||
Name: testdisk
|
||||
Version: 6.14
|
||||
Release: 5
|
||||
Version: 7.0
|
||||
Release: 1
|
||||
License: GPLv2+
|
||||
Group: System/Kernel and hardware
|
||||
Source0: http://www.cgsecurity.org/%{name}-%{version}.tar.bz2
|
||||
Source1: progsreiserfs-%ver_progsreiserfs.tar.bz2
|
||||
Patch0: progsreiserfs-journal.patch
|
||||
# Upstream patch
|
||||
Patch1: photorec_611_exif_bound_checking_v2.patch
|
||||
Patch2: testdisk-6.14-qphotorec-sow-partitions-at-start.patch
|
||||
Patch0: progsreiserfs-journal.patch
|
||||
# Another upstream patch
|
||||
Patch1: progsreiserfs-file-read.patch
|
||||
# Upstream patch
|
||||
Patch2: testdisk-7.00-qphotorec-show-partitions-at-start.patch
|
||||
URL: http://www.cgsecurity.org/wiki/TestDisk
|
||||
BuildRequires: pkgconfig(ncurses) >= 5.2
|
||||
BuildRequires: pkgconfig(ext2fs) >= %ver_e2fsprogs
|
||||
|
|
@ -47,6 +49,15 @@ filesystems:
|
|||
* Unix File System UFS and UFS2 (Sun/BSD/...)
|
||||
* XFS, SGI's Journaled File System
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(644,root,root,755)
|
||||
%doc AUTHORS COPYING ChangeLog INFO INSTALL NEWS README THANKS
|
||||
# doc/*.html
|
||||
%attr(755,root,root) %{_bindir}/testdisk
|
||||
%{_mandir}/man8/testdisk*
|
||||
|
||||
#--------------------------------------------------------------------------------------
|
||||
|
||||
%package -n photorec
|
||||
Summary: Data recovery software
|
||||
Group: System/Kernel and hardware
|
||||
|
|
@ -61,6 +72,14 @@ PhotoRec ignores the filesystem and goes after the underlying data, so it
|
|||
will still work even if your media's filesystem has been severely damaged
|
||||
or re-formatted.
|
||||
|
||||
%files -n photorec -f photorec.lang
|
||||
%defattr(644,root,root,755)
|
||||
%doc AUTHORS ChangeLog INFO INSTALL NEWS README THANKS
|
||||
%attr(755,root,root) %{_bindir}/photorec
|
||||
%{_mandir}/man8/photorec*
|
||||
|
||||
#--------------------------------------------------------------------------------------
|
||||
|
||||
%package -n qphotorec
|
||||
Summary: GUI for photorec
|
||||
Group: System/Kernel and hardware
|
||||
|
|
@ -69,6 +88,17 @@ Requires: photorec = %{version}
|
|||
%description -n qphotorec
|
||||
Experimental GUI for PhotoRec.
|
||||
|
||||
%files -n qphotorec -f qphotorec.lang
|
||||
%{_bindir}/qphotorec
|
||||
%{_datadir}/applications/qphotorec.desktop
|
||||
%{_iconsdir}/hicolor/*/apps/*
|
||||
%{_mandir}/man8/qphotorec*
|
||||
%{_sbindir}/qphotorec
|
||||
%{_sysconfdir}/pam.d/qphotorec
|
||||
%{_sysconfdir}/security/console.apps
|
||||
|
||||
#--------------------------------------------------------------------------------------
|
||||
|
||||
%package -n fidentify
|
||||
Summary: Data recovery software
|
||||
Group: System/Kernel and hardware
|
||||
|
|
@ -78,11 +108,18 @@ Requires: %{name} = %{version}
|
|||
Recover lost files from harddisk, digital camera and cdrom fidentify the file
|
||||
type, the "extension", by using thr same database than PhotoRec.
|
||||
|
||||
%files -n fidentify -f fidentify.lang
|
||||
%defattr(644,root,root,755)
|
||||
%doc AUTHORS ChangeLog INFO INSTALL NEWS README THANKS
|
||||
%attr(755,root,root) %{_bindir}/fidentify
|
||||
%{_mandir}/man8/fidentify*
|
||||
|
||||
#--------------------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -a 1 -D -n %{name}-%{version}
|
||||
%patch0
|
||||
#%patch1 -p1 -b .exiv2
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
|
|
@ -101,27 +138,33 @@ cd progsreiserfs-%ver_progsreiserfs
|
|||
%install
|
||||
%makeinstall_std
|
||||
|
||||
rm -rf %{buildroot}/%_docdir
|
||||
rm -rf %{buildroot}/%{_docdir}
|
||||
|
||||
%files
|
||||
%defattr(644,root,root,755)
|
||||
%doc AUTHORS COPYING ChangeLog INFO INSTALL NEWS README THANKS
|
||||
# doc/*.html
|
||||
%attr(755,root,root) %{_bindir}/testdisk
|
||||
%{_mandir}/man8/testdisk*
|
||||
mkdir %{buildroot}%{_sbindir}
|
||||
mv %{buildroot}%{_bindir}/qphotorec %{buildroot}%{_sbindir}
|
||||
|
||||
%files -n photorec
|
||||
%defattr(644,root,root,755)
|
||||
%doc AUTHORS ChangeLog INFO INSTALL NEWS README THANKS
|
||||
%attr(755,root,root) %{_bindir}/photorec
|
||||
%{_mandir}/man8/photorec*
|
||||
ln -sf %{_bindir}/consolehelper %{buildroot}%{_bindir}/qphotorec
|
||||
|
||||
%files -n qphotorec
|
||||
%{_bindir}/qphotorec
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/pam.d/
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
|
||||
|
||||
cat > %{buildroot}%{_sysconfdir}/security/console.apps/qphotorec <<EOF
|
||||
USER=root
|
||||
PROGRAM=/usr/sbin/qphotorec
|
||||
FALLBACK=false
|
||||
SESSION=true
|
||||
EOF
|
||||
|
||||
cat > %{buildroot}%{_sysconfdir}/pam.d/qphotorec <<EOF
|
||||
#%PAM-1.0
|
||||
auth include config-util
|
||||
account include config-util
|
||||
session include config-util
|
||||
EOF
|
||||
|
||||
%find_lang qphotorec --with-man
|
||||
%find_lang photorec --with-man
|
||||
%find_lang testdisk --with-man
|
||||
%find_lang fidentify --with-man
|
||||
|
||||
%files -n fidentify
|
||||
%defattr(644,root,root,755)
|
||||
%doc AUTHORS ChangeLog INFO INSTALL NEWS README THANKS
|
||||
%attr(755,root,root) %{_bindir}/fidentify
|
||||
%{_mandir}/man8/fidentify*
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue