guymager: revert fb0531dcf9 partially

This commit is contained in:
blshkv 2018-08-09 11:37:00 +08:00
parent 3dc0319106
commit de4bc57525
No known key found for this signature in database
GPG key ID: 273E3E90D1A6294F
8 changed files with 194 additions and 0 deletions

View file

@ -0,0 +1 @@
DIST guymager-0.8.8.tar.gz 308270 BLAKE2B da1574ff0ab55815f49bc82c09a32477d9209e0c62dd243555edca246b23aedb7884f700197bcd7af722452d1cc6a8e953b1972e8fea1e7316b21f58e466559d SHA512 69828b797555a6644d0c20da7c75cf438588dd57861fc768eb26aafb67d8f2cb3e1452cc14df74d15c824f3c45bf3bf343c9ca12bdc12401f3fa6f3935951ef8

View file

@ -0,0 +1,36 @@
diff -urN guymager-0.8.7_p1.orig/config.cpp guymager-0.8.7_p1/config.cpp
--- guymager-0.8.7_p1.orig/config.cpp 2018-01-07 08:15:32.000000000 +0800
+++ guymager-0.8.7_p1/config.cpp 2018-01-07 08:21:27.801204343 +0800
@@ -272,7 +272,7 @@
{ "Encase5" , LIBEWF_FORMAT_ENCASE5},
{ "Encase6" , LIBEWF_FORMAT_ENCASE6},
{ "Smart" , LIBEWF_FORMAT_SMART },
- { "FTK" , LIBEWF_FORMAT_FTK },
+ { "FTK" , LIBEWF_FORMAT_FTK_IMAGER},
{ "Linen5" , LIBEWF_FORMAT_LINEN5 },
{ "Linen6" , LIBEWF_FORMAT_LINEN6 },
#if (LIBEWF_VERSION >= 20130416)
diff -urN guymager-0.8.7_p1.orig/file.cpp guymager-0.8.7_p1/file.cpp
--- guymager-0.8.7_p1.orig/file.cpp 2018-01-07 08:15:32.000000000 +0800
+++ guymager-0.8.7_p1/file.cpp 2018-01-07 08:33:32.557252999 +0800
@@ -76,9 +76,9 @@
case LIBEWF_FORMAT_ENCASE4: SubFormat="Encase4" ; break;
case LIBEWF_FORMAT_ENCASE5: SubFormat="Encase5" ; break;
case LIBEWF_FORMAT_ENCASE6: SubFormat="Encase6" ; break;
- case LIBEWF_FORMAT_FTK : SubFormat="FTK" ; break;
+ case LIBEWF_FORMAT_FTK_IMAGER : SubFormat="FTK" ; break;
case LIBEWF_FORMAT_SMART : SubFormat="Smart" ; break;
- case LIBEWF_FORMAT_LVF : SubFormat="LVF" ; break;
+ case LIBEWF_FORMAT_LOGICAL_ENCASE5 : SubFormat="LVF" ; break;
case LIBEWF_FORMAT_LINEN5 : SubFormat="Linen5" ; break;
case LIBEWF_FORMAT_LINEN6 : SubFormat="Linen6" ; break;
#if (LIBEWF_VERSION >= 20130416)
@@ -139,7 +139,7 @@
case LIBEWF_FORMAT_LINEN7 :
case LIBEWF_FORMAT_EWFX :
#endif
- case LIBEWF_FORMAT_FTK :
+ case LIBEWF_FORMAT_FTK_IMAGER :
case AEWF : Wild=".E??"; Human=".Exx"; break;
case LIBEWF_FORMAT_SMART : Wild=".s??"; Human=".sxx"; break;
default : CHK (ERROR_FILE_INVALID_EWF_FORMAT)

View file

@ -0,0 +1,33 @@
--- a/fifo.h
+++ b/fifo.h
@@ -38,7 +38,7 @@
#ifndef _LIBEWF_H
#include <libewf.h>
- #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416))
+ #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416) && (LIBEWF_VERSION != 20140608))
#error "Please check EWF documentation for newer Encase formats and adjust following code"
#endif
--- a/dlgacquire.cpp
+++ b/dlgacquire.cpp
@@ -1245,7 +1245,7 @@
return;
}
SplitSize = NumValue * UnitIndexToMultiplier (DlgAcquireGetField(CFG_DLGACQUIRE_SPLITFILEUNIT)->pComboBox->currentIndex());
- #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416))
+ #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416) && (LIBEWF_VERSION != 20140608))
#error "Please check EWF documentation for newer Encase formats and adjust following code"
#endif
if (pOwn->pRadioButtonFormatEWF->isChecked())
--- a/main.cpp
+++ b/main.cpp
@@ -508,7 +508,7 @@
// Initialise libewf
// -----------------
- #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416))
+ #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416) && (LIBEWF_VERSION != 20140608))
#error "Please check EWF documentation for newer Encase formats and adjust following code"
#endif

View file

@ -0,0 +1,18 @@
--- guymager.pro.orig 2014-02-03 19:08:24.000000000 +0800
+++ guymager.pro 2014-09-30 09:10:20.000000000 +0800
@@ -144,11 +144,11 @@
QMAKE_LFLAGS_DEBUG += -ggdb -rdynamic # -rdynamic is necessary in order to have the backtrace handler in toolsignal show all information
QMAKE_LFLAGS_RELEASE += -ggdb -rdynamic # -rdynamic is necessary in order to have the backtrace handler in toolsignal show all information
-#LIBS += -lewf
-#LIBS += -lguytools
+LIBS += -lewf
+LIBS += -lguytools
#LIBS += /usr/local/lib/libewf.a
-LIBS += /usr/lib/libewf.a
-LIBS += /usr/lib/libguytools.a
+#LIBS += /usr/lib/libewf.a
+#LIBS += /usr/lib/libguytools.a
LIBS += -lz
LIBS += -ldl

View file

@ -0,0 +1,58 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit qmake-utils desktop
DESCRIPTION="Guymager is a fast and user friendly forensic imager."
HOMEPAGE="http://guymager.sourceforge.net/"
#SRC_URI="mirror://sourceforge/guymager/guymager/LatestSource/${P}.tar.gz"
SRC_URI="http://dev.pentoo.ch/~blshkv/distfiles/guymager-0.8.8.tar.gz"
LICENSE="GPL-2"
SLOT="0"
#broken with the latest libewf, see: https://sourceforge.net/p/guymager/feature-requests/11/
KEYWORDS="~x86 ~arm ~amd64"
IUSE="debug hdparm udisk libewf smart parted"
RDEPEND="dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtdbus:5
sys-libs/zlib
sys-process/procps
hdparm? ( sys-apps/hdparm )
udisk? ( sys-fs/udisks:* )
smart? ( sys-apps/smartmontools )
parted? ( sys-block/parted )"
DEPEND="${RDEPEND}
libewf? ( app-forensics/libewf )
sys-auth/polkit
dev-libs/libguytools2:="
src_configure() {
eqmake5 DEFINES*="ENABLE_LIBEWF=$(usex libewf '1' '0')"
}
src_compile() {
make
lrelease guymager.pro
cd manuals
./rebuild.sh
}
src_install() {
dobin guymager
doman manuals/guymager.1
insinto /usr/share/guymager
doins guymager_*.ts
insinto /etc/guymager
doins guymager.cfg
doicon guymager_128.png
domenu guymager.desktop
}

View file

@ -0,0 +1 @@
DIST libguytools2-2.0.5.tar.gz 37088 BLAKE2B c0f076784ea1544b2e0e2a7c878b82c7a02f07017c8c7e417767aa9d6e2ff422605c609c657667aab7efe6413f525f30b1d9bcca4295979f3176f712d6309c32 SHA512 d7bfef0fecf792385220149e351da9f5679db4235c22afa9b11b956c96f1b8575ad0f715166c75032131fb1a36fb7c5ee02a2be6508af4e90f47060164cf0db7

View file

@ -0,0 +1,10 @@
--- libguytools2-2.0.1.orig/toolsysinfo.cpp
+++ libguytools2-2.0.1/toolsysinfo.cpp
@@ -9,6 +9,7 @@
// Module: System information
// ****************************************************************************
+#include <stdio.h>
#include <limits.h>
#include <math.h>
#include <stdio.h>

View file

@ -0,0 +1,37 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils qmake-utils
DESCRIPTION="Library for guymager"
HOMEPAGE="http://libguytools.sourceforge.net/"
#SRC_URI="mirror://sourceforge/libguytools/${P}.tar.gz"
SRC_URI="mirror://debian/pool/main/libg/libguytools2/${P//-/_}.orig.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~amd64 ~arm"
IUSE="debug"
RDEPEND="${DEPEND}"
#S="${WORKDIR}/tools-${PV}"
src_prepare() {
echo "VERSION = ${PV}" > libguytools_version.pro.inc
epatch "${FILESDIR}"/toolsysinfo.cpp.diff
eapply_user
}
src_configure() {
eqmake5 tools.pro
eqmake5 toolsstatic.pro
}
src_install() {
insinto /usr/include/libguytools2
doins include/*.h
dolib.a lib/libguytools.a
}