[Forensics-changes] [exifprobe] 02/02: Import Debian changes 2.0.1+git20170416.3c2b769-1

Giovani Augusto Ferreira giovani at moszumanska.debian.org
Tue Aug 29 02:22:47 UTC 2017


This is an automated email from the git hooks/post-receive script.

giovani pushed a commit to branch debian
in repository exifprobe.

commit 33281f4b69bc253de792aedc61dd5d95366a8a6a
Merge: a70dfbc 6d6afdc
Author: Giovani Augusto Ferreira <giovani at debian.org>
Date:   Sat Jul 8 19:36:23 2017 -0300

    Import Debian changes 2.0.1+git20170416.3c2b769-1
    
    exifprobe (2.0.1+git20170416.3c2b769-1) unstable; urgency=medium
    
      * New upstream release: fixed crashes on corrupt file. (Closes: #809365)
      * Updated my email address.
      * debian/control:
          - Bumped Standards-Version to 4.0.0.
      * debian/copyright: updated the packaging copyright years.
      * debian/patches:
          - fix-issues-found-by-afl.patch: removed, the upstream fixed the
            source code. Thanks.
          - fix-makefile.patch: updated to improve GCC hardening.

 .gitignore                                   |   4 +
 .travis.yml                                  |  38 ++++++
 CHANGES_2.0                                  |  21 ++++
 LICENSE.EXIFPROBE                            |   5 +-
 Makefile                                     |   4 +-
 README.md                                    |  18 +++
 aux/dump_section.c                           |  16 +--
 aux/extract_section.c                        |   2 +-
 aux/findjpeg.c                               |   6 +-
 canon_extern.h                               |   2 +
 ciff.c                                       |   7 +-
 debian/changelog                             |  14 +++
 debian/control                               |   4 +-
 debian/copyright                             |   2 +-
 debian/patches/fix-issues-found-by-afl.patch |  67 -----------
 debian/patches/fix-makefile.patch            |  27 ++---
 debian/patches/fix_spelling_error.patch      |  52 ++++-----
 debian/patches/series                        |   1 -
 dngtags.h                                    |  60 ++++++++++
 interpret.c                                  |   5 +-
 jp2000.c                                     |   4 +-
 main.c                                       |  10 +-
 maker_agfa.c                                 |   5 +-
 maker_asahi.c                                |   5 +-
 maker_canon.c                                | 162 +++++++++++++++++++++++++-
 maker_casio.c                                |   3 +-
 maker_epson.c                                |   5 +-
 maker_fujifilm.c                             |  11 ++
 maker_generic.c                              |  19 +--
 maker_hp.c                                   |   1 +
 maker_kodak.c                                |   1 +
 maker_konica.c                               |   1 +
 maker_kyocera.c                              |   1 +
 maker_leica.c                                |   1 +
 maker_minolta.c                              |   5 +-
 maker_nikon.c                                |   9 +-
 maker_olympus.c                              |   7 +-
 maker_panasonic.c                            |   3 +
 maker_ricoh.c                                |   1 +
 maker_sanyo.c                                |   5 +-
 maker_sigma.c                                |   1 +
 maker_sony.c                                 |   1 +
 maker_template                               |   8 +-
 maker_toshiba.c                              |   1 +
 maker_traveler.c                             |   1 +
 misc.c                                       |  45 ++++++-
 misc.h                                       |   7 ++
 options.c                                    |   6 +-
 print.c                                      |  52 ++++++---
 print_maker.c                                |   3 +-
 private_tags.h                               |  21 +++-
 process.c                                    | 130 ++++++++++++++-------
 raf.c                                        |  17 +--
 readfile.c                                   |  30 +++--
 summary.h                                    |   1 +
 tagnames.c                                   |  80 ++++++++++++-
 version.h                                    |   4 +-
 win/README_WIN.txt                           |  52 +++++++++
 win/byteorder.h                              |   1 +
 win/comptime.c                               |   1 +
 win/exifprobe.sln                            |  20 ++++
 win/exifprobe.vcxproj                        | 134 +++++++++++++++++++++
 win/exifprobe.vcxproj.filters                | 168 +++++++++++++++++++++++++++
 win/exifprobe.vcxproj.user                   |   8 ++
 win/getopt.c                                 | 137 ++++++++++++++++++++++
 win/getopt.h                                 |  26 +++++
 win/snprintf.c                               |  16 +++
 win/unistd.h                                 |   0
 x3f.c                                        |  10 +-
 69 files changed, 1334 insertions(+), 261 deletions(-)

diff --cc debian/changelog
index 393efa6,0000000..0367eb8
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,123 -1,0 +1,137 @@@
++exifprobe (2.0.1+git20170416.3c2b769-1) unstable; urgency=medium
++
++  * New upstream release: fixed crashes on corrupt file. (Closes: #809365)
++  * Updated my email address.
++  * debian/control:
++      - Bumped Standards-Version to 4.0.0.
++  * debian/copyright: updated the packaging copyright years.
++  * debian/patches:
++      - fix-issues-found-by-afl.patch: removed, the upstream fixed the
++        source code. Thanks.
++      - fix-makefile.patch: updated to improve GCC hardening.
++
++ -- Giovani Augusto Ferreira <giovani at debian.org>  Sat, 08 Jul 2017 19:36:23 -0300
++
 +exifprobe (2.0.1-11) unstable; urgency=medium
 +
 +  * Update DH level to 10.
 +  * debian/compat: updated to 10.
 +
 + -- Giovani Augusto Ferreira <giovani at riseup.net>  Fri, 16 Dec 2016 22:52:19 -0200
 +
 +exifprobe (2.0.1-10) unstable; urgency=medium
 +
 +  * debian/control:
 +      - Bumped Standards-Version to 3.9.8.
 +  * debian/patches:
 +      - Added the '.patch' extension to all patches.
 +      - fix-manpages.patch: added a typing error correction for exifprobe.1
 +
 + -- Giovani Augusto Ferreira <giovani at riseup.net>  Sat, 24 Sep 2016 19:18:13 -0300
 +
 +exifprobe (2.0.1-9) unstable; urgency=medium
 +
 +  * debian/control: Changed from cgit to git in Vcs-Browser field.
 +  * debian/patches/fix_spelling_error:
 +       - Added a typing error correction for misc.c.
 +  * debian/watch: bumped to version 4.
 +
 + -- Giovani Augusto Ferreira <giovani at riseup.net>  Sun, 20 Mar 2016 22:30:48 -0300
 +
 +exifprobe (2.0.1-8) unstable; urgency=medium
 +
 +  * New upload to try rebuild and fix powerpc.
 +
 + -- Giovani Augusto Ferreira <giovani at riseup.net>  Sun, 06 Mar 2016 11:47:47 -0300
 +
 +exifprobe (2.0.1-7) unstable; urgency=medium
 +
 +  * New co-maintainer. Thanks Eriberto Mota for great work in the last uploads.
 +  * debian/control:
 +      - Bumped Standards-Version to 3.9.7.
 +      - Updated Vcs-* fields.
 +  * debian/copyright:
 +      - Added my name at debian/* block.
 +      - Dropped dot-zero from GPL license short name.
 +
 + -- Giovani Augusto Ferreira <giovani at riseup.net>  Sat, 20 Feb 2016 23:42:09 -0200
 +
 +exifprobe (2.0.1-6) unstable; urgency=medium
 +
 +  * Upload to unstable.
 +  * debian/control: added the Homepage field.
 +  * debian/patches/fix-issues-found-by-afl: added to fix some issues detected
 +      by AFL. (Closes: #779525, #779527)
 +  * debian/watch: pointing to new upstream site.
 +
 + -- Joao Eriberto Mota Filho <eriberto at debian.org>  Thu, 28 May 2015 18:58:35 -0300
 +
 +exifprobe (2.0.1-5) experimental; urgency=medium
 +
 +  * debian/copyright: updated the packaging copyright years.
 +  * debian/patches/fix-embed-build-time: created to fix an issue while building.
 +
 + -- Joao Eriberto Mota Filho <eriberto at debian.org>  Thu, 26 Feb 2015 13:24:54 -0300
 +
 +exifprobe (2.0.1-4) experimental; urgency=medium
 +
 +  * debian/control:
 +      - Improved the long description.
 +      - Removed the erroneous homepage. Currently, the program
 +        hasn't a homepage.
 +  * debian/copyright: removed the erroneous homepage from
 +      Source field. Currently, the program hasn't a homepage.
 +  * debian/watch: updated to use a fake site.
 +
 + -- Joao Eriberto Mota Filho <eriberto at debian.org>  Wed, 29 Oct 2014 15:36:45 -0200
 +
 +exifprobe (2.0.1-3) unstable; urgency=medium
 +
 +  * New maintainer and co-maintainer. Thanks a lot to Martin Albisetti,
 +      the initial maintainer, for your nice work over this package.
 +      (Closes: #738911)
 +  * Migrations:
 +      - Copyright to 1.0 format.
 +      - Debian format from 1.0 to 3.0.
 +      - debian/rules to new (reduced) format.
 +  * debian/control:
 +      - Added the Vcs-* fields to control the Debian packaging.
 +      - Added 'xutils-dev' to Build-Depends field.
 +      - Added the Homepage field.
 +      - Bumped Standards-Version to 3.9.6.
 +      - Removed the reference to upstream homepage from long description.
 +      - Removed the duplicated 'most' word. Thanks to Aputsiaq Janussen
 +        <aj at isit.gl>. (Closes: #641179)
 +      - Updated the short and long description.
 +  * debian/dirs: useless. Removed.
 +  * debian/docs:
 +      - Moved CHANGES_2.0 to new debian/exifprobe.changelog file.
 +      - Removed the LICENSE.EXIFPROBE file.
 +  * debian/patches/:
 +      - Added the 'add_byteorder' and 'Makefile' patches to replace the
 +        direct changes made in upstream code in past.
 +      - Added the 'fix_manpages' and 'fix_spelling_error' patches.
 +      - Added the 'fix-exifgrep' patch. Thanks a lot to Daniel Friesel
 +        <derf at chaosdorf.de>. (Closes: #597123)
 +  * debian/rules: set a special target to install the upstream changelog.
 +      (Closes: #670994)
 +  * debian/watch: added. (Closes: #462040)
 +
 + -- Joao Eriberto Mota Filho <eriberto at debian.org>  Mon, 27 Oct 2014 09:29:00 -0200
 +
 +exifprobe (2.0.1-2) unstable; urgency=medium
 +
 +  * QA upload.
 +  * Updated the DH from 5 to 9.
 +  * debian/control:
 +      - Set Debian QA Group as maintainer (see #738911).
 +      - Updated the Standards-Version from 3.7.2 to 3.9.5.
 +
 + -- Joao Eriberto Mota Filho <eriberto at debian.org>  Sat, 23 Aug 2014 23:49:45 -0300
 +
 +exifprobe (2.0.1-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #428748)
 +  * Fixed Makefile and emailed changes upstream
 +
 + -- Martin Albisetti <argentina at gmail.com>  Wed, 13 Jun 2007 16:31:10 +0100
diff --cc debian/control
index fd354c1,0000000..388422a
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,25 -1,0 +1,25 @@@
 +Source: exifprobe
 +Section: graphics
 +Priority: optional
 +Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
- Uploaders: Giovani Augusto Ferreira <giovani at riseup.net>
++Uploaders: Giovani Augusto Ferreira <giovani at debian.org>
 +Build-Depends: debhelper (>= 10), xutils-dev
- Standards-Version: 3.9.8
++Standards-Version: 4.0.0
 +Homepage: https://github.com/hfiguiere/exifprobe
 +Vcs-Browser: https://anonscm.debian.org/git/forensics/exifprobe.git
 +Vcs-Git: https://anonscm.debian.org/git/forensics/exifprobe.git
 +
 +Package: exifprobe
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Description: read metadata from digital pictures
 + Exifprobe reads image files produced by digital cameras (including
 + several so-called "raw" file formats) and reports the structure of
 + the files and the auxiliary data and metadata contained within them.
 + .
 + In addition to TIFF, JPEG and EXIF, the program understands several
 + formats which may contain "raw" camera data, including MRW, CIFF/CRW,
 + JP2/JPEG2000, RAF, and X3F, as well as most TIFF-derived "raw" formats,
 + including DNG, ORF, CR2, NEF, K25/KDC/DCR and PEF.
 + .
 + This program is useful in forensics investigations.
diff --cc debian/copyright
index 109bdf2,0000000..c5d8a3a
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,52 -1,0 +1,52 @@@
 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 +Upstream-Name: exifprobe
 +Source: https://github.com/hfiguiere/exifprobe
 +
 +Files: *
 +Copyright: Duane H. Hesser <dhh at virtual-cafe.com>
 +License: BSD-2-Clause
 +
 +Files: debian/*
 +Copyright: 2007      Martin Albisetti <argentina at gmail.com>
 +           2014-2015 Joao Eriberto Mota Filho <eriberto at debian.org>
-            2016      Giovani Augusto Ferreira <giovani at riseup.net>
++           2016-2017 Giovani Augusto Ferreira <giovani at debian.org>
 +License: GPL-3+
 +
 +License: BSD-2-Clause
 + Redistribution and use in source and binary forms, with or without
 + modification, are permitted provided that the following conditions
 + are met:
 + 1. Redistributions of source code must retain the above copyright
 +    notice, this list of conditions and the following disclaimer.
 + 2. Redistributions in binary form must reproduce the above copyright
 +    notice, this list of conditions and the following disclaimer in the
 +    documentation and/or other materials provided with the distribution.
 + .
 + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 + A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE HOLDERS OR
 + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 +
 +License: GPL-3+
 + This program is free software: you can redistribute it and/or modify
 + it under the terms of the GNU General Public License as published by
 + the Free Software Foundation, either version 3 of the License, or
 + (at your option) any later version.
 + .
 + This package is distributed in the hope that it will be useful,
 + but WITHOUT ANY WARRANTY; without even the implied warranty of
 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + GNU General Public License for more details.
 + .
 + You should have received a copy of the GNU General Public License
 + along with this program. If not, see <http://www.gnu.org/licenses/>.
 + .
 + On Debian systems, the complete text of the GNU General
 + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --cc debian/patches/fix-makefile.patch
index 3b36651,0000000..9ff05b3
mode 100644,000000..100644
--- a/debian/patches/fix-makefile.patch
+++ b/debian/patches/fix-makefile.patch
@@@ -1,59 -1,0 +1,60 @@@
 +Description: makes Makefile compliant with Debian and add GCC hardening.
 +Author: Martin Albisetti <argentina at gmail.com>
- Last-Update: 2007-06-13
- 
- Index: exifprobe-2.0.1/Makefile
++Reviewed by: Giovani Augusto Ferreira <giovani at debian.org>
++Last-Update: 2017-07-08
++Index: exifprobe-2.0.1+git20170416.3c2b769/Makefile
 +===================================================================
- --- exifprobe-2.0.1.orig/Makefile
- +++ exifprobe-2.0.1/Makefile
- @@ -3,7 +3,7 @@
++--- exifprobe-2.0.1+git20170416.3c2b769.orig/Makefile
+++++ exifprobe-2.0.1+git20170416.3c2b769/Makefile
++@@ -3,7 +3,8 @@
 + 
 + # Any compiler should do
-  CC=cc
- -CFLAGS=-DCOLOR -O 
- +CFLAGS+=-DCOLOR -O 
++ CC?=cc
++-CFLAGS=-DCOLOR -O -std=c99
+++CFLAGS+=-fPIE -DCOLOR -O -std=c99
+++LDFLAGS+=-pie
 + 
 + # You probably don't need these
 + # CFLAGS=-DCOLOR -g -O -Dlint -Wall  -Wno-long-long 
- @@ -22,9 +22,10 @@ CFLAGS=-DCOLOR -O
++@@ -22,10 +23,10 @@ CFLAGS=-DCOLOR -O -std=c99
 + #CFLAGS += -DNATIVE_BYTEORDER_BIGENDIAN     # or add to ./byteorder.h
 + 
 + # On Solaris, you may need to use 'gmake', or edit the next line.
 +-PREFIX ?= /usr/local
 +-BINDIR=$(PREFIX)/bin
 +-MANDIR=$(PREFIX)/man/man1
++-
 ++INSTALL = install -d -m 644
 ++PREFIX ?= $(DESTDIR)/usr
 ++BINDIR=$(PREFIX)/bin/local
 ++MANDIR=$(PREFIX)/share/man/man1
 + 
-  
 + INCLUDES=defs.h extern.h misc.h tifftags.h exiftags.h \
- @@ -63,18 +64,21 @@ byteorder.h:
++ 	tiffeptags.h jpegtags.h global.h
++@@ -63,18 +64,20 @@ byteorder.h:
 + 	@echo 
 + 
 + veclib.o: lib/veclib.c
 +-	$(CC) -o veclib.o -c $(CFLAGS) lib/veclib.c
 ++	$(CC) -o veclib.o -c $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) lib/veclib.c
 + 
 + # Need the math library to calculate some APEX things...
 + exifprobe: $(OBJS) $(INCLUDES) Makefile
 + 	./mkcomptime > comptime.c
 +-	$(CC) -o exifprobe $(CFLAGS) $(OBJS) comptime.c -lm
 ++	$(CC) -o exifprobe $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) $(OBJS) comptime.c -lm
 + 
 + install: all
 +-	cp exifprobe $(BINDIR)
 +-	cp exifgrep $(BINDIR)
 +-	cp exifprobe.1 $(MANDIR)
 +-	cp exifgrep.1 $(MANDIR)
 ++	install -d $(PREFIX)/bin
 ++	install -d $(PREFIX)/share/man/man1
 ++	install -c -m 755 exifprobe $(PREFIX)/bin
 ++	install -c -m 755 exifgrep $(PREFIX)/bin
 ++	install -c -m 644  exifprobe.1 $(PREFIX)/share/man/man1
 ++	install -c -m 644  exifgrep.1 $(PREFIX)/share/man/man1
- +	
 + 
 + # if you want HTML man pages, pick a target; I prefer man2html
 + rman: exifprobe.1 exifgrep.1
diff --cc debian/patches/fix_spelling_error.patch
index d2032a5,0000000..8b294f5
mode 100644,000000..100644
--- a/debian/patches/fix_spelling_error.patch
+++ b/debian/patches/fix_spelling_error.patch
@@@ -1,82 -1,0 +1,82 @@@
 +Description: fix a spelling error in some files.
 +Author: Joao Eriberto Mota Filho <eriberto at debian.org>
-         Giovani Augusto Ferreira <giovani at riseup.net>
- Last-Update: 2016-03-20
- Index: exifprobe-2.0.1/maker_agfa.c
++        Giovani Augusto Ferreira <giovani at debian.org>
++Last-Update: 2017-07-08
++Index: exifprobe-2.0.1+git20170416.3c2b769/maker_agfa.c
 +===================================================================
- --- exifprobe-2.0.1.orig/maker_agfa.c
- +++ exifprobe-2.0.1/maker_agfa.c
- @@ -394,7 +394,7 @@ agfa1_interpret_offset_makervalue(FILE *
++--- exifprobe-2.0.1+git20170416.3c2b769.orig/maker_agfa.c
+++++ exifprobe-2.0.1+git20170416.3c2b769/maker_agfa.c
++@@ -395,7 +395,7 @@ agfa1_interpret_offset_makervalue(FILE *
 +                 switch(value)
 +                 {
 +                     case 0: chpr += printf("Normal"); break;
 +-                    case 1: chpr += printf("Unkown"); break;
 ++                    case 1: chpr += printf("Unknown"); break;
 +                     case 2: chpr += printf("Fast"); break;
 +                     case 3: chpr += printf("Panorama,");
 +                             value = read_ulong(inptr,byteorder,HERE);
- Index: exifprobe-2.0.1/maker_epson.c
++Index: exifprobe-2.0.1+git20170416.3c2b769/maker_epson.c
 +===================================================================
- --- exifprobe-2.0.1.orig/maker_epson.c
- +++ exifprobe-2.0.1/maker_epson.c
- @@ -508,7 +508,7 @@ epson1_interpret_offset_makervalue(FILE
++--- exifprobe-2.0.1+git20170416.3c2b769.orig/maker_epson.c
+++++ exifprobe-2.0.1+git20170416.3c2b769/maker_epson.c
++@@ -509,7 +509,7 @@ epson1_interpret_offset_makervalue(FILE
 +                 switch(value)
 +                 {
 +                     case 0: chpr += printf("Normal"); break;
 +-                    case 1: chpr += printf("Unkown"); break;
 ++                    case 1: chpr += printf("Unknown"); break;
 +                     case 2: chpr += printf("Fast"); break;
 +                     case 3: chpr += printf("Panorama,");
 +                             value = read_ulong(inptr,byteorder,HERE);
- Index: exifprobe-2.0.1/maker_minolta.c
++Index: exifprobe-2.0.1+git20170416.3c2b769/maker_minolta.c
 +===================================================================
- --- exifprobe-2.0.1.orig/maker_minolta.c
- +++ exifprobe-2.0.1/maker_minolta.c
- @@ -596,7 +596,7 @@ minolta1_interpret_offset_makervalue(FIL
++--- exifprobe-2.0.1+git20170416.3c2b769.orig/maker_minolta.c
+++++ exifprobe-2.0.1+git20170416.3c2b769/maker_minolta.c
++@@ -597,7 +597,7 @@ minolta1_interpret_offset_makervalue(FIL
 +                 switch(value)
 +                 {
 +                     case 0: chpr += printf("Normal"); break;
 +-                    case 1: chpr += printf("Unkown"); break;
 ++                    case 1: chpr += printf("Unknown"); break;
 +                     case 2: chpr += printf("Fast"); break;
 +                     case 3: chpr += printf("Panorama,");
 +                             value = read_ulong(inptr,byteorder,HERE);
- Index: exifprobe-2.0.1/maker_olympus.c
++Index: exifprobe-2.0.1+git20170416.3c2b769/maker_olympus.c
 +===================================================================
- --- exifprobe-2.0.1.orig/maker_olympus.c
- +++ exifprobe-2.0.1/maker_olympus.c
- @@ -464,7 +464,7 @@ olympus1_interpret_offset_makervalue(FIL
++--- exifprobe-2.0.1+git20170416.3c2b769.orig/maker_olympus.c
+++++ exifprobe-2.0.1+git20170416.3c2b769/maker_olympus.c
++@@ -465,7 +465,7 @@ olympus1_interpret_offset_makervalue(FIL
 +                 switch(value)
 +                 {
 +                     case 0: chpr += printf("Normal"); break;
 +-                    case 1: chpr += printf("Unkown"); break;
 ++                    case 1: chpr += printf("Unknown"); break;
 +                     case 2: chpr += printf("Fast"); break;
 +                     case 3: chpr += printf("Panorama,"); 
 +                             value = read_ulong(inptr,byteorder,HERE);
- Index: exifprobe-2.0.1/maker_sanyo.c
++Index: exifprobe-2.0.1+git20170416.3c2b769/maker_sanyo.c
 +===================================================================
- --- exifprobe-2.0.1.orig/maker_sanyo.c
- +++ exifprobe-2.0.1/maker_sanyo.c
- @@ -605,7 +605,7 @@ sanyo1_interpret_offset_makervalue(FILE
++--- exifprobe-2.0.1+git20170416.3c2b769.orig/maker_sanyo.c
+++++ exifprobe-2.0.1+git20170416.3c2b769/maker_sanyo.c
++@@ -606,7 +606,7 @@ sanyo1_interpret_offset_makervalue(FILE
 +                 switch(value)
 +                 {
 +                     case 0: chpr += printf("Normal"); break;
 +-                    case 1: chpr += printf("Unkown"); break;
 ++                    case 1: chpr += printf("Unknown"); break;
 +                     case 2: chpr += printf("Fast"); break;
 +                     case 3: chpr += printf("Panorama,");
 +                             value = read_ulong(inptr,byteorder,HERE);
- Index: exifprobe-2.0.1/misc.c
++Index: exifprobe-2.0.1+git20170416.3c2b769/misc.c
 +===================================================================
- --- exifprobe-2.0.1.orig/misc.c
- +++ exifprobe-2.0.1/misc.c
- @@ -853,7 +853,7 @@ tiff_compression_string(unsigned long co
++--- exifprobe-2.0.1+git20170416.3c2b769.orig/misc.c
+++++ exifprobe-2.0.1+git20170416.3c2b769/misc.c
++@@ -887,7 +887,7 @@ tiff_compression_string(unsigned long co
 +         /* will be 0 only if compression tag does not appear                     */
 +         case 0: compression = "unknown format"; break;
 +         case 1: compression = "uncompressed"; break;    /* TIFF6/TIFF_EP         */
 +-        case 2: compression = "Modifed Huffman RLE compressed"; break; /* TIFF6  */
 ++        case 2: compression = "Modified Huffman RLE compressed"; break; /* TIFF6  */
 +         case 3: compression = "T4 fax encoded"; break;  /* TIFF6                 */
 +         case 4: compression = "T6 fax encoded"; break;  /* TIFF6                 */
 +         case 5: compression = "LZW compressed"; break;  /* TIFF6                 */
diff --cc debian/patches/series
index c9d822a,0000000..e300581
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,6 @@@
- fix-issues-found-by-afl.patch
 +fix-exifgrep.patch
 +fix-manpages.patch
 +fix_spelling_error.patch
 +add_byteorder.patch
 +fix-makefile.patch
 +fix-embed-build-time.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/exifprobe.git



More information about the forensics-changes mailing list