Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-04-18 21:00:56 +02:00
Code Issues Projects Releases Wiki Activity

qa fixes to origami, data-carver-processors and stegdetect

Browse source
This commit is contained in:
jensp 2010-01-31 19:42:05 +00:00
parent e232c951cf
commit 87932ddb97
9 changed files with 4014 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app-forensics/data-carver-processors/Manifest
View file

@ -1,3 +1,3 @@
AUX image-processor 327 RMD160 a36579f8ed9b9fcc47f8d78a9e301e43c6d56a9f SHA1 b74ee94602d3bafed6e7faa76e7acef87a623516 SHA256 7df8c6a9a8e39bbaa238d438712f293185d88d2f0923ab92ee5819316ec7af02
AUX image-processor 329 RMD160 587c0ea7885c4f0c944f151567f33492829b93ac SHA1 181fffcfd9d8b2bf2c40538f24580ed63f95a835 SHA256 1ef21a8ad009af37f50277d86bc9311c46a8687e9375ee24abb78eb446ac10ad
DIST data_carver_processors.tar.gz 12694 RMD160 a3765ec54aa36eaea449722a932b0494a241e02f SHA1 4388e5ddef8a994458cf1da38adeb27cc6205aa1 SHA256 7b6918bb2e00f7cfb209d8ba0961f2fcbe967b8218f0e9fc9f13d5ef191db1f0
EBUILD data-carver-processors-0.ebuild 990 RMD160 c0a429d76b14eaec5ee5ac0835aa36d3a3ce5ce7 SHA1 faa5ece82d8c3fb53bfe03d6f9767b904889a630 SHA256 6d366aa8b1ae0245107a3aceb169c939e864c2d1ff359161f08ecffca3a226ab
EBUILD data-carver-processors-0.ebuild 990 RMD160 26a5fcb8d356bc7924ef187a7ae60dd1a603d580 SHA1 355fe8d137ff970184bf8a1819f5372bbc1f457b SHA256 f7f15eb2e5b53ed1d21e42f96223f820a88bc244143ab07b36789c053baa5efa

2
app-forensics/data-carver-processors/data-carver-processors-0.ebuild
View file

@ -1,4 +1,4 @@
# Copyright 1999-2005 Gentoo Foundation
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $

2
app-forensics/origami/Manifest
View file

@ -1,4 +1,4 @@
AUX origami 64 RMD160 63ff10c1c294e37aa9819fa1e8260f6cf77ff3c2 SHA1 febb5a219fa746192e9d40f15e3c6a5151500e63 SHA256 89c8cfc873764c8abf03197dbb07d190757a5a4b4d51ddbdb5830544848ca9ac
AUX origami-gui 53 RMD160 31446d4e4c57fc4fc148a76a3eb53938c2103760 SHA1 953b5c2f6d7d4ceb75c71e2093016878acdd67e8 SHA256 32290a24f8303f2dc7652959d43c8449c5d2224675e10d2f658c99d764aed757
DIST origami-1.0.0-beta1b.tar.gz 2804807 RMD160 cca690ce87e4b611f9d9b4c7bc27d2d0d90c61c3 SHA1 12585cc4f152a3ca171a18038514812989149085 SHA256 2835cf1b6c7ac1c9ca03f1e121ebc468cc1921a1cd4e7dc5c4ed42844c9a799c
EBUILD origami-1.0.0_beta.ebuild 795 RMD160 3b6f40c3c6cbde712e8d89df6159e0e3acc5e0f4 SHA1 e8321427395d06bf7676ec86912b008d1a3bc5ab SHA256 a731d79fa23878f1db87648df6ad81bb42c90bea3646ab9cf62d4f6d533ea556
EBUILD origami-1.0.0_beta.ebuild 795 RMD160 05ae68d1e8731161a9f02771f06697699fb75e3f SHA1 7fcd994ef2d56e8f8a270fe8615a4ddbaa3232f4 SHA256 a98b6d49d15243e8cdb63700d25aa91be573b91eb2495013bc12d635aadda698

2
app-forensics/origami/origami-1.0.0_beta.ebuild
View file

@ -1,4 +1,4 @@
# Copyright 1999-2008 Gentoo Foundation
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: Exp $

5
app-forensics/stegdetect/Manifest
View file

@ -1,3 +1,6 @@
AUX debian-stegdetect.patch 104866 RMD160 82a86255b4c6e1f321efb5f955ac11768499a6cf SHA1 3507b69b736ca6fa5ad8774224e29d0f3d97bdea SHA256 1e9dff6c028ce0004984de090784dd42f40ac233fa53295c5d3bb63466502a5c
AUX stegdetect-0.6.patch 7344 RMD160 43b6140830ff689608824a5161139b5a61c437fe SHA1 fbc613964cbf8c60a468ddf91ce49ee7f7ed88f4 SHA256 6b42e8fabf978414800c783588c9bcf7d4b08b2b3dc3cd57dce4b4864f70489b
AUX stegdetect-fixes.patch 8370 RMD160 7817ff3418dc89a0691a6d0205175f4797247242 SHA1 a3619331a6b667c87cc0eaecf4f418ab277a32fb SHA256 833bac80b336a367ac1a9876dc677b3dbeff0979362679e4bc403ead2d549473
AUX stegdetect-fixes.patch~ 8370 RMD160 7817ff3418dc89a0691a6d0205175f4797247242 SHA1 a3619331a6b667c87cc0eaecf4f418ab277a32fb SHA256 833bac80b336a367ac1a9876dc677b3dbeff0979362679e4bc403ead2d549473
DIST stegdetect-0.6.tar.gz 1269001 RMD160 7db7310bc37cd6d38c73ca641649bedde305cae4 SHA1 c303bde8afe411d58e57b92af014703dfa04a913 SHA256 71149fc9fc58c44a49a38c7013d22d8a861e45acb1074b6c3004b314c8e81a8d
EBUILD stegdetect-0.6.ebuild 684 RMD160 a0ad891ee5fa7eddaa66249e38d5112240868b6a SHA1 c3f07be36e8b8f861d0d3493f5dc0bea09704769 SHA256 48c0a5c2a82deace9bd6d0e877d56805b6c21a543a43962c1e3b69cf77368cd7
EBUILD stegdetect-0.6.ebuild 861 RMD160 9ab2c4b7a7a63dc4f5dd6fa002eab201d25930de SHA1 8f88a661738db39d8fd721d054f2e4fedd9e6289 SHA256 b92add18bb667df54abf413a984e6f70157c419780bf7a62332795f2604bf7e8

3356
app-forensics/stegdetect/files/debian-stegdetect.patch Normal file
View file

File diff suppressed because it is too large Load diff

317
app-forensics/stegdetect/files/stegdetect-fixes.patch Normal file
View file

@ -0,0 +1,317 @@
--- stegdetect-0.6/stegdetect.c 2010-01-31 20:08:52.156378849 +0100
+++ stegdetect-0.6/stegdetect.c 2010-01-31 20:12:42.045646715 +0100
@@ -78,7 +78,7 @@
float DCThist[257];
float scale = 1; /* Sensitivity scaling */
-int debug = 0;
+int _debug = 0;
static int quiet = 0;
static int ispositive = 0; /* Current images contain stego */
static char *transformname; /* Current transform name */
@@ -135,7 +135,7 @@
sum = count = 0;
for (i = x; i < y; i++) {
if ((i & ~63) == i) {
- if (debug & DBG_PRINTONES)
+ if (_debug & DBG_PRINTONES)
fprintf(stdout, "%d] %d\n", i, count);
sum += count;
count = 0;
@@ -159,7 +159,7 @@
DCThist[off + 128]++;
}
- if (debug & DBG_PRINTHIST) {
+ if (_debug & DBG_PRINTHIST) {
for (i = 0; i < 256; i++) {
fprintf(stdout, "%4d: %8.1f\n", i - 128, DCThist[i]);
}
@@ -291,7 +291,7 @@
*/
if ((fbar > f/4) &&
((f - f/3) - (fbar + f/3) > 0)) {
- if ((debug & DBG_CHIDIFF) && (one || two))
+ if ((_debug & DBG_CHIDIFF) && (one || two))
fprintf(stdout,
"%4d: %8.3f - %8.3f skipped (%f)\n",
i*2 - 128,
@@ -356,7 +356,7 @@
ymt += DCTobs[i];
ytt += DCTtheo[i];
- if (debug & DBG_CHIDIFF) {
+ if (_debug & DBG_CHIDIFF) {
if (DCTobs[i] || DCTtheo[i])
fprintf(stdout, "%4d: %8.3f - %8.3f\n", i,
DCTobs[i],
@@ -368,7 +368,7 @@
chi = ymt - ytt;
- if (debug & DBG_CHICALC) {
+ if (_debug & DBG_CHICALC) {
fprintf(stdout,
" (%8.3f - %8.3f)^2 = %8.3f / %8.3f = %8.3f | %8.3f\n",
ymt, ytt,
@@ -388,7 +388,7 @@
f = 1 - chi2cdf(sumchi, dgf - 1);
- if (debug & DBG_CHIEND) {
+ if (_debug & DBG_CHIEND) {
fprintf(stdout,
"Categories: %d, Chi: %f, Q: %f, dis: %f -> %f\n",
dgf, sumchi, f, discard, f * (1 - discard));
@@ -435,7 +435,7 @@
while (_iteration < (imaxiter))
#define BINSEARCH_NEXT(thresh) \
- if (debug & DBG_BINSRCH) \
+ if (_debug & DBG_BINSRCH) \
fprintf(stdout, "sum: %f, percent: %f, good: %f\n", \
sum, percent, _good); \
if (_iteration == 0) { \
@@ -481,7 +481,7 @@
break;
if (f > 0.4)
sum += f * percent;
- if ((debug & DBG_CHI) && f != 0)
+ if ((_debug & DBG_CHI) && f != 0)
fprintf(stdout, "%04f[:] %8.5f%% %f\n",
i, f * 100, sum);
}
@@ -491,7 +491,7 @@
BINSEARCH_IFABORT(end) {
abort:
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout,
"Accumulation: no detection possible\n");
return (-1);
@@ -528,8 +528,8 @@
}
}
- if ((debug & DBG_CHI) &&
- ((debug & DBG_PRINTZERO) || f != 0))
+ if ((_debug & DBG_CHI) &&
+ ((_debug & DBG_PRINTZERO) || f != 0))
fprintf(stdout, "%04f: %8.5f%%\n",
i, f * 100);
}
@@ -537,7 +537,7 @@
length = jsteg_size(data, bits, NULL);
minlen = where/8;
maxlen = (where + percent)/8;
- if (debug & DBG_ENDVAL) {
+ if (_debug & DBG_ENDVAL) {
fprintf(stdout,
"Accumulation (%d): %f%% - %f (%f) (%d:%d - %d)\n",
(int)percent,
@@ -596,7 +596,7 @@
f = chi2test(data, bits, unify_false_outguess,
off - range, off + range);
sum += f;
- if ((debug & DBG_CHI) && f != 0)
+ if ((_debug & DBG_CHI) && f != 0)
fprintf(stdout, "%04d[:] %8.5f%%\n",
i, f * 100);
}
@@ -618,8 +618,8 @@
sum += f;
if (f > 0.001)
count++;
- if ((debug & DBG_CHI) &&
- ((debug & DBG_PRINTZERO) || f != 0))
+ if ((_debug & DBG_CHI) &&
+ ((_debug & DBG_PRINTZERO) || f != 0))
fprintf(stdout, "%04d: %8.5f%%\n", i, f * 100);
}
@@ -631,7 +631,7 @@
norm = sum / norm_outguess[off];
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout,
"Accumulation (%4.1f%%): %8.3f%% (%8.3f%%) (%4.1f)\n",
percent,
@@ -714,7 +714,7 @@
else if (sum >= 15 && res <= -1)
negative = 1;
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
printf("Zero/One: %d : %d -> %5.1f%s\n",
one, zero, (float)res/2, negative ? " **" : "");
@@ -740,7 +740,7 @@
(!DCThist[i] || !DCThist[i+1]))
res++;
}
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
printf("Empty pairs: %d\n", res);
if (res > 3)
return (1);
@@ -770,7 +770,7 @@
buildDCTreset();
f = chi2test(data, bits, unify_jphide, 0, jphpos[0]);
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "Pos[0]: %04d: %8.5f%%\n", jphpos[0], f*100);
/* If JPhide was used, we should get a high value at this position */
@@ -793,7 +793,7 @@
false = 0;
f2 = chi2test(data, bits, unify_false_jphide, 0, jphpos[0]);
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "Pos[0]: %04d[:] %8.5f%%: %8.5f%%\n",
jphpos[0], f2*100, (f2 - f)*100);
@@ -802,13 +802,13 @@
return (0);
f = chi2test(data, bits, unify_jphide, jphpos[0]/2, jphpos[0]);
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "Pos[0]/2: %04d: %8.5f%%\n", jphpos[0], f*100);
if (f < 0.9)
return (0);
f2 = chi2test(data, bits, unify_false_jphide, jphpos[0]/2, jphpos[0]);
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "Pos[0]/2: %04d[:] %8.5f%%: %8.5f%%\n",
jphpos[0], f2*100, (f2 - f)*100);
if (f2 * 0.95 > f)
@@ -816,7 +816,7 @@
f = chi2test(data, bits, unify_jphide, 0, jphpos[0]/2);
f2 = chi2test(data, bits, unify_false_jphide, 0, jphpos[0]/2);
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "0->1/2: %04d[:] %8.5f%% %8.5f%%\n",
jphpos[0], f*100, f2*100);
@@ -864,8 +864,8 @@
else if (f < 0.2)
break;
- if ((debug & DBG_CHI) &&
- ((debug & DBG_PRINTZERO) || f != 0))
+ if ((_debug & DBG_CHI) &&
+ ((_debug & DBG_PRINTZERO) || f != 0))
fprintf(stdout, "%04d: %8.5f%% %8.5f%% %.2f %.2f %s\n",
i, f * 100, f2*100, sum, false,
(i <= jphpos[0] && f2*0.99 > f) ||
@@ -876,7 +876,7 @@
sum /= 1000;
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "Accumulation (neg = %d, %d): %f%% [%d]\n",
negative, range, sum * 100, jphpos[1]);
@@ -913,7 +913,7 @@
sum += f;
else if (f < 0.2)
break;
- if ((debug & DBG_CHI) && f != 0)
+ if ((_debug & DBG_CHI) && f != 0)
fprintf(stdout, "%04d[:] %8.5f%%\n",
i, f * 100);
}
@@ -939,12 +939,12 @@
else if (f < 0.2)
break;
- if ((debug & DBG_CHI) &&
- ((debug & DBG_PRINTZERO) || f != 0))
+ if ((_debug & DBG_CHI) &&
+ ((_debug & DBG_PRINTZERO) || f != 0))
fprintf(stdout, "%04d: %8.5f%%\n", i, f * 100);
}
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "Accumulation (%4.0f): %f%%\n",
percent,
sum * 100);
@@ -1277,7 +1277,7 @@
if (jdcts != NULL)
free(jdcts);
scans = 0;
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout,
"Disabled by comment check: %d\n",
ncomments);
@@ -1291,7 +1291,7 @@
if (jdcts != NULL)
free(jdcts);
scans = 0;
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout,
"Disabled by header check: %d.%d %#0x\n",
major, minor, marker);
@@ -1580,7 +1580,7 @@
detect(line, scans);
}
- if (debug & FLAG_JPHIDESTAT) {
+ if (_debug & FLAG_JPHIDESTAT) {
fprintf(stdout, "Positive rejected because of\n"
"\tRunlength: %d\n"
"\tZero-One: %d\n"
--- stegdetect-0.6/xsteg.c 2010-01-31 20:14:02.437386310 +0100
+++ stegdetect-0.6/xsteg.c 2010-01-31 20:23:00.515636700 +0100
@@ -56,9 +56,6 @@
#define FLAG_DOINVIS 0x0008
#define FLAG_DOF5 0x0010
-extern int (*event_sigcb)(void);
-extern int event_gotsig;
-
struct event start_ev;
struct event gtk_ev;
int quit = 0;
@@ -743,11 +740,6 @@
sigaddset(&set, SIGCHLD);
sigprocmask(SIG_BLOCK, &set, &oldset);
- while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
- if (WIFEXITED(status) || WIFSIGNALED(status))
- event_gotsig = 1;
- }
-
signal(SIGCHLD, chld_handler);
sigemptyset(&set);
@@ -1106,7 +1098,6 @@
gtk_widget_show(window);
event_init();
- event_sigcb = signal_cb;
add_gtk_timeout();
--- stegdetect-0.6/stegdetect.c 2010-01-31 20:35:59.974402726 +0100
+++ stegdetect-0.6/stegdetect.c 2010-01-31 20:36:17.355651655 +0100
@@ -1478,7 +1478,7 @@
fprintf(stdout, "Stegdetect Version %s\n", VERSION);
exit(1);
case 'd':
- debug = atoi(optarg);
+ _debug = atoi(optarg);
break;
case 't':
scans = 0;

317
app-forensics/stegdetect/files/stegdetect-fixes.patch~ Normal file
View file

@ -0,0 +1,317 @@
--- stegdetect-0.6/stegdetect.c 2010-01-31 20:08:52.156378849 +0100
+++ stegdetect-0.6/stegdetect.c 2010-01-31 20:12:42.045646715 +0100
@@ -78,7 +78,7 @@
float DCThist[257];
float scale = 1; /* Sensitivity scaling */
-int debug = 0;
+int _debug = 0;
static int quiet = 0;
static int ispositive = 0; /* Current images contain stego */
static char *transformname; /* Current transform name */
@@ -135,7 +135,7 @@
sum = count = 0;
for (i = x; i < y; i++) {
if ((i & ~63) == i) {
- if (debug & DBG_PRINTONES)
+ if (_debug & DBG_PRINTONES)
fprintf(stdout, "%d] %d\n", i, count);
sum += count;
count = 0;
@@ -159,7 +159,7 @@
DCThist[off + 128]++;
}
- if (debug & DBG_PRINTHIST) {
+ if (_debug & DBG_PRINTHIST) {
for (i = 0; i < 256; i++) {
fprintf(stdout, "%4d: %8.1f\n", i - 128, DCThist[i]);
}
@@ -291,7 +291,7 @@
*/
if ((fbar > f/4) &&
((f - f/3) - (fbar + f/3) > 0)) {
- if ((debug & DBG_CHIDIFF) && (one || two))
+ if ((_debug & DBG_CHIDIFF) && (one || two))
fprintf(stdout,
"%4d: %8.3f - %8.3f skipped (%f)\n",
i*2 - 128,
@@ -356,7 +356,7 @@
ymt += DCTobs[i];
ytt += DCTtheo[i];
- if (debug & DBG_CHIDIFF) {
+ if (_debug & DBG_CHIDIFF) {
if (DCTobs[i] || DCTtheo[i])
fprintf(stdout, "%4d: %8.3f - %8.3f\n", i,
DCTobs[i],
@@ -368,7 +368,7 @@
chi = ymt - ytt;
- if (debug & DBG_CHICALC) {
+ if (_debug & DBG_CHICALC) {
fprintf(stdout,
" (%8.3f - %8.3f)^2 = %8.3f / %8.3f = %8.3f | %8.3f\n",
ymt, ytt,
@@ -388,7 +388,7 @@
f = 1 - chi2cdf(sumchi, dgf - 1);
- if (debug & DBG_CHIEND) {
+ if (_debug & DBG_CHIEND) {
fprintf(stdout,
"Categories: %d, Chi: %f, Q: %f, dis: %f -> %f\n",
dgf, sumchi, f, discard, f * (1 - discard));
@@ -435,7 +435,7 @@
while (_iteration < (imaxiter))
#define BINSEARCH_NEXT(thresh) \
- if (debug & DBG_BINSRCH) \
+ if (_debug & DBG_BINSRCH) \
fprintf(stdout, "sum: %f, percent: %f, good: %f\n", \
sum, percent, _good); \
if (_iteration == 0) { \
@@ -481,7 +481,7 @@
break;
if (f > 0.4)
sum += f * percent;
- if ((debug & DBG_CHI) && f != 0)
+ if ((_debug & DBG_CHI) && f != 0)
fprintf(stdout, "%04f[:] %8.5f%% %f\n",
i, f * 100, sum);
}
@@ -491,7 +491,7 @@
BINSEARCH_IFABORT(end) {
abort:
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout,
"Accumulation: no detection possible\n");
return (-1);
@@ -528,8 +528,8 @@
}
}
- if ((debug & DBG_CHI) &&
- ((debug & DBG_PRINTZERO) || f != 0))
+ if ((_debug & DBG_CHI) &&
+ ((_debug & DBG_PRINTZERO) || f != 0))
fprintf(stdout, "%04f: %8.5f%%\n",
i, f * 100);
}
@@ -537,7 +537,7 @@
length = jsteg_size(data, bits, NULL);
minlen = where/8;
maxlen = (where + percent)/8;
- if (debug & DBG_ENDVAL) {
+ if (_debug & DBG_ENDVAL) {
fprintf(stdout,
"Accumulation (%d): %f%% - %f (%f) (%d:%d - %d)\n",
(int)percent,
@@ -596,7 +596,7 @@
f = chi2test(data, bits, unify_false_outguess,
off - range, off + range);
sum += f;
- if ((debug & DBG_CHI) && f != 0)
+ if ((_debug & DBG_CHI) && f != 0)
fprintf(stdout, "%04d[:] %8.5f%%\n",
i, f * 100);
}
@@ -618,8 +618,8 @@
sum += f;
if (f > 0.001)
count++;
- if ((debug & DBG_CHI) &&
- ((debug & DBG_PRINTZERO) || f != 0))
+ if ((_debug & DBG_CHI) &&
+ ((_debug & DBG_PRINTZERO) || f != 0))
fprintf(stdout, "%04d: %8.5f%%\n", i, f * 100);
}
@@ -631,7 +631,7 @@
norm = sum / norm_outguess[off];
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout,
"Accumulation (%4.1f%%): %8.3f%% (%8.3f%%) (%4.1f)\n",
percent,
@@ -714,7 +714,7 @@
else if (sum >= 15 && res <= -1)
negative = 1;
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
printf("Zero/One: %d : %d -> %5.1f%s\n",
one, zero, (float)res/2, negative ? " **" : "");
@@ -740,7 +740,7 @@
(!DCThist[i] || !DCThist[i+1]))
res++;
}
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
printf("Empty pairs: %d\n", res);
if (res > 3)
return (1);
@@ -770,7 +770,7 @@
buildDCTreset();
f = chi2test(data, bits, unify_jphide, 0, jphpos[0]);
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "Pos[0]: %04d: %8.5f%%\n", jphpos[0], f*100);
/* If JPhide was used, we should get a high value at this position */
@@ -793,7 +793,7 @@
false = 0;
f2 = chi2test(data, bits, unify_false_jphide, 0, jphpos[0]);
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "Pos[0]: %04d[:] %8.5f%%: %8.5f%%\n",
jphpos[0], f2*100, (f2 - f)*100);
@@ -802,13 +802,13 @@
return (0);
f = chi2test(data, bits, unify_jphide, jphpos[0]/2, jphpos[0]);
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "Pos[0]/2: %04d: %8.5f%%\n", jphpos[0], f*100);
if (f < 0.9)
return (0);
f2 = chi2test(data, bits, unify_false_jphide, jphpos[0]/2, jphpos[0]);
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "Pos[0]/2: %04d[:] %8.5f%%: %8.5f%%\n",
jphpos[0], f2*100, (f2 - f)*100);
if (f2 * 0.95 > f)
@@ -816,7 +816,7 @@
f = chi2test(data, bits, unify_jphide, 0, jphpos[0]/2);
f2 = chi2test(data, bits, unify_false_jphide, 0, jphpos[0]/2);
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "0->1/2: %04d[:] %8.5f%% %8.5f%%\n",
jphpos[0], f*100, f2*100);
@@ -864,8 +864,8 @@
else if (f < 0.2)
break;
- if ((debug & DBG_CHI) &&
- ((debug & DBG_PRINTZERO) || f != 0))
+ if ((_debug & DBG_CHI) &&
+ ((_debug & DBG_PRINTZERO) || f != 0))
fprintf(stdout, "%04d: %8.5f%% %8.5f%% %.2f %.2f %s\n",
i, f * 100, f2*100, sum, false,
(i <= jphpos[0] && f2*0.99 > f) ||
@@ -876,7 +876,7 @@
sum /= 1000;
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "Accumulation (neg = %d, %d): %f%% [%d]\n",
negative, range, sum * 100, jphpos[1]);
@@ -913,7 +913,7 @@
sum += f;
else if (f < 0.2)
break;
- if ((debug & DBG_CHI) && f != 0)
+ if ((_debug & DBG_CHI) && f != 0)
fprintf(stdout, "%04d[:] %8.5f%%\n",
i, f * 100);
}
@@ -939,12 +939,12 @@
else if (f < 0.2)
break;
- if ((debug & DBG_CHI) &&
- ((debug & DBG_PRINTZERO) || f != 0))
+ if ((_debug & DBG_CHI) &&
+ ((_debug & DBG_PRINTZERO) || f != 0))
fprintf(stdout, "%04d: %8.5f%%\n", i, f * 100);
}
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout, "Accumulation (%4.0f): %f%%\n",
percent,
sum * 100);
@@ -1277,7 +1277,7 @@
if (jdcts != NULL)
free(jdcts);
scans = 0;
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout,
"Disabled by comment check: %d\n",
ncomments);
@@ -1291,7 +1291,7 @@
if (jdcts != NULL)
free(jdcts);
scans = 0;
- if (debug & DBG_ENDVAL)
+ if (_debug & DBG_ENDVAL)
fprintf(stdout,
"Disabled by header check: %d.%d %#0x\n",
major, minor, marker);
@@ -1580,7 +1580,7 @@
detect(line, scans);
}
- if (debug & FLAG_JPHIDESTAT) {
+ if (_debug & FLAG_JPHIDESTAT) {
fprintf(stdout, "Positive rejected because of\n"
"\tRunlength: %d\n"
"\tZero-One: %d\n"
--- stegdetect-0.6/xsteg.c 2010-01-31 20:14:02.437386310 +0100
+++ stegdetect-0.6/xsteg.c 2010-01-31 20:23:00.515636700 +0100
@@ -56,9 +56,6 @@
#define FLAG_DOINVIS 0x0008
#define FLAG_DOF5 0x0010
-extern int (*event_sigcb)(void);
-extern int event_gotsig;
-
struct event start_ev;
struct event gtk_ev;
int quit = 0;
@@ -743,11 +740,6 @@
sigaddset(&set, SIGCHLD);
sigprocmask(SIG_BLOCK, &set, &oldset);
- while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
- if (WIFEXITED(status) || WIFSIGNALED(status))
- event_gotsig = 1;
- }
-
signal(SIGCHLD, chld_handler);
sigemptyset(&set);
@@ -1106,7 +1098,6 @@
gtk_widget_show(window);
event_init();
- event_sigcb = signal_cb;
add_gtk_timeout();
--- stegdetect-0.6/stegdetect.c 2010-01-31 20:35:59.974402726 +0100
+++ stegdetect-0.6/stegdetect.c 2010-01-31 20:36:17.355651655 +0100
@@ -1478,7 +1478,7 @@
fprintf(stdout, "Stegdetect Version %s\n", VERSION);
exit(1);
case 'd':
- debug = atoi(optarg);
+ _debug = atoi(optarg);
break;
case 't':
scans = 0;

20
app-forensics/stegdetect/stegdetect-0.6.ebuild
View file

@ -1,11 +1,12 @@
# Copyright 1999-2005 Gentoo Foundation
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=2
NEED_AUTOMAKE="1.4"
inherit autotools eutils
inherit eutils flag-o-matic
DESCRIPTION="A Steganography detector for JPEG"
HOMEPAGE="http://www.outguess.org/"
@ -13,7 +14,7 @@ SRC_URI="http://www.outguess.org/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86"
KEYWORDS="~x86 ~amd64"
IUSE="X"
RDEPEND="sys-apps/file
@ -21,9 +22,18 @@ RDEPEND="sys-apps/file
X? ( x11-libs/gtk+:1 )"
DEPEND="${RDEPEND}"
src_compile(){
epatch ${FILESDIR}/${P}.patch
src_prepare() {
epatch "${FILESDIR}"/${P}.patch
epatch "${FILESDIR}"/debian-stegdetect.patch
epatch "${FILESDIR}"/stegdetect-fixes.patch
}
src_configure() {
filter-ldflags -Wl,--as-needed
./configure
}
src_compile() {
emake || die "make failed"
}