Update Debian patchset, fixes bug 550628.

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x565953B95372756C

3 files changed, 130 insertions, 15 deletions

diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog
index 9f1ca03592d7..2eb9a57c124a 100644
--- a/sci-physics/cernlib/ChangeLog
+++ b/sci-physics/cernlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/cernlib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.36 2015/05/28 10:30:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.37 2015/05/29 19:47:26 bircoph Exp $
+
+*cernlib-2006-r6 (29 May 2015)
+
+  29 May 2015; Andrew Savchenko <bircoph@gentoo.org> +cernlib-2006-r6.ebuild:
+  Update to the latest Debian patchset 4.1.
+  Fix format-security bug 550628.
 
   28 May 2015; Agostino Sarubbo <ago@gentoo.org> cernlib-2006-r5.ebuild:
   Stable for amd64, wrt bug #550570
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index 75b470009d8e..475cbfd3cda5 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -7,25 +7,27 @@ AUX cernlib-2006-ypatchy-short-name.patch 331 SHA256 c71212efa6e33ec4dd55d4080bd
 DIST cernlib_2006.dfsg.2-14.diff.gz 191345 SHA256 e58c84825ea6fc775acdbccbaaa7ac8c3b70120da8f99e704270ea0aa437e665
 DIST cernlib_2006.dfsg.2.orig.tar.gz 6152834 SHA256 f8ef612cdef0e02b69ccabbe0061eed5f952522565affc25e8ad6e0b73b73f26
 DIST cernlib_20061220+dfsg3-2.debian.tar.gz 257093 SHA256 54d01b7c16015586b09d54940f8e4389eb9f9a85e93be8058a2f1349a009029a SHA512 43a2ca55d42b92bfb551b029c75728e80b4c83473397b52f746d9481c7503762bc5a281732908bfeb29a64f728fed4c127ed1cb9101c16e4fb2dd28c452730ea WHIRLPOOL e11e127c2ef22c96a8f309a1828b076064b87419d7b2fa2f0e93f254582ded6ce41ca678c757921e9a732f75a4bd0392cd4edb7c0752ce04986fe8c1ee210c46
+DIST cernlib_20061220+dfsg3-4.1.debian.tar.xz 170100 SHA256 6f19d776b0a6f22ac688c4e5db9d0ad35f99d8ae1906422f02cca92353d4f9d6 SHA512 d259ab304b040c6bab8535c0db60aaa466ef7bb9bbcce9b2d8931505a180c92935d428e0dd45bfa6199ec939f67580a6d3ac1035c0384bdcf9e6601a351ce90a WHIRLPOOL bf1da58ace8294ff6df710dad8c333122f005437819b8923d53f5fe680f1798f7d22cd917138b679b92363e399759a5b44aa4902b788aa6666f38da7738a3857
 DIST cernlib_20061220+dfsg3.orig.tar.gz 6434476 SHA256 767ecf344cb00a7b2ec232a61c67645ce0fe1a6af861e60a9aa2f96544470f1b SHA512 11fade45c5ae69c858f37a82e74ab1a69416314a23c12ec5205ee6b918590d66f26d3ae68afa466ae3109d736212968ece956a444270ddd189a27a24c0ccece8 WHIRLPOOL fce13048cff43b6abc7e52e9729f5e484ebf85b53f09e6bfbf8acd970ea13b160de6d6d9593779b6b485dfb9843dec4d2d58bac0df20dfce9809a3560eec079c
 EBUILD cernlib-2006-r3.ebuild 3333 SHA256 e440dca148d3e64598ef839c4f8c99ebcbb691c37f433c77858724ef8e0a03ce SHA512 4ded55e6fcae4411a14cb772aa959e94dd5b9ffba14bcf15f068e6a85a3d1c17c1c001c5d09877f4ba23903516bc097f1ea66ac6e83de29ec008ca42d78bef27 WHIRLPOOL 4eb5ce0707cb1b305a6c9b30e713e935af7c19bcce2c3e6fcd5db80337acd269b5795bbe88337c5aaf7ccf70c8b0a855ee611c282abb7fa4580659b9e5f6f9cc
 EBUILD cernlib-2006-r5.ebuild 3058 SHA256 c41b054334fafbdfd81134a934b86096967408cfdcb891c36f309b43e37232fb SHA512 20f234c44e55a9f99b0476b9fd747d1aec735c23f53d2ef620d6b4edf494c6f7d0403034137af943dcb995e60339f868b4dd635f44ef53b6b8469281d687b281 WHIRLPOOL fdfd1ac9c437a6c4f2160f389d32a53066fb8b190140417b2c8d30e535c0f7f7131590c5f457933de59f03fd62977c96505b5e8a6bbb312aa664abca0a4813d6
-MISC ChangeLog 5905 SHA256 d60e577c08a221e8ceb25a14dabbb72d3a842d814058d74aa81ec2bf80013dc1 SHA512 4364394ec23a8bee4ef22adb721de0a4a6d353b6c0dd26b688113e33468b7f8827c1d9bf58149d296334097f7236bba0dba5103b1a8c4a277a4b38c5d9f8daac WHIRLPOOL 168bcac646317088219a7215fa3703249afcb689652a8e5a18ebeee0719e32e73f9dd388323b90739a620690808ba20ec8250de9a0b7c21c33569dd05fb65f22
+EBUILD cernlib-2006-r6.ebuild 3080 SHA256 61b37454d5e5757bfe160bbb6364a005de568f324c7cb9c48ec72daef7f416a3 SHA512 69c590359d8634dc49ebf0ab9abf62d1006ba2cbf29ca4c30da88448551b3306f5fd2818452f3229ae8bf0082f64ff86fb284973901e1f83fd485826873afb25 WHIRLPOOL 44691b29d5cafcb81b1b577504196d230dd1826bb3ef5b3e6f43da13fab25f0009a331e394c61fa995ded5148555f79f0f14fade34f3ffd9adbc96deb9e13636
+MISC ChangeLog 6098 SHA256 02143cb73deff28fba953e3f93a59bb858f2bf780d0174c82e1e4437987598c2 SHA512 d8124704d7cb2febb496ae70f9b944f634ca7028f42c7098489672fb8ed8fd657f4cbb749284a3d5db5df8b87aeb1a8610313856ccd8cadf24355c912bea6099 WHIRLPOOL a02c94705e77bb71b12680e52eee5a2250ada1d6e5c70152aca724847483f55b9ebb20a515f48dae011848cc3c68c73fb03568aa15ffb3ebaf0bbe1417f7fabe
 MISC metadata.xml 658 SHA256 e9ebc62fd54aea3e6d7d677b225878650650ff4bca547f98b732f5a5adf8acb1 SHA512 3c45590b5caf423473f9bd20963be4c3a7c131ce81111164c002b00b0ae99125becffbd9805709584aa66c3ba8023e77108fcb3479cb4920ca4d3cb7e2440e5f WHIRLPOOL 8fe1ee941329f72717db167525a3b0c43540e690aafd39c4a74338bdf6a7799b4f836409fc675c9c30f8fda4c01e4ed508bfc05456b5697e7dc3e7fb7ea7f1a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVZu48AAoJELp701BxlEWfB0IP/Am6Z1JdBHKaTnZ1G4Zf+7JQ
-72eez86PmnAiDCZ/WLgYPhwSeQMdo09XfYk02jJb0Ss+G+8VC/30K4vmNuQm4Cxr
-w6hgaiWb3xh/d6EJNE58S/NJoUhTpDayDe4uzymtyKRSP5Hp6j7eiffQSFYzIVGP
-bcJ5brsz+VDryEK1912pA2wT4cgenHAN+dJ1q5U4hhK4fhzq+LYAVoa5+u0UqwjY
-wwhQzKY4z+zIh5c+xll04I7iGIw18VJnj1LHje6mJTl6HFsL6v09vBoXYXDSyXMB
-TQfHUkCV37TWuYl/h7b+1/YJfOR84teF10Z78jB88EPfKT9VsI7mkWVBXjBliTpR
-CWxZa5VLZ9ZFYRYfaa2IQJGPSctQjep1zDoEraI+pXTYWk3aXoXB1WwD7LV1lzSH
-NLrFPqLZSDlVt+m+W8euuvj9Ac34mNOLvhquc7QYDR2y8Rr5j68clxsaCXWbffS9
-pbAbqIpKGEqB1GIZtwYs04IYCzcGoCoRnzlTsswQqdjX7H2uiiZ6S4GfUd6IkJjj
-K7AJ/l1eY4Rj4qEUdYtl0GX37HUV3TabO57n5hbeZqcrWqVyD1LkgmuiJjm8HQOx
-cvnEkW7vd6fBddN+3p00Sbn2U8QXwzvcEexVYEtpzKj5RNm3aM6eoIc+0C5ZSkEo
-r+mTeCWhA4dqBDnDjlNJ
-=WGZY
+iQIcBAEBCAAGBQJVaMJaAAoJEPZTWjO6HuSNBk4P/1UK+yHC8ge1wixohVWMRj4X
+oaYFIFovq6If2SfCOTcpjekWTLWfeemilprraLPA42SvPY5ETwXw8WKnBiOgDshg
+Pc4hFlUwJ0Z6Y3mOSM7cPU2A4MbL/rSq01CGBhA3Jx/Qx4N4mZE6V0dZG9dJsYou
+oTddeztgK6GtgrYT+FqEyfz2Ry5jnzppSljSXi0x1ERaa18YknE0R7IEkH5nvNBA
+OicMt/rbh5BnwGn+0Y2o0LYf9M19WXnQ/PxhIZ6XDa3O3y31W7KFy/vZPb//eqav
+c70wKrAMUEpwgAACeq+f2YuVZz9tnLqU0hDybsUWQ0gb/Dn6Xu3xUu+QQKktzhkz
+uuRXoLC+YhDI6sGVgGtaKwl3ILJ3C/KGpZQVo4/sSswW+d3r6F9AKmt24LA9n+im
+6kIstCioS99milKZMgC+b1sFQ7dqXLr+y24Zrfaxinnoj+Xvo+P90ZQRqBQLjzeh
+aEYXt4wVzOJH0nf3gqFjvc8d/Dg/UpWsiptzdGedDq3VduFDVlXWGOXkmwFsqaaP
+75GzPZoUd+31a/4NSioSIAps0o88ZeuAQIUvp1L0KrAVLAnJYin7RDXWIkY4fDpK
+Gff6LR26ny7oq0vmQc3uxYQPj29HiGLqgcFLxiOpzmExkR7i4WAN40NTPPQ+uuaK
+8hgc+BUNgyP0UiNr6gCK
+=LKam
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/cernlib/cernlib-2006-r6.ebuild b/sci-physics/cernlib/cernlib-2006-r6.ebuild
new file mode 100644
index 000000000000..4191ecd38dab
--- /dev/null
+++ b/sci-physics/cernlib/cernlib-2006-r6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r6.ebuild,v 1.1 2015/05/29 19:47:26 bircoph Exp $
+
+EAPI=5
+
+inherit eutils fortran-2 multilib toolchain-funcs
+
+DEB_PN=cernlib
+DEB_PV=20061220+dfsg3
+DEB_PR=4.1
+DEB_P=${DEB_PN}_${DEB_PV}
+
+DESCRIPTION="CERN program library for High Energy Physics"
+HOMEPAGE="https://cernlib.web.cern.ch/cernlib/"
+SRC_URI="
+	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
+	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.debian.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2 BSD"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	x11-libs/motif:0
+	virtual/lapack
+	dev-lang/cfortran"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	x11-misc/makedepend
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${DEB_PN}-${DEB_PV}"
+
+src_prepare() {
+	mv ../debian . || die
+	epatch "${FILESDIR}"/${P}-nogfortran.patch
+	# set some default paths
+	sed -i \
+		-e "s:/usr/local:${EROOT}/usr:g" \
+		-e "s:prefix)/lib/\$(DEB_HOST_MULTIARCH):prefix)/$(get_libdir):" \
+		-e "s:\$(prefix)/etc:${EROOT}/etc:" \
+		-e 's:$(prefix)/man:$(prefix)/share/man:' \
+		debian/add-ons/cernlib.mk || die "sed failed"
+
+	# use system blas and lapack set by gentoo framework
+	sed -i \
+		-e "s:\$DEPS -lm:$($(tc-getPKG_CONFIG) --libs blas):" \
+		-e "s:\$DEPS -llapack -lm:$($(tc-getPKG_CONFIG) --libs lapack):" \
+		-e 's:`depend $d $a blas`::' \
+		-e 's:X11R6:X11:g' \
+		debian/add-ons/bin/cernlib.in || die "sed failed"
+
+	cp debian/add-ons/Makefile .
+	export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"
+
+	einfo "Applying Debian patches"
+	emake -j1 patch
+
+	epatch "${FILESDIR}"/${P}-fgets.patch
+	epatch "${FILESDIR}"/${P}-ypatchy-short-name.patch
+	# since we depend on cfortran, do not use the one from cernlib
+	rm src/include/cfortran/cfortran.h || die
+
+	# respect users flags
+	sed -i \
+		-e 's/-O3/-O2/g' \
+		-e "s/-O2/${CFLAGS}/g" \
+		-e "s|\(CcCmd[[:space:]]*\)gcc|\1$(tc-getCC)|g" \
+		-e "s|\(CplusplusCmd[[:space:]]*\)g++|\1$(tc-getCXX)|g" \
+		-e "s|\(FortranCmd[[:space:]]*\)gfortran|\1$(tc-getFC)|g" \
+		src/config/linux.cf	\
+		|| die "sed linux.cf failed"
+	sed -i \
+		-e "s|\(ArCmdBase[[:space:]]*\)ar|\1$(tc-getAR)|g" \
+		-e "s|\(RanlibCmd[[:space:]]*\)ranlib|\1$(tc-getRANLIB)|g" \
+		src/config/Imake.tmpl	\
+		|| die "sed Imake.tmpl failed"
+
+	sed -i \
+		-e 's/\$(FCLINK)/\$(FCLINK) $(LDFLAGS)/' \
+		-e 's/\$(CCLINK)/\$(CCLINK) $(LDFLAGS)/' \
+		src/config/{biglib,fortran,Imake}.rules \
+		src/patchy/Imakefile \
+		|| die "sed for ldflags propagation failed"
+
+	# add missing headers for implicit
+	sed -i \
+		-e '0,/^#include/i#include <stdlib.h>' \
+		src/kernlib/kerngen/ccgen*/*.c || die
+}
+
+src_compile() {
+	# parallel make breaks and complex patched imake system, hard to debug
+	emake -j1 cernlib-indep cernlib-arch
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}"/shlib emake -j1 cernlib-test
+}
+
+src_install() {
+	default
+	cd debian
+	dodoc changelog README.* deadpool.txt NEWS copyright
+	newdoc add-ons/README README.add-ons
+}