1 diff -ruN stegdetect-0.6.orig/file/Makefile.in stegdetect-0.6/file/Makefile.in
2 --- stegdetect-0.6.orig/file/Makefile.in 2004-08-29 23:11:06.000000000 +0000
3 +++ stegdetect-0.6/file/Makefile.in 2007-02-13 21:46:20.000000000 +0000
6 install-exec: install-exec-am
8 -install-data-am: install-man install-dataDATA
9 +install-data-am: install-dataDATA
10 install-data: install-data-am
13 diff -ruN stegdetect-0.6.orig/file/file.c stegdetect-0.6/file/file.c
14 --- stegdetect-0.6.orig/file/file.c 2004-08-29 23:11:06.000000000 +0000
15 +++ stegdetect-0.6/file/file.c 2007-02-13 21:23:52.000000000 +0000
18 int /* Global command-line options */
20 - debug = 0, /* debugging */
21 + filedebug = 0, /* debugging */
22 lflag = 0, /* follow Symlinks (BSD only) */
23 bflag = 0, /* brief output format */
24 zflag = 0, /* follow (uncompress) compressed files */
25 diff -ruN stegdetect-0.6.orig/file/file.h stegdetect-0.6/file/file.h
26 --- stegdetect-0.6.orig/file/file.h 2004-08-29 23:11:06.000000000 +0000
27 +++ stegdetect-0.6/file/file.h 2007-02-13 21:23:52.000000000 +0000
29 extern struct mlist mlist; /* list of arrays of magic entries */
32 -extern int debug; /* enable debugging? */
33 +extern int filedebug; /* enable debugging? */
34 extern int zflag; /* process compressed files? */
35 extern int lflag; /* follow symbolic links? */
36 extern int sflag; /* read/analyze block special files? */
37 diff -ruN stegdetect-0.6.orig/file/softmagic.c stegdetect-0.6/file/softmagic.c
38 --- stegdetect-0.6.orig/file/softmagic.c 2004-08-29 23:11:06.000000000 +0000
39 +++ stegdetect-0.6/file/softmagic.c 2007-02-13 21:23:52.000000000 +0000
46 mdebug(offset, (char *) p, sizeof(union VALUETYPE));
51 memcpy(p, s + offset, sizeof(union VALUETYPE));
55 mdebug(offset, (char *) p, sizeof(union VALUETYPE));
58 @@ -1029,21 +1029,21 @@
64 (void) fprintf(stderr, "%u == *any* = 1\n", v);
72 (void) fprintf(stderr, "%u != %u = %d\n",
80 (void) fprintf(stderr, "%u == %u = %d\n",
83 @@ -1051,13 +1051,13 @@
85 if (m->flag & UNSIGNED) {
89 (void) fprintf(stderr, "%u > %u = %d\n",
93 matched = (int32) v > (int32) l;
96 (void) fprintf(stderr, "%d > %d = %d\n",
99 @@ -1066,13 +1066,13 @@
101 if (m->flag & UNSIGNED) {
105 (void) fprintf(stderr, "%u < %u = %d\n",
109 matched = (int32) v < (int32) l;
112 (void) fprintf(stderr, "%d < %d = %d\n",
115 @@ -1080,14 +1080,14 @@
118 matched = (v & l) == l;
121 (void) fprintf(stderr, "((%x & %x) == %x) = %d\n",
126 matched = (v & l) != l;
129 (void) fprintf(stderr, "((%x & %x) != %x) = %d\n",
132 diff -ruN stegdetect-0.6.orig/jpeg-6b/makefile.cfg stegdetect-0.6/jpeg-6b/makefile.cfg
133 --- stegdetect-0.6.orig/jpeg-6b/makefile.cfg 2004-08-29 23:11:09.000000000 +0000
134 +++ stegdetect-0.6/jpeg-6b/makefile.cfg 2007-02-13 22:17:27.000000000 +0000
136 # Installation rules:
138 install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@
139 - $(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg
140 - $(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg
141 - $(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran
142 - $(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom
143 - $(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom
144 - $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(mandir)/$(manprefix)cjpeg.$(manext)
145 - $(INSTALL_DATA) $(srcdir)/djpeg.1 $(mandir)/$(manprefix)djpeg.$(manext)
146 - $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(mandir)/$(manprefix)jpegtran.$(manext)
147 - $(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(mandir)/$(manprefix)rdjpgcom.$(manext)
148 - $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(mandir)/$(manprefix)wrjpgcom.$(manext)
150 install-lib: libjpeg.$(A) install-headers
151 $(INSTALL_LIB) libjpeg.$(A) $(libdir)/$(binprefix)libjpeg.$(A)