debian/0000775000000000000000000000000012252027655007176 5ustar debian/libjpeg62-dev.files0000664000000000000000000000011212252027556012554 0ustar usr/include usr/lib/*/libjpeg.a usr/lib/*/libjpeg.la usr/lib/*/libjpeg.so debian/copyright0000664000000000000000000001142712252027556011136 0ustar This is Debian's prepackaged version of the `jpeg library' by the Independent JPEG Group. This package was created by Bill Allombert from sources which can be found at http://www.ijg.org/files/jpegsrc.v6b1.tar.gz. Package for version 6b was created by Mark Mickan from sources which can be found at ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz It is partly based on the libjpeg6a package originally put together by Andy Guy and later maintained by Mark Mickan. Current Debian maintainer is Bill Allombert . LEGAL ISSUES [ from README supplied with source - MM ] ============ In plain English: 1. We don't promise that this software works. (But if you find any bugs, please let us know!) 2. You can use this software for whatever you want. You don't have to pay us. 3. You may not pretend that you wrote this software. If you use it in a program, you must acknowledge somewhere in your documentation that you've used the IJG code. In legalese: The authors make NO WARRANTY or representation, either express or implied, with respect to this software, its quality, accuracy, merchantability, or fitness for a particular purpose. This software is provided "AS IS", and you, its user, assume the entire risk as to its quality and accuracy. This software is copyright (C) 1991-1998, Thomas G. Lane. All Rights Reserved except as specified below. Permission is hereby granted to use, copy, modify, and distribute this software (or portions thereof) for any purpose, without fee, subject to these conditions: (1) If any part of the source code for this software is distributed, then this README file must be included, with this copyright and no-warranty notice unaltered; and any additions, deletions, or changes to the original files must be clearly indicated in accompanying documentation. (2) If only executable code is distributed, then the accompanying documentation must state that "this software is based in part on the work of the Independent JPEG Group". (3) Permission for use of this software is granted only if the user accepts full responsibility for any undesirable consequences; the authors accept NO LIABILITY for damages of any kind. These conditions apply to any software derived from or based on the IJG code, not just to the unmodified library. If you use our work, you ought to acknowledge us. Permission is NOT granted for the use of any IJG author's name or company name in advertising or publicity relating to this software or products derived from it. This software may be referred to only as "the Independent JPEG Group's software". We specifically permit and encourage the use of this software as the basis of commercial products, provided that all warranty or liability claims are assumed by the product vendor. ansi2knr.c is included in this distribution by permission of L. Peter Deutsch, sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA. ansi2knr.c is NOT covered by the above copyright and conditions, but instead by the usual distribution terms of the Free Software Foundation; principally, that you must include source code if you redistribute it. (See the file ansi2knr.c for full details.) However, since ansi2knr.c is not needed as part of any program generated from the IJG code, this does not limit you more than the foregoing paragraphs do. The Unix configuration script "configure" was produced with GNU Autoconf. It is copyright by the Free Software Foundation but is freely distributable. The same holds for its supporting scripts (config.guess, config.sub, ltconfig, ltmain.sh). Another support script, install-sh, is copyright by M.I.T. but is also freely distributable. It appears that the arithmetic coding option of the JPEG spec is covered by patents owned by IBM, AT&T, and Mitsubishi. Hence arithmetic coding cannot legally be used without obtaining one or more licenses. For this reason, support for arithmetic coding has been removed from the free JPEG software. (Since arithmetic coding provides only a marginal gain over the unpatented Huffman mode, it is unlikely that very many implementations will support it.) So far as we are aware, there are no patent restrictions on the remaining code. The IJG distribution formerly included code to read and write GIF files. To avoid entanglement with the Unisys LZW patent, GIF reading support has been removed altogether, and the GIF writer has been simplified to produce "uncompressed GIFs". This technique does not use the LZW algorithm; the resulting GIF files are larger than usual, but are readable by all standard GIF decoders. We are required to state that "The Graphics Interchange Format(c) is the Copyright property of CompuServe Incorporated. GIF(sm) is a Service Mark property of CompuServe Incorporated." debian/changelog0000664000000000000000000003322712252027556011057 0ustar libjpeg6b (6b1-4ubuntu1) trusty; urgency=low * Merge from Debian unstable (LP: #1011177). Remaining changes: - debian/rules: Remove "-Bsymbolic-functions" from LDFLAGS. -- Logan Rosen Tue, 10 Dec 2013 18:09:16 -0500 libjpeg6b (6b1-4) unstable; urgency=high * Apply upstream patch to fix CVE-2013-6629 and CVE-2013-6630. * debian/rules clean: remove stamp-h1 * debian/copyright: fix download URL -- Bill Allombert Thu, 05 Dec 2013 23:43:52 +0100 libjpeg6b (6b1-3ubuntu1) raring; urgency=low * Merge from Debian. Remaining changes: - debian/rules: Remove "-Bsymbolic-functions" from LDFLAGS. -- Oussama Bounaim Thu, 15 Nov 2012 09:01:30 +0100 libjpeg6b (6b1-3) unstable; urgency=low * Add multiarch support (similar to libjpeg8). closes: #642079 * Ship file README.6b1 in doc. * debian/control: - Bump Standards-Version to 3.9.3. - move libjpeg62, libjpeg62-dev and libjpeg62-dbg to section oldlibs -- Bill Allombert Sun, 03 Jun 2012 13:42:01 +0200 libjpeg6b (6b1-2ubuntu2) quantal; urgency=low * Rebuild for new armel compiler default of ARMv5t. -- Colin Watson Fri, 05 Oct 2012 00:05:52 +0100 libjpeg6b (6b1-2ubuntu1) precise; urgency=low * Merge with Debian; remaining changes: - debian/rules: Remove "-Bsymbolic-functions" from LDFLAGS. - Enable multiarch build (LP: #733501). -- Matthias Klose Tue, 11 Oct 2011 14:45:21 +0200 libjpeg6b (6b1-2) unstable; urgency=low * Transition to libjpeg8: * debian/control: - libjpeg62-dev no more Provides libjpeg-dev - Bump Standards-Version to 3.9.2. - Remove article from synopsys * debian/rules: - implement DEB_BUILD_OPTIONS nocheck. closes: #630038, thanks Steve Wolter. - Add --disable-silent-rules to configure call. -- Bill Allombert Thu, 07 Jul 2011 10:02:22 +0200 libjpeg6b (6b1-1ubuntu2) oneiric; urgency=low * debian/rules: Remove "-Bsymbolic-functions" from LDFLAGS, as this flag breaks the libjpeg use by HPLIP and pxljr, in both cases for printing on the HP Color LaserJet 3500/3550/3600 (LP: #777670). -- Till Kamppeter Mon, 8 Aug 2011 19:57:23 +0200 libjpeg6b (6b1-1ubuntu1) natty; urgency=low * Enable multiarch build (LP: #733501) - debian/control: update depends for multiarch toolchain - debian/*.files: update /usr/lib paths - debian/rules: - add --libdir to configure - update library path creation -- Kees Cook Wed, 23 Mar 2011 22:24:07 -0700 libjpeg6b (6b1-1) unstable; urgency=low * New upstream release - libjpeg62 has now versionned symbols. - Updated build system that use current libtool. - Full source code for the build system. * debian/copyright: add 6b1 upstream download URL. * debian/control: - libjpeg62-dev: Provides libjpeg-dev since the transition has been postponed. - Remove now useless dependency on libtool and sharutils - Bump Standards-Version to 3.9.0. * Get rid of dpatch system. Patches were only relevant to libjpeg-progs which is not build from this package anymore. * Move to new source format 3.0 (quilt). Patches applied: - use-autotools-dev: Use autotools-dev version of config.sub/.guess. - extern_C-jpeglib.h: Wrap jpeglib.h with extern "C" {} if __cplusplus is defined. * debian/rules: - Adjust for new build system and new patch system. * debian/shlibs: add (>=6b1) to avoid linker warnings with libjpeg6b. -- Bill Allombert Tue, 29 Jun 2010 13:55:42 +0200 libjpeg6b (6b-16) unstable; urgency=low * Transition to libjpeg8: * debian/control: - Bump standard version to 3.8.4. - libjpeg62-dev no more Provides libjpeg-dev - move libjpeg62, libjpeg62-dev and libjpeg62-dbg to section oldlibs - move libjpeg62-dev to priority extra (conflict with libjpeg8-dev) - mention obsolescence in the description. - Add ${misc:Depends} -- Bill Allombert Sun, 07 Feb 2010 16:54:25 +0100 libjpeg6b (6b-15) unstable; urgency=low * Transition to libjpeg7: - Remove package libjpeg-progs. - remove debian/extra. * debian/control: - Bump standard version to 3.8.3. - Move libjpeg62-dbg to section debug. -- Bill Allombert Mon, 17 Aug 2009 11:52:21 +0200 libjpeg6b (6b-14) unstable; urgency=low * The "Lino" release. * exifautotran: - fix typo in manpage. closes: #376371, thanks Reuben Thomas. - preserve file mode. closes: #383379, thanks Vincent Arkesteijn. * debian/control, debian/rules, debian/compat: + switch to debhelper v5 + add libjpeg-dbg debugging package. * debian/rules: remove - before "make clean" rules. * Add patch 204_jpegtran_man to improve readability of manpage. closes: #437453. Thanks Jorgen Grahn. * jpegexiforient.1: Apply patch from Jorgen Grahn to improve formatting. closes: #437446. -- Bill Allombert Thu, 16 Aug 2007 22:59:21 +0200 libjpeg6b (6b-13) unstable; urgency=low * The "If at first you don't succeed..." release. * Change --enable-maxmem to 1024, following Guido advice. This should fix the slowdowns with large files (for large < 1Gb): closes: #356556, #365025, Thanks Nicolas. If you hit performance problems, please set the JPEGMEM variable to about half your available RAM, see jpegtran(1). * Update libjpeg-progs README.Debian to reflect the new patch set and the JPEGMEM feature. * Bump standard version to 3.7.2. -- Bill Allombert Fri, 5 May 2006 19:14:25 +0200 libjpeg6b (6b-12) unstable; urgency=low * The "vote for me" release * Bump standard version to 3.6.2. * Run 'make test' instead of home-made test-suite. * Switch to debhelper v4. * libjpeg is now configured with --enable-maxmem=32. This limits the memory usage to 32Mb and it can be overrided by JPEGMEM. Without this flag JPEGMEM is ignored and there were no limits. closes: #346023. Thanks C. Scott Ananian. -- Bill Allombert Thu, 2 Mar 2006 18:52:44 +0100 libjpeg6b (6b-11) unstable; urgency=high * The "Silencio" release * exifautotran: Apply patch by Uwe Zeisberger to fix bad temporary file handling. closes: #340079 -- Bill Allombert Sun, 20 Nov 2005 20:57:07 +0100 libjpeg6b (6b-10) unstable; urgency=low * The "timeout" release. * Rebuild with current toolchain. * Depends on libc-dev instead of libc6-dev. closes: #294696 Thanks Joel Aelwyn for discussing thoroughly the matter. * Instead of copying /usr/bin/libtool, we replace it by a script that call libtool (using standard path search). Remarked by Jesus Climent. * debian/control: remove pre-hamm cruft. * Add jpegexiforient and jpegautotran by Guido Vollbeding as proposed by Philip Armstrong. closes: #257061. * Run the test-suite at build time instead of shipping it in the package: - /usr/share/doc/libjpeg-progs/tests: removed. - debian/control: Add Build-Depends on sharutils for uuencode. - debian/libjpeg-progs.dirs: removed. - debian/libjpeg-progs.test: removed. -- Bill Allombert Tue, 1 Mar 2005 19:43:26 +0100 libjpeg6b (6b-9) unstable; urgency=low * The "I'm all for aggressive goals" release. * Rebuild with new libtool. closes: #201943. * patch 100_crop: Updated from Guido Vollbeding to include patches 203_jpegtran_errmsg,204_perfect. * patch 200_crop_man: Include 205_perfect_man. * patches 203_jpegtran_errmsg, 204_perfect, 205_perfect_man: removed * Add patch 203_rdppm: fix cjpeg issue with 16-bit PPM files. closes: #208937 * Bump standard version to 3.6.1. * Update debian/edit-patch. -- Bill Allombert Mon, 8 Sep 2003 16:22:08 +0200 libjpeg6b (6b-8) unstable; urgency=low * The "I *hate* when that happens" release. * Move libjpeg62-dev to libdevel section. * See debian/README.sources for detail about the (d)patch system. * debian/rules: avoid to run configure twice. * Add patches 204_perfect and 205_perfect_man. They implement the -perfect jpegtran option as proposed by Mark W. Eichin. closes: #189027 * Bump standard version to 3.5.10. * Use /usr/bin/libtool instead of ldconfig-generated libtool, and remove various libtool related kludges, including patch 301_configure. closes: #195281. Thanks Robert Millan for the suggestion. * Remove patch 302_makefile. Fix debian/rules instead. -- Bill Allombert Sat, 31 May 2003 16:16:59 +0200 libjpeg6b (6b-7) unstable; urgency=low * Rebuild with new gcc/new glibc/new debhelper. * Add -g to build options according to new policy. * Add support for DEB_BUILD_OPTIONS noopt. nostrip is handled by dh_strip. * Bump standard version to 3.5.9. * Extend description a bit (If you have a better one please email me!). * Use dpatch to handle the patches. -- Bill Allombert Sun, 16 Mar 2003 12:19:36 +0100 libjpeg6b (6b-6) unstable; urgency=low * The "Try to break sarge before it even got a name" release * jpegtran: better error messages when opening files. closes: #147516 Thanks Mark W. Eichin. * Add debian/patch dir with my patches. * Add extern "C" if we are under C++. closes: #113167 Thanks, Fredrik Jagenheim. * Remove HAVE_STD{LIB,DEF}_H from jconfig.h since they are not used and conflict with autoconf. closes: #109516 Thanks * Add README.Debian in /usr/share/libjpeg62-dev -- Bill Allombert Mon, 3 Jun 2002 19:34:08 +0200 libjpeg6b (6b-5) unstable; urgency=low * jpeg-->JPEG in libjpeg-progs description. * Add lib path to dh_shlibdeps to avoid warning. * Apply patch from by closes: #129412 Thanks, Colin Marquardt. -- Bill Allombert Mon, 20 May 2002 11:55:22 +0200 libjpeg6b (6b-4) unstable; urgency=low * Avoid bashism in debian/rules. * Update libtool to 1.3.5. (1.4 will break). closes: #52095 Thanks, * Patch config.guess to use version in the autotools-dev package. * Correct Section: field of libjpeg62 and libjpeg62-dev. -- Bill Allombert Tue, 20 Nov 2001 10:23:47 +0100 libjpeg6b (6b-3) unstable; urgency=low * The "Where is ltconfig ?" release. * Remove jconfig.h in debian/rules clean and do some clean up. * Install libjpeg.la per Policy 11.2. * Remove duplicate wizard.doc file in libjpeg62-dev. * Use dpkg-architecture instead of config.guess. * Patch config.sub to use version in the autotools-dev package. closes: #85558, #120039 * Patch rdjpgcom.c to use locales for isprint check on comment chars. closes: #116589 Thanks, Neal H Walfield * Apply patch from by closes: #114415 Thanks, -- Bill Allombert Tue, 13 Nov 2001 21:41:49 +0000 libjpeg6b (6b-2) unstable; urgency=low * New Maintainer. Mark, If you want back the package, just ask! * Acknowledge previous NMU: Jordi: closes: #74087, #24330, #24291 Colin: closes: #80752 Joel: closes: #25324, #27033, #28341 * Write source location as a valid URL in debian/copyright. closes: #118628 Thanks, Doug Porter . * Fix formating of description of libjpeg-progs. closes: #114378 Thanks, Colin Watson . * Install jpegint.h header needed by some apps. closes: #100171 * Remove unused/empty debian/postrm. closes: #24849 Thanks, Adrian Bridgett . * Install wizard.doc file. closes: #64807 Thanks . * Fix libjpeg-progs test.sh. * Fix lintian bugs: typo in copyright, emacs user info in changelog. * Fix false lintian bug: unsafe ldconfig in postinst, by reformatting. * Remove "-g" from CFLAGS per Policy 11.1, hoping m68k is fixed now. * Remove libtool and Makefile in debian/rules clean. * Fix the test system. As a side effect, closes: #109195 Thanks Daniel Schepler * Standards-Version is now 3.5.6. -- Bill Allombert Fri, 9 Nov 2001 22:40:16 +0100 libjpeg6b (6b-1.3) frozen unstable; urgency=low * Non-Maintainer Upload. * Added Build-Depends. * Gil Bahat did the rest of the changes. * Close bug regarding non-standard jpegs not being processed (closes: #74087). * The output gifs are uncompressed, so have no UNISYS patent issues. (closes: #24330, #24291). * Standards-Version is now 3.0.0. -- Jordi Mallach Sat, 24 Feb 2001 22:17:38 +0100 libjpeg6b (6b-1.2) frozen unstable; urgency=low (HIGH for m68k) * Non-maintainer release. * Recompile for m68k since existing djpeg binary claims all jpegs I have are invalid (yet hamm djpeg has no problem with them). Specifically, added "-O2 -g -Wall" to CFLAGS -- possible gcc bug? -- Chris Lawrence Tue, 10 Nov 1998 20:57:38 -0600 libjpeg6b (6b-1.1) frozen unstable; urgency=high * Non-maintainer release. * Use upstream library soname (62). * Removed libjpeg-gif package, as the source notes that the GIF reading has been removed, and the GIFs written do not infringe on the LZW patent. -- Joel Klecker Thu, 22 Oct 1998 05:49:48 -0700 libjpeg6b (6b-1) unstable; urgency=low * New binary packages for 6b * New upstream release -- Mark Mickan Tue, 7 Jul 1998 22:27:10 +0930 debian/rules0000775000000000000000000000465212252027556010265 0ustar #!/usr/bin/make -f # Made with the aid of debmake, by Christoph Lameter, # based on the sample debian/rules file for GNU hello by Ian Jackson. package=libjpeg export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) export CFLAGS=-D_REENTRANT -g -Wall -Wno-main ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif #export DH_VERBOSE=1 build: build-stamp build-stamp: dh_testdir LDFLAGS= ./configure --prefix=/usr --mandir=/usr/share/man \ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ --enable-static --enable-shared --enable-maxmem=1024 \ --disable-silent-rules \ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) $(MAKE) DESTDIR=debian/tmp ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) $(MAKE) test endif touch build-stamp clean: dh_testdir dh_testroot -rm -f build-stamp stamp-h1 if [ -f Makefile ]; then $(MAKE) clean; fi -rm -f Makefile jconfig.h config.log config.status libtool dh_clean binary-indep: binary-arch: build dh_testdir dh_testroot dh_clean -k dh_installdirs mkdir --parents debian/tmp/usr/bin \ debian/tmp/usr/lib \ debian/tmp/usr/include \ debian/tmp/usr/share/man/man1 $(MAKE) install \ prefix=`pwd`/debian/tmp/usr \ libdir=`pwd`/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) \ mandir=`pwd`/debian/tmp/usr/share/man/man1 #:mjpegtools require this file to build and header say: # * These declarations are considered internal to the JPEG library; most # * applications using the library shouldn't need to include this file. # So it is not forbidden to use it, therefore it must be installed. install -m644 jpegint.h debian/tmp/usr/include # fix jconfig.h rm debian/tmp/usr/include/jconfig.h mkdir debian/tmp/usr/include/$(DEB_HOST_MULTIARCH) sed -e "s/#\(undef\|define\) HAVE_STD\(DEF\|LIB\)_H 1//g" \ jconfig.h > debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/jconfig.h # separate out lib package dh_movefiles # Finish it off with debhelper dh_installdocs README README.6b1 dh_installexamples dh_installchangelogs change.log dh_strip --dbg-package=libjpeg62-dbg dh_compress dh_fixperms dh_installdeb dh_shlibdeps -l`pwd`/debian/libjpeg6b/usr/lib/$(DEB_HOST_MULTIARCH) dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: clean binary-indep binary-arch binary build debian/libjpeg62-dev.docs0000664000000000000000000000005012252027556012403 0ustar libjpeg.doc structure.doc coderules.doc debian/postinst0000664000000000000000000000011712252027556011003 0ustar #!/bin/sh -e #DEBHELPER# if [ "$1" = "configure" ]; then ldconfig fi debian/source/0000775000000000000000000000000012252027655010476 5ustar debian/source/format0000664000000000000000000000001412252027556011704 0ustar 3.0 (quilt) debian/libjpeg62-dev.README.Debian0000664000000000000000000000120412252027556013573 0ustar The following patchs has been applied to the headers files: --- jpeglib.h: Add extern "C" {} if __cplusplus is defined. This should be harmless. --- jconfig.h: Remove unused symbol HAVE_STDDEF_H and HAVE_STDLIB_H since they are not used by the installed headers files and cause problem with autoconf. This can theoretically cause problems if your software relies on theses symbols being defined by this header. If it ever happens, please define them manually. Note: this is not Debian-specific, others distributions apply similar patches. Thanks for using Debian! --- Bill Allombert Mon, 20 May 2002 11:58:07 +0200 debian/control0000664000000000000000000000260012252027556010577 0ustar Source: libjpeg6b Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Bill Allombert Section: graphics Priority: optional Build-Depends: debhelper (>= 5), autotools-dev Standards-Version: 3.9.3 Package: libjpeg62 Architecture: any Section: oldlibs Multi-Arch: same Description: Independent JPEG Group's JPEG runtime library (version 6.2) The Independent JPEG Group's JPEG library is a library for handling JPEG files. . This package contains the shared library for version 6.2. Pre-Depends: multiarch-support Depends: ${shlibs:Depends}, ${misc:Depends} Package: libjpeg62-dev Architecture: any Section: oldlibs Multi-Arch: same Priority: extra Description: Development files for the IJG JPEG library (version 6.2) The Independent JPEG Group's JPEG library is a library for handling JPEG files. . This package contains the static library, headers and documentation for version 6.2. Depends: libjpeg62 (=${binary:Version}), libc-dev, ${misc:Depends} Package: libjpeg62-dbg Architecture: any Section: oldlibs Priority: extra Description: Development files for the IJG JPEG library (version 6.2) The Independent JPEG Group's JPEG library is a library for handling JPEG files. . This package contains the debugging symbols for libjpeg for version 6.2. Provides: libjpeg-dbg Depends: libjpeg62 (=${binary:Version}), ${misc:Depends} debian/shlibs.local0000664000000000000000000000003612252027556011475 0ustar libjpeg 62 libjpeg62 (>=6b1) debian/compat0000664000000000000000000000000212252027556010374 0ustar 5 debian/libjpeg62.files0000664000000000000000000000006612252027556012010 0ustar /usr/lib/*/libjpeg.so.62.0.0 /usr/lib/*/libjpeg.so.62 debian/patches/0000775000000000000000000000000012252027655010625 5ustar debian/patches/use-autotools-dev0000664000000000000000000000270512252027556014153 0ustar Description: Tweak config.guess/sub to use the autotools-dev version Tweak config.guess/sub to use the autotools-dev version if available. Author: Bill Allombert Origin: Debian Forwarded: not-needed Last-Update: 2010-01-07 Index: libjpeg6b-6b1/config.sub =================================================================== --- libjpeg6b-6b1.orig/config.sub 2010-05-15 21:30:43.000000000 +0200 +++ libjpeg6b-6b1/config.sub 2010-06-03 19:18:14.000000000 +0200 @@ -1,4 +1,9 @@ #! /bin/sh +# autotools-dev hack (, Wed, 14 Nov 2001 10:13:10 +0100) +if [ -x /usr/share/misc/config.sub ]; then + exec /usr/share/misc/config.sub "$@" +fi + # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Index: libjpeg6b-6b1/config.guess =================================================================== --- libjpeg6b-6b1.orig/config.guess 2010-06-03 18:52:21.000000000 +0200 +++ libjpeg6b-6b1/config.guess 2010-06-03 19:18:14.000000000 +0200 @@ -1,4 +1,9 @@ #! /bin/sh +# autotools-dev hack (, Wed, 14 Nov 2001 10:13:10 +0100) +if [ -x /usr/share/misc/config.guess ]; then + exec /usr/share/misc/config.guess "$@" +fi + # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 debian/patches/fix-CVE-2013-6629_66300000664000000000000000000000645112252027556013424 0ustar Index: libjpeg6b-6b1/jdmarker.c =================================================================== --- libjpeg6b-6b1.orig/jdmarker.c 1998-02-21 21:24:50.000000000 +0100 +++ libjpeg6b-6b1/jdmarker.c 2013-12-03 22:53:28.393111296 +0100 @@ -238,7 +238,7 @@ /* Process a SOFn marker */ { INT32 length; - int c, ci; + int c, ci, i; jpeg_component_info * compptr; INPUT_VARS(cinfo); @@ -275,11 +275,27 @@ cinfo->comp_info = (jpeg_component_info *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, cinfo->num_components * SIZEOF(jpeg_component_info)); - - for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components; - ci++, compptr++) { + + for (ci = 0; ci < cinfo->num_components; ci++) { + INPUT_BYTE(cinfo, c, return FALSE); + /* Check to see whether component id has already been seen */ + /* (in violation of the spec, but unfortunately seen in some */ + /* files). If so, create "fake" component id equal to the */ + /* max id seen so far + 1. */ + for (i = 0, compptr = cinfo->comp_info; i < ci; i++, compptr++) { + if (c == compptr->component_id) { + compptr = cinfo->comp_info; + c = compptr->component_id; + compptr++; + for (i = 1; i < ci; i++, compptr++) { + if (compptr->component_id > c) c = compptr->component_id; + } + c++; + break; + } + } + compptr->component_id = c; compptr->component_index = ci; - INPUT_BYTE(cinfo, compptr->component_id, return FALSE); INPUT_BYTE(cinfo, c, return FALSE); compptr->h_samp_factor = (c >> 4) & 15; compptr->v_samp_factor = (c ) & 15; @@ -302,7 +318,7 @@ /* Process a SOS marker */ { INT32 length; - int i, ci, n, c, cc; + int c, ci, i, n; jpeg_component_info * compptr; INPUT_VARS(cinfo); @@ -323,24 +339,38 @@ /* Collect the component-spec parameters */ for (i = 0; i < n; i++) { - INPUT_BYTE(cinfo, cc, return FALSE); INPUT_BYTE(cinfo, c, return FALSE); - + + /* Detect the case where component id's are not unique, and, if so, */ + /* create a fake component id using the same logic as in get_sof. */ + for (ci = 0; ci < i; ci++) { + if (c == cinfo->cur_comp_info[ci]->component_id) { + c = cinfo->cur_comp_info[0]->component_id; + for (ci = 1; ci < i; ci++) { + compptr = cinfo->cur_comp_info[ci]; + if (compptr->component_id > c) c = compptr->component_id; + } + c++; + break; + } + } + for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components; ci++, compptr++) { - if (cc == compptr->component_id) + if (c == compptr->component_id) goto id_found; } - ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc); + ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, c); id_found: cinfo->cur_comp_info[i] = compptr; + INPUT_BYTE(cinfo, c, return FALSE); compptr->dc_tbl_no = (c >> 4) & 15; compptr->ac_tbl_no = (c ) & 15; - - TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc, + + TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, compptr->component_id, compptr->dc_tbl_no, compptr->ac_tbl_no); } @@ -456,6 +486,8 @@ if (count > 256 || ((INT32) count) > length) ERREXIT(cinfo, JERR_BAD_HUFF_TABLE); + MEMZERO(huffval, SIZEOF(huffval)); /* pre-zero array for later copy */ + for (i = 0; i < count; i++) INPUT_BYTE(cinfo, huffval[i], return FALSE); debian/patches/extern_C-jpeglib.h0000664000000000000000000000154612252027556014165 0ustar Description: Wrap jpeglib.h with extern "C" {} if __cplusplus is defined. Wrap jpeglib.h inside extern "C" { ... } if the compiler defines __cplusplus. Author: Bill Allombert Origin: Debian Forwarded: not-needed Last-Update: 2010-06-03 Index: libjpeg6b-6b1/jpeglib.h =================================================================== --- libjpeg6b-6b1.orig/jpeglib.h 2010-06-03 19:02:32.000000000 +0200 +++ libjpeg6b-6b1/jpeglib.h 2010-06-03 19:02:37.000000000 +0200 @@ -13,6 +13,10 @@ #ifndef JPEGLIB_H #define JPEGLIB_H +#ifdef __cplusplus +extern "C" { +#endif + /* * First we include the configuration files that record how this * installation of the JPEG library is set up. jconfig.h can be @@ -1093,4 +1097,8 @@ #include "jerror.h" /* fetch error codes too */ #endif +#ifdef __cplusplus +} +#endif + #endif /* JPEGLIB_H */ debian/patches/series0000664000000000000000000000007412252027556012043 0ustar extern_C-jpeglib.h use-autotools-dev fix-CVE-2013-6629_6630 debian/libjpeg62-dev.examples0000664000000000000000000000001212252027556013267 0ustar example.c debian/shlibs0000664000000000000000000000003612252027556010404 0ustar libjpeg 62 libjpeg62 (>=6b1)