stegdetect/stegdetect.patch

   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
   4 @@ -423,7 +423,7 @@
   5  install-exec-am:
   6  install-exec: install-exec-am
   7
   8 -install-data-am: install-man install-dataDATA
   9 +install-data-am: install-dataDATA
  10  install-data: install-data-am
  11
  12  install-am: all-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
  16 @@ -76,7 +76,7 @@
  17
  18  int                    /* Global command-line options          */
  19         noprint = 1,
  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
  28 @@ -163,7 +163,7 @@
  29  extern struct mlist mlist;     /* list of arrays of magic entries      */
  30
  31  extern int noprint;
  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
  40 @@ -589,7 +589,7 @@
  41         }
  42
  43
  44 -       if (debug) {
  45 +       if (filedebug) {
  46                 mdebug(offset, (char *) p, sizeof(union VALUETYPE));
  47                 mdump(m);
  48         }
  49 @@ -924,7 +924,7 @@
  50
  51                 memcpy(p, s + offset, sizeof(union VALUETYPE));
  52
  53 -               if (debug) {
  54 +               if (filedebug) {
  55                         mdebug(offset, (char *) p, sizeof(union VALUETYPE));
  56                         mdump(m);
  57                 }
  58 @@ -1029,21 +1029,21 @@
  59
  60         switch (m->reln) {
  61         case 'x':
  62 -               if (debug)
  63 +               if (filedebug)
  64                         (void) fprintf(stderr, "%u == *any* = 1\n", v);
  65                 matched = 1;
  66                 break;
  67
  68         case '!':
  69                 matched = v != l;
  70 -               if (debug)
  71 +               if (filedebug)
  72                         (void) fprintf(stderr, "%u != %u = %d\n",
  73                                        v, l, matched);
  74                 break;
  75
  76         case '=':
  77                 matched = v == l;
  78 -               if (debug)
  79 +               if (filedebug)
  80                         (void) fprintf(stderr, "%u == %u = %d\n",
  81                                        v, l, matched);
  82                 break;
  83 @@ -1051,13 +1051,13 @@
  84         case '>':
  85                 if (m->flag & UNSIGNED) {
  86                         matched = v > l;
  87 -                       if (debug)
  88 +                       if (filedebug)
  89                                 (void) fprintf(stderr, "%u > %u = %d\n",
  90                                                v, l, matched);
  91                 }
  92                 else {
  93                         matched = (int32) v > (int32) l;
  94 -                       if (debug)
  95 +                       if (filedebug)
  96                                 (void) fprintf(stderr, "%d > %d = %d\n",
  97                                                v, l, matched);
  98                 }
  99 @@ -1066,13 +1066,13 @@
 100         case '<':
 101                 if (m->flag & UNSIGNED) {
 102                         matched = v < l;
 103 -                       if (debug)
 104 +                       if (filedebug)
 105                                 (void) fprintf(stderr, "%u < %u = %d\n",
 106                                                v, l, matched);
 107                 }
 108                 else {
 109                         matched = (int32) v < (int32) l;
 110 -                       if (debug)
 111 +                       if (filedebug)
 112                                 (void) fprintf(stderr, "%d < %d = %d\n",
 113                                                v, l, matched);
 114                 }
 115 @@ -1080,14 +1080,14 @@
 116
 117         case '&':
 118                 matched = (v & l) == l;
 119 -               if (debug)
 120 +               if (filedebug)
 121                         (void) fprintf(stderr, "((%x & %x) == %x) = %d\n",
 122                                        v, l, l, matched);
 123                 break;
 124
 125         case '^':
 126                 matched = (v & l) != l;
 127 -               if (debug)
 128 +               if (filedebug)
 129                         (void) fprintf(stderr, "((%x & %x) != %x) = %d\n",
 130                                        v, l, l, matched);
 131                 break;
 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
 135 @@ -194,16 +194,6 @@
 136  # Installation rules:
 137
 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)
 149
 150  install-lib: libjpeg.$(A) install-headers
 151         $(INSTALL_LIB) libjpeg.$(A) $(libdir)/$(binprefix)libjpeg.$(A)