diff -Nru guymager-0.8.3/aaff.cpp guymager-0.8.4/aaff.cpp --- guymager-0.8.3/aaff.cpp 2016-11-04 08:23:56.000000000 +0000 +++ guymager-0.8.4/aaff.cpp 2017-08-17 07:19:14.000000000 +0000 @@ -79,7 +79,7 @@ unsigned int NameLen; unsigned int DataLen; unsigned int Argument; // Named "flags" in original aff source, named "arg" in afinfo output. - char Name[]; //lint !e1501 + char Name[0]; } __attribute__ ((packed)) t_AffSegmentHeader; // Between header and footer lie the segment name and the data diff -Nru guymager-0.8.3/changelog guymager-0.8.4/changelog --- guymager-0.8.3/changelog 2016-11-04 08:23:56.000000000 +0000 +++ guymager-0.8.4/changelog 2017-08-17 07:19:14.000000000 +0000 @@ -1,3 +1,8 @@ +guymager-beta (0.8.4-1) unstable; urgency=low + * Removed bug that occurred if remaining time was longer than 99 hours + * Adapted to gcc7 + -- Guy Voncken Fri, 02 Feb 2017 09:00:00 +0100 + guymager-beta (0.8.3-1) unstable; urgency=low * Corrected bug where Guymager not always recognised if duplicate image or info file was the same as first one. diff -Nru guymager-0.8.3/debian/changelog guymager-0.8.4/debian/changelog --- guymager-0.8.3/debian/changelog 2016-11-04 08:23:42.000000000 +0000 +++ guymager-0.8.4/debian/changelog 2017-08-17 11:49:45.000000000 +0000 @@ -1,3 +1,17 @@ +guymager (0.8.4-2) unstable; urgency=medium + + * [51f6f0f] Switching to Architecture "any" (Closes: #800546) + * [b4c86cb] Bump Standards-Version to 4.0.1 + + -- Michael Prokop Thu, 17 Aug 2017 13:49:45 +0200 + +guymager (0.8.4-1) unstable; urgency=medium + + * [1268421] Add armhf + arm64 to Architecture list (Closes: #800546) + * [9190fe2] New upstream version 0.8.4, fixing gcc7 issue (Closes: #841544) + + -- Michael Prokop Thu, 17 Aug 2017 09:20:09 +0200 + guymager (0.8.3-1) unstable; urgency=medium * [fa1f275] New upstream version 0.8.3 diff -Nru guymager-0.8.3/debian/control guymager-0.8.4/debian/control --- guymager-0.8.3/debian/control 2016-11-04 08:23:37.000000000 +0000 +++ guymager-0.8.4/debian/control 2017-08-17 11:49:41.000000000 +0000 @@ -15,13 +15,13 @@ libssl-dev, libudev-dev, quilt, -Standards-Version: 3.9.8 +Standards-Version: 4.0.1 Homepage: http://guymager.sourceforge.net/ Vcs-Browser: https://anonscm.debian.org/cgit/forensics/guymager.git Vcs-Git: https://anonscm.debian.org/git/forensics/guymager.git Package: guymager -Architecture: amd64 i386 powerpc +Architecture: any Depends: hdparm, libparted0 | libparted, diff -Nru guymager-0.8.3/device.cpp guymager-0.8.4/device.cpp --- guymager-0.8.3/device.cpp 2016-11-04 08:23:56.000000000 +0000 +++ guymager-0.8.4/device.cpp 2017-08-17 07:19:14.000000000 +0000 @@ -718,12 +718,12 @@ QVariant t_Device::GetRemaining (t_pDevice pDevice) { - QString Result; - char Buff[10]; - int TotalSeconds; - time_t Now; - int hh, mm, ss; - quint64 Current, Total; + QString Result; + char Buff[20]; + int TotalSeconds; + time_t Now; + unsigned int hh, mm, ss; + quint64 Current, Total; if (!pDevice->Error.Abort() && ((pDevice->State == Acquire) || // Don't display anything if no acquisition is running (pDevice->State == Verify ))) @@ -737,7 +737,7 @@ else { DeviceGetProgress (pDevice, &Current, &Total); - ss = (int) ((double)Total / Current * TotalSeconds); // Estimated total time + ss = (unsigned int) ((double)Total / Current * TotalSeconds); // Estimated total time ss -= TotalSeconds; // Estimated remaining time hh = ss / SECONDS_PER_HOUR; ss %= SECONDS_PER_HOUR; mm = ss / SECONDS_PER_MINUTE; ss %= SECONDS_PER_MINUTE; diff -Nru guymager-0.8.3/threadwrite.cpp guymager-0.8.4/threadwrite.cpp --- guymager-0.8.3/threadwrite.cpp 2016-11-04 08:23:56.000000000 +0000 +++ guymager-0.8.4/threadwrite.cpp 2017-08-17 07:19:14.000000000 +0000 @@ -220,7 +220,7 @@ oFileFlags &= ~O_NOATIME; oFile = open64 (QSTR_TO_PSZ (Filename), oFileFlags, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); } - off64_t FileSize; + off64_t FileSize=0; bool Err = (oFile < 0); if (!Err) Err = ((FileSize = lseek64 (oFile,0,SEEK_END)) == -1); if (!Err) Err = (lseek64 (oFile, 0, SEEK_SET) != 0); @@ -1287,7 +1287,8 @@ { case t_File::EWF : if (CONFIG(EwfFormat) == t_File::AEWF) pOutputFile = new t_OutputFileAEWF(this); - else pOutputFile = new t_OutputFileEWF (this); break; + else pOutputFile = new t_OutputFileEWF (this); + break; case t_File::DD : pOutputFile = new t_OutputFileDD (this); break; case t_File::AAFF: pOutputFile = new t_OutputFileAAFF(this); break; default: CHK_EXIT (ERROR_THREADWRITE_INVALID_FORMAT)