diff --git a/app-forensics/guymager/Manifest b/app-forensics/guymager/Manifest index 0f5163073..a9c722579 100644 --- a/app-forensics/guymager/Manifest +++ b/app-forensics/guymager/Manifest @@ -1 +1,2 @@ +DIST guymager-0.8.11.tar.gz 299907 BLAKE2B 495d65ffef45fcecea1b8b57f7fe3d0edeb45d94f46a08090eff55728951b25103e7fe1694c42ee63dbc4bb52eded350dd54c400c9de78d53c0f4e014a591733 SHA512 cf68c7d153a2106581010af6f0b4ff3accd6335494f65203e6e741beb94c38afb4947b9f579d8e8cbdf16054815d58af9acbde1045d6410d8424d9461c2b716f DIST guymager-0.8.8.tar.gz 308270 BLAKE2B da1574ff0ab55815f49bc82c09a32477d9209e0c62dd243555edca246b23aedb7884f700197bcd7af722452d1cc6a8e953b1972e8fea1e7316b21f58e466559d SHA512 69828b797555a6644d0c20da7c75cf438588dd57861fc768eb26aafb67d8f2cb3e1452cc14df74d15c824f3c45bf3bf343c9ca12bdc12401f3fa6f3935951ef8 diff --git a/app-forensics/guymager/files/gcc8_support.patch b/app-forensics/guymager/files/gcc8_support.patch new file mode 100644 index 000000000..96bfe07df --- /dev/null +++ b/app-forensics/guymager/files/gcc8_support.patch @@ -0,0 +1,69 @@ +Fix for #897764 (ftbfs with GCC-8), until new version 0.8.9 is available + +diff --git a/md5.cpp b/md5.cpp +index ba6c743..0bd3651 100644 +--- a/md5.cpp ++++ b/md5.cpp +@@ -35,6 +35,7 @@ + + #include + #include ++#include + + #include "md5.h" + +@@ -376,9 +377,7 @@ void MD5Append (t_pMD5Context pContext, const void *pBuffer, size_t Len) + if (Len >= 64) + { + #if !_STRING_ARCH_unaligned +- #define alignof(type) offsetof (struct { char c; type x; }, x) +- #define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) +- ++ #define UNALIGNED_P(p) ((uintptr_t) (p) % alignof (uint32_t) != 0) + if (UNALIGNED_P (pBuffer)) + { + while (Len > 64) +diff --git a/sha1.cpp b/sha1.cpp +index 3c5190b..df66e8d 100644 +--- a/sha1.cpp ++++ b/sha1.cpp +@@ -34,6 +34,7 @@ + + #include + #include ++#include + + #include "sha1.h" + +@@ -263,8 +264,7 @@ void SHA1Append (t_pSHA1Context pContext, const void *buffer, size_t len) + if (len >= 64) + { + #if !_STRING_ARCH_unaligned +- #define alignof(type) offsetof (struct { char c; type x; }, x) +- #define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) ++ #define UNALIGNED_P(p) ((uintptr_t) (p) % alignof (uint32_t) != 0) + if (UNALIGNED_P (buffer)) + while (len > 64) + { +diff --git a/sha256.cpp b/sha256.cpp +index 7b5135d..d193168 100644 +--- a/sha256.cpp ++++ b/sha256.cpp +@@ -45,6 +45,7 @@ + //#define SHA256_OLD + + #include ++#include + #include "sha256.h" + + #ifdef SHA256_OLD +@@ -812,8 +813,7 @@ void SHA256Append (t_pSHA256Context pContext, const void *buffer, size_t len) + if (len >= 64) + { + #if !_STRING_ARCH_unaligned +- #define alignof(type) offsetof (struct { char c; type x; }, x) +- #define UNALIGNED_P(p) (((size_t) p) % alignof (uint32) != 0) ++ #define UNALIGNED_P(p) ((uintptr_t) (p) % alignof (uint32_t) != 0) + if (UNALIGNED_P (buffer)) + { + while (len > 64) diff --git a/app-forensics/guymager/files/profile.patch b/app-forensics/guymager/files/profile.patch new file mode 100644 index 000000000..0d6ddea47 --- /dev/null +++ b/app-forensics/guymager/files/profile.patch @@ -0,0 +1,10 @@ +--- guymager.pro.orig 2019-08-22 13:47:17.569214449 +0800 ++++ guymager.pro 2019-08-22 13:48:59.282221278 +0800 +@@ -199,6 +199,7 @@ + } + } + } ++else { + LIBS += -lguytools + contains (USE_LIBEWF, 1) { + message ("Using libewf!") diff --git a/app-forensics/guymager/guymager-0.8.11.ebuild b/app-forensics/guymager/guymager-0.8.11.ebuild new file mode 100644 index 000000000..8ce8e0935 --- /dev/null +++ b/app-forensics/guymager/guymager-0.8.11.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit qmake-utils desktop eutils + +DESCRIPTION="Guymager is a fast and user friendly forensic imager." +HOMEPAGE="http://guymager.sourceforge.net/" +#https://sourceforge.net/projects/guymager/files/latest/download +#https://liquidtelecom.dl.sourceforge.net/project/guymager/guymager/LatestSource/guymager-0.8.11.tar.gz +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-2.1.0:=" + +src_prepare() { + epatch "${FILESDIR}"/profile.patch +# epatch "${FILESDIR}"/gcc8_support.patch + eapply_user +} + +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 +} diff --git a/dev-libs/libguytools2/Manifest b/dev-libs/libguytools2/Manifest index cd570fb3e..a8c618998 100644 --- a/dev-libs/libguytools2/Manifest +++ b/dev-libs/libguytools2/Manifest @@ -1 +1,2 @@ DIST libguytools2-2.0.5.tar.gz 37088 BLAKE2B c0f076784ea1544b2e0e2a7c878b82c7a02f07017c8c7e417767aa9d6e2ff422605c609c657667aab7efe6413f525f30b1d9bcca4295979f3176f712d6309c32 SHA512 d7bfef0fecf792385220149e351da9f5679db4235c22afa9b11b956c96f1b8575ad0f715166c75032131fb1a36fb7c5ee02a2be6508af4e90f47060164cf0db7 +DIST tools-2.1.0.tar.gz 38006 BLAKE2B 1b73d98a0ae424a4aeee11631e5c9251fffe8fa459a71680229d6d648179c5d9fe2f2b432ee401c8f1e1f3d4529b81406c417959e26829f40db30e9790f31095 SHA512 466fa1171924b219d8c54bbc0df2d5e0c0f516c3ba9a734693f1447033feceb844b483a9b53c56223a4ea0df90feee15ec4902bf29dafd6c185060ee3a26bfa8 diff --git a/dev-libs/libguytools2/libguytools2-2.1.0.ebuild b/dev-libs/libguytools2/libguytools2-2.1.0.ebuild new file mode 100644 index 000000000..824c50f92 --- /dev/null +++ b/dev-libs/libguytools2/libguytools2-2.1.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2019 Gentoo Authors +# 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://debian/pool/main/libg/libguytools2/${P//-/_}.orig.tar.gz -> ${P}.tar.gz" +SRC_URI="mirror://sourceforge/libguytools/tools-${PV}.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 +}