[gentoo-commits] gentoo-x86 commit in media-libs/jpeg: ChangeLog jpeg-6b-r12.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    14/01/24 12:18:50

  Modified:             ChangeLog
  Added:                jpeg-6b-r12.ebuild
  Log:
  Don't forget 6b too
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.150                media-libs/jpeg/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/ChangeLog?rev=1.150&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/ChangeLog?rev=1.150&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/ChangeLog?r1=1.149&r2=1.150

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- ChangeLog	24 Jan 2014 12:03:53 -0000	1.149
+++ ChangeLog	24 Jan 2014 12:18:50 -0000	1.150
@@ -1,14 +1,15 @@
 # ChangeLog for media-libs/jpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.149 2014/01/24 12:03:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.150 2014/01/24 12:18:50 ssuominen Exp $
 
-  24 Jan 2014; Samuli Suominen <ssuominen@g.o>
+*jpeg-6b-r12 (24 Jan 2014)
+
+  24 Jan 2014; Samuli Suominen <ssuominen@g.o> +jpeg-6b-r12.ebuild:
   +files/jpeg-8d-CVE-2013-6629.patch, jpeg-8d-r1.ebuild:
-  Fix security bug 491152 (CVE-2013-6629) for jpeg-8d since the patch still
+  Fix security bug 491152 (CVE-2013-6629) for jpeg-6b and 8d since the patch
   applies cleanly. The CVE description is vague on version scale.
 
-  24 Jan 2014; Samuli Suominen <ssuominen@g.o> -jpeg-9.ebuild,
-  jpeg-8d-r1.ebuild:
+  24 Jan 2014; Samuli Suominen <ssuominen@g.o> -jpeg-9.ebuild:
   old
 
 *jpeg-8d-r1 (24 Jan 2014)



1.1                  media-libs/jpeg/jpeg-6b-r12.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-6b-r12.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-6b-r12.ebuild?rev=1.1&content-type=text/plain

Index: jpeg-6b-r12.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r12.ebuild,v 1.1 2014/01/24 12:18:50 ssuominen Exp $

EAPI=5

# this ebuild is only for the libjpeg.so.62 SONAME for ABI compat

PATCH_VER=1
inherit eutils libtool toolchain-funcs multilib-minimal

DESCRIPTION="library to load, handle and manipulate images in the JPEG format (transition package)"
HOMEPAGE="http://www.ijg.org/"
SRC_URI="mirror://gentoo/jpegsrc.v${PV}.tar.gz
	http://dev.gentoo.org/~ssuominen/${P}-patchset-${PATCH_VER}.tar.xz"

LICENSE="IJG"
SLOT="62"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""

DOCS=""

RDEPEND="!>=media-libs/libjpeg-turbo-1.3.0-r2:0
	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}"

src_prepare() {
	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
	epatch "${FILESDIR}"/${PN}-8d-CVE-2013-6629.patch
	elibtoolize
}

multilib_src_configure() {
	tc-export CC
	ECONF_SOURCE=${S} \
	econf \
		--enable-shared \
		--disable-static \
		--enable-maxmem=64
}

multilib_src_compile() {
	emake libjpeg.la
}

multilib_src_install() {
	newlib.so .libs/libjpeg.so.62.0.0 libjpeg.so.62
}