# HG changeset patch # User Niveditha Rau # Date 1492483086 25200 # Node ID db578176fc80178d8ff7a397d0bbbe16262f7bd9 # Parent 0c22900562adf53deeb48faf23c9dd6d0ecce53d 25892436 update libjpeg to v6b2 19073706 problem in LIBRARY/LIBJPEG diff -r 0c22900562ad -r db578176fc80 components/desktop/libjpeg/Makefile --- a/components/desktop/libjpeg/Makefile Mon Apr 17 16:05:36 2017 -0700 +++ b/components/desktop/libjpeg/Makefile Mon Apr 17 19:38:06 2017 -0700 @@ -30,24 +30,23 @@ COMPONENT_NAME= jpeg COMPONENT_VERSION= 6.0.2 -HUMAN_VERSION= v6b +HUMAN_VERSION= v6b2 COMPONENT_PROJECT_URL= https://sourceforge.net/projects/libjpeg/ -COMPONENT_SRC= jpeg-6b +COMPONENT_SRC= jpeg-6b2 COMPONENT_SRC_NAME= jpegsrc.$(HUMAN_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC_NAME).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d -COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)files/libjpeg/6b/$(COMPONENT_ARCHIVE) + sha256:6d2be0db82dda2e50c908b72aa22ed8cf42cc5aa5ae5f2b081498be6ef16eabc +COMPONENT_ARCHIVE_URL= http://jpegclub.org/support/files/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= library/libjpeg COMPONENT_ANITYA_ID= 1628 -TPNO= 9298 +TPNO= 34809 include $(WS_MAKE_RULES)/common.mk LDFLAGS += $(CC_BITS) -CONFIGURE_OPTIONS += --prefix=$(PROTOUSRDIR) CONFIGURE_OPTIONS += --enable-shared CONFIGURE_ENV += INSTALL="$(INSTALL) -D" diff -r 0c22900562ad -r db578176fc80 components/desktop/libjpeg/libjpeg.license --- a/components/desktop/libjpeg/libjpeg.license Mon Apr 17 16:05:36 2017 -0700 +++ b/components/desktop/libjpeg/libjpeg.license Mon Apr 17 19:38:06 2017 -0700 @@ -3,6 +3,51 @@ README content (required to be distributed if any of the JPEG source code is distributed) -------------------------------------------------------------------------------- +Including README.6b2 + +Extra README for release 6b2 of 25-Dec-2013 +=========================================== + +This release is identical to release 6b1 with the exception of a fix for +CVE 2013-6629 and 2013-6630 (information disclosure). + +This release was prepared by Bill Allombert by combining +release 6b1 with a fix written by Guido Vollbeding for release 9a. + +Files changed: + jdmarker.c + README.6b2 (this file, was README.6b1) + +Extra README for release 6b1 of 1-Jun-2010 +========================================== + +This release is identical to release 6b with the exception of the build system, +and of library symbols versioning on platforms that support them. This release +is only intended as a transition help toward the upgrade to libjpeg8. If you +can upgrade directly to libjpeg8, you do not need libjpeg6b1. + +This release was prepared by Bill Allombert from release +6b and the build system of release 8 by Guido Vollbeding and Bob Friesenhahn. + +Files changed: + config.guess (updated from automake) + config.sub (updated from automake) + configure (autogenerated) + ltmain.sh (updated from libtool) + +Files added: + aclocal.m4 (from libjpeg8) + configure.ac (from libjpeg8) + depcomp (from automake) + libjpeg.map (from libjpeg8, modified) + Makefile.am (from libjpeg8, modified) + Makefile.in (autogenerated) + missing (from automake) + README.6b1 (this file) + +File removed: + ltconfig (obsoleted) +--- The Independent JPEG Group's JPEG software ========================================== @@ -390,3 +435,5 @@ Please send bug reports, offers of help, etc. to jpeg-info@uunet.uu.net. +---- + diff -r 0c22900562ad -r db578176fc80 components/desktop/libjpeg/libjpeg.p5m --- a/components/desktop/libjpeg/libjpeg.p5m Mon Apr 17 16:05:36 2017 -0700 +++ b/components/desktop/libjpeg/libjpeg.p5m Mon Apr 17 19:38:06 2017 -0700 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability uncommitted> @@ -46,10 +46,10 @@ file path=usr/include/jpeglib.h link path=usr/lib/$(MACH64)/libjpeg.so target=libjpeg.so.62.0.0 link path=usr/lib/$(MACH64)/libjpeg.so.62 target=libjpeg.so.62.0.0 -file $(MACH64)/.libs/libjpeg.so.62.0.0 path=usr/lib/$(MACH64)/libjpeg.so.62.0.0 +file path=usr/lib/$(MACH64)/libjpeg.so.62.0.0 link path=usr/lib/libjpeg.so target=libjpeg.so.62.0.0 link path=usr/lib/libjpeg.so.62 target=libjpeg.so.62.0.0 -file $(MACH32)/.libs/libjpeg.so.62.0.0 path=usr/lib/libjpeg.so.62.0.0 +file path=usr/lib/libjpeg.so.62.0.0 file path=usr/share/man/man1/cjpeg.1 file path=usr/share/man/man1/djpeg.1 file path=usr/share/man/man1/jpegtran.1 diff -r 0c22900562ad -r db578176fc80 components/desktop/libjpeg/patches/libjpg-01-makefile.cfg.patch --- a/components/desktop/libjpeg/patches/libjpg-01-makefile.cfg.patch Mon Apr 17 16:05:36 2017 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -Internal patch, not suitable for upstream - ---- jpeg-6b/makefile.cfg.orig 2015-07-14 09:52:32.223048157 -0700 -+++ jpeg-6b/makefile.cfg 2015-07-14 09:53:18.063812769 -0700 -@@ -17,7 +17,7 @@ - binprefix = - manprefix = - manext = 1 --mandir = $(prefix)/man/man$(manext) -+mandir = $(prefix)/share/man/man$(manext) - - # The name of your C compiler: - CC= @CC@ -@@ -168,7 +168,7 @@ - - # with libtool: - libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS) -- $(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libjpeg.la $(LIBOBJECTS) \ - -rpath $(libdir) -version-info $(JPEG_LIB_VERSION) - - # sample programs: diff -r 0c22900562ad -r db578176fc80 components/desktop/libjpeg/test/results-all.master --- a/components/desktop/libjpeg/test/results-all.master Mon Apr 17 16:05:36 2017 -0700 +++ b/components/desktop/libjpeg/test/results-all.master Mon Apr 17 19:38:06 2017 -0700 @@ -1,4 +1,6 @@ make[1]: Entering directory '$(@D)' +/usr/gnu/bin/make check-local +make[2]: Entering directory '$(@D)' rm -f testout* ./djpeg -dct int -ppm -outfile testout.ppm $(SOURCE_DIR)/testorig.jpg ./djpeg -dct int -bmp -colors 256 -outfile testout.bmp $(SOURCE_DIR)/testorig.jpg @@ -12,4 +14,5 @@ cmp $(SOURCE_DIR)/testimg.ppm testoutp.ppm cmp $(SOURCE_DIR)/testimgp.jpg testoutp.jpg cmp $(SOURCE_DIR)/testorig.jpg testoutt.jpg +make[2]: Leaving directory '$(@D)' make[1]: Leaving directory '$(@D)'