Fix for format-security, #543032

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 166 insertions, 8 deletions

diff --git a/sci-chemistry/rasmol/ChangeLog b/sci-chemistry/rasmol/ChangeLog
index cd391c345a5c..1de016c744c4 100644
--- a/sci-chemistry/rasmol/ChangeLog
+++ b/sci-chemistry/rasmol/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/rasmol
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.39 2012/12/20 14:54:13 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.40 2015/03/12 10:12:18 jlec Exp $
+
+*rasmol-2.7.5.2-r1 (12 Mar 2015)
+
+  12 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  +files/rasmol-2.7.5.2-format-security.patch,
+  +files/rasmol-2.7.5.2-longlong.patch, +rasmol-2.7.5.2-r1.ebuild:
+  Fix for format-security, #543032
 
   20 Dec 2012; Justin Lecher <jlec@gentoo.org> -rasmol-2.7.5.1.ebuild,
   metadata.xml:
diff --git a/sci-chemistry/rasmol/Manifest b/sci-chemistry/rasmol/Manifest
index 2184616fc994..05f61db7aaa3 100644
--- a/sci-chemistry/rasmol/Manifest
+++ b/sci-chemistry/rasmol/Manifest
@@ -1,18 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 2.7.5-bundled-lib.patch 2513 SHA256 86fc627ae39fbc6d85063436b1e05e19745fd4690e6df70fd6111f99c1b90505 SHA512 940e85bbe35ed6055d8deb1d761e925aec3b60d63c3e91bcc3c08596f1b8269efd4c8a257ff9efdbe32888e987852e85ed19cba5566d8d610e8d625a23b0994a WHIRLPOOL ffbe6399b1176601459dafb8bed6267fbff60d859761a7e0ecbf55b4b0c2f607888a11c0ca9c66278e3cc514ed2b44b769cac3af8099a10efd8decd7bac37077
 AUX ldflags.patch 423 SHA256 1530faa9739dc97d769f8c772de4510bc201b7cdb1e40ddea4e366c7a17b90ea SHA512 fe3678b9c66adc3a1e11a3485cfae67a380719e3c03c9e719fb10e228d5ca8ccf893c0cc335558258539f4c7cdb1d7231aa90df9f11c3d7adddd421020f59957 WHIRLPOOL b8448fd10e73cd73e458a536e4ac172b49002af09d1f7a51b73f3e851014aed74a0d81bd6b72af44fb705cc0be56d37a942ff5166dc6e85f8052332382e27f11
+AUX rasmol-2.7.5.2-format-security.patch 1617 SHA256 6171a944ac63bcbc18e8d4a1aabb03dca5297cedad00eef8a38cb78253f8c3c8 SHA512 cab29465d5830e669eca152880ae60c403f90668ee5bf97e3694b6e754e2e23086a520717c2df990c74fcfbafc761a460bea111d868a57ae63f13bce1603f074 WHIRLPOOL dcf0437e73150f0dc7ad5c7876a28d74e9d1df51033f6d9bb089876895dde97871b0f2e48bc2daa75cd35f9a5e2739df33d089e5fe556b238c8f7d64d4b4c42e
 AUX rasmol-2.7.5.2-glib.h.patch 770 SHA256 4093621678676bdc7c517f6d6c260f495b9d946d57691d8e58371b627cd6c178 SHA512 d743b89817d0ed2aa551f3a6529e5bcc50c811d79c0deddd50d07a59614cb0c2d71500452ff9aec4b4b84e4985d9851f61aafa30196356aa1724212b5159375e WHIRLPOOL 250e59fbafe5d53f1dfd77bc2392cf085b07968578675e61635c8ca2e5de1dd60f060240f2a9afdb088285bac3a94cb695cecd3abbb93214f2d6fcf584fe8a16
+AUX rasmol-2.7.5.2-longlong.patch 396 SHA256 98503ec652d13e62443275536d86a8abefae6f6006441425026d400f40f25607 SHA512 4c3ce01ade36fe8a9512bdac62bcd47268bcc5a0448f4af69b26d8add9cc8495d376bac33a8ae5aeae42fa114a1cba980ce86559bf2d52334257f2e001c011d3 WHIRLPOOL 812ff6f3b2d3a6d5dc4ce1c0a9ebf627998b4df355bf435ff1a2e43b3ba369d29fed8cd8ffeef472a62735f71a4bfa2bf89812dafb7f11ec4be34716793f95a7
 AUX rasmol.sh.debian 966 SHA256 c3eb76b78d56501498b0fedb899eb69586ad98ceabdca14a4e49564bfbce7545 SHA512 0247c6ae324890b47f85851f999274a4c9ce79cd72d1face516c5e9268370a79bae1ee181381d016e3bb0dcabe2f539191a632b1902bb780ca7a61cf51bbba9d WHIRLPOOL 0ddcd002f329e25260d946c7195bece00e098e420ce007bb682109653a7f575c8392d33e166aa5cff56a71e3ff514489eb7be6d7eb239576beddc7ac6cf0bbb5
 DIST rasmol-2.7.5.2-13May11.tar.gz 9768769 SHA256 b975e6e69d5c6b161a81f04840945d2f220ac626245c61bcc6c56181b73a5718 SHA512 c4fd149c002a34d8ce7620a7eed37aa6020acd83fc352a4c16697eb94e6a0377c55455cb6da5fb3f492f879248a6707f677f4b35572f2295b23fc924ddf3128f WHIRLPOOL 261c5351e32a67807d2979b73fbdf83b947aa641568c08fd2f2b0e06115330541a56f7bbd8f05313c86554c321e59cfe11bf5ee613c09249b9e149411c61d5ca
+EBUILD rasmol-2.7.5.2-r1.ebuild 2056 SHA256 023f176668038e0cc268614c33f45b6c44ed5c8c628c44562f802b523ede4ab8 SHA512 c390c509b5b3eb827b111afde0358163e2f99d8bd49f5dcc84a4029bca698050d519c931b19e5c83fade87fe59b2c296503c46a425df7d6475d91e33ab72d043 WHIRLPOOL f8dac9c34fe5518dfdb1a7abfef26305659878f0b9e732c2c65c9cc41a2f7f637f27bacea35193b4a25b96f23b4c8d1d9ed6d31c0d3bcc9c401e2abe8a1e18ed
 EBUILD rasmol-2.7.5.2.ebuild 1961 SHA256 6d89e9260470e4b01997cddf40b57a9df4467db1968389ae06259cc4843e6d7f SHA512 6581a97a91519ea7ca58332e81d90ec4ac51084204870cf52182bf8848a568ee0bc8d47772432c1edd979c0529995feb9a43d3732e299ed5a00accc91745682e WHIRLPOOL e9312f5d9cc985ef59c1017cb8c119c69ce1f15aa980a8bd78cc42d7e5cd1aea711c2372fd1cecf4cc3ec82d4047a39bdb8eba94f55348c8217fd148ac3f7177
-MISC ChangeLog 6980 SHA256 e47964cfa1c361409904dd18046a30a2e235d3dbfaa463206534502ae6793dcd SHA512 d22cda154fa1a5173f718b1f9ab817e0b7f4c36b4264e0fb9fe47d4428b53cc48af2cbc1910e02244a1b1388cca7cbaa2f26ce133d0e41d927409f8e1e9a1a4b WHIRLPOOL 468ce63c572831b4dc218b14340d55366075b2f126bbdcec06d43b18937f6e8130db59844a13b66e8a54f2d7be49038f59447dce0f18d05d03bda1f9fae87817
+MISC ChangeLog 7211 SHA256 0654e59e079d8a832a0385c56ec360d091f387b8d4d395eb2011b7c1ee320d59 SHA512 cf6bc641236eb76f4f12ef7cf3856fd62a5be61cf988cf5dded13113950419b0ce5c2ca28da5339515fe75df1fa6bf0ac32984dbcbdd5e67a6364f038b56c395 WHIRLPOOL eb759112001dd2bc6b659f423a3c67a13a7c06ab26016891905a63a69afcf7ea76179160383ebe56574a19540f5d0c092a3357da006061e148836cfee6a0d872
 MISC metadata.xml 168 SHA256 705462092174cd3e2e3ec1557a28108a746b7351f803d8ca6d1b925b3111c3ff SHA512 f0073fb277e20adb7781aa6ea7f8237bc2d350f0aa43f0f0cca33e02cf52b8fc117bd984c11721ac519a2637ea145976148ac1aba7335dc74c42f7b9531cbed3 WHIRLPOOL 07dd7a302e695440f5033889e5b20cada57beedf17ad33f95d45fb5c39da98bf206eaff13334c20c1c08140a9c5e6041341d29c58efc5ca59b112b60e1662318
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlDTJpYACgkQgAnW8HDreRbjsgCeOHP38PIHzXdWzcEavHrtRf+y
-tWEAoIytBzOMATVmR96Bg65iuRDH2x9w
-=OmVQ
+iQJ8BAEBCgBmBQJVAWaDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir0RsP/ReyU/ihcbtlF02icKM0dLZ2
+PcFPOIBWkhAaIqsPYyl7AkMHsTLRr1D8QUl78qJ/d31V/gr/JNqaq3c5EJImRlJ9
+HEDR5PMVBFMHJx5/zLIuvBvcTefngEWwW10HMj6bdvcU8qmrocZmNCitJffAeiI6
+JKG+dtxrrL1Ibrvib+wvnUvZzpdRAfnhCyreyaRAim13sDDLxy4IeX975kHBcelL
+ECs/mbXJMgEOAkEtalGYfiwGqlEMghPUSyXLMmrdAwE3FJihEiT0FCXuaLKn6Rui
+IHkdq07nPfQ2xFJNlgWvzY9uCw+fat+fGx5sfljF8Fn1pmQisaIduNngMeXM3ddD
+ifXj18fBTymVt7MulH6lORFDnzzIyfJ2sDODOST6R+VFAzRTBJ/qR4j+6B0oL/Rp
+p+gJE8ZdXPZd6ZWmkTvmJK75l2XQ6O/2eMatlyggF2kaLRA1DVbX90roRpRrrCKl
+p940id+Az76qgO0nT4SAd3wQrpvzy/iYNVRvCri8FM1pNOLaA8MkAnffIqcohD6s
+YqY3XMGcJbBODpK9suVHnd1IwByaiFPwsxD9qlMwdZZHCi5tsr8Qtw4c4cPY/V10
+JlIHNaaBKDrCArYpxykbyLydyEIdJIxXZrgStpzicQh0iuPIVPDfL/ALH0gVFE1J
+wnMncQdU68Li5wmZo97B
+=7Vqi
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-format-security.patch b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-format-security.patch
new file mode 100644
index 000000000000..22eb229d8a3d
--- /dev/null
+++ b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-format-security.patch
@@ -0,0 +1,39 @@
+diff -urp RasMol-2.7.5.2/src/command.c RasMol-2.7.5.2_sprintf/src/command.c
+--- RasMol-2.7.5.2/src/command.c	2011-05-15 01:23:49.000000000 +0700
++++ RasMol-2.7.5.2_sprintf/src/command.c	2014-02-12 18:02:24.633489549 +0700
+@@ -1286,7 +1286,7 @@ void ShowRecordCommand( void ) {
+         if (record_on[1]) WriteString("record appearance on\n");
+         else WriteString("record apperance off\n");
+         if (RecordMaxMS == 1.) {
+-            sprintf(param,RecordTemplate);
++            sprintf(param, "%s", RecordTemplate);
+         } else{
+             sprintf(param,RecordTemplate,millisec<0?0:millisec);
+         }
+@@ -1381,7 +1381,7 @@ void ShowPlayCommand( void ) {
+             WriteString(param);
+         }
+         if (PlayMaxMS == 1.) {
+-            sprintf(param,PlayTemplate);
++            sprintf(param, "%s", PlayTemplate);
+         } else{
+             sprintf(param,PlayTemplate,millisec<0?0:millisec);
+         }
+@@ -1469,7 +1469,7 @@ void WriteMovieFrame( void ) {
+         RecordPause = True;
+     } else {
+         if (RecordMaxMS == 1.) {
+-          sprintf(param,RecordTemplate);
++          sprintf(param, "%s", RecordTemplate);
+         } else{
+           sprintf(param,RecordTemplate,millisec);
+         }
+@@ -1505,7 +1505,7 @@ static int PlayMovieFrame( void ) {
+         for (play_frame[1] = 0;play_frame[1]<=millisec; play_frame[1]++) 
+         {
+             if (RecordMaxMS == 1.) {
+-                sprintf(param,PlayTemplate);
++                sprintf(param, "%s", PlayTemplate);
+             } else{
+                 sprintf(param,PlayTemplate,millisec-play_frame[1]);
+             }
diff --git a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-longlong.patch b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-longlong.patch
new file mode 100644
index 000000000000..3cff0fa2f98f
--- /dev/null
+++ b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-longlong.patch
@@ -0,0 +1,12 @@
+diff -urp rasmol-2.7.5-23Jul09/src/rasmol.h rasmol-2.7.5-23Jul09-64b/src/rasmol.h
+--- rasmol-2.7.5-23Jul09/src/rasmol.h	2009-07-20 21:08:43.000000000 +0700
++++ rasmol-2.7.5-23Jul09-64b/src/rasmol.h	2013-02-22 14:40:00.378574163 +0700
+@@ -125,6 +125,8 @@
+ #define VECTOR_FAR 
+ #endif
+ 
++#define _LONGLONG
++
+ /*========================*/
+ /*  Default User Options! */
+ /*========================*/
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2-r1.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2-r1.ebuild
new file mode 100644
index 000000000000..561604c4f020
--- /dev/null
+++ b/sci-chemistry/rasmol/rasmol-2.7.5.2-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.2-r1.ebuild,v 1.1 2015/03/12 10:12:18 jlec Exp $
+
+EAPI=5
+
+inherit eutils fortran-2 multilib prefix toolchain-funcs
+
+MY_P="RasMol_${PV}"
+VERS="13May11"
+
+DESCRIPTION="Molecular Graphics Visualisation Tool"
+HOMEPAGE="http://www.openrasmol.org/"
+#SRC_URI="http://www.rasmol.org/software/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/${P}-${VERS}.tar.gz"
+#SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/RasMol.tar.gz"
+
+LICENSE="|| ( GPL-2 RASLIC )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-libs/cvector
+	dev-util/gtk-builder-convert
+	>=sci-libs/cbflib-0.9.2
+	>=sci-libs/cqrlib-1.1.2
+	>=sci-libs/neartree-3.1.1
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/vte:0"
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/imake
+	x11-proto/inputproto
+	x11-proto/xextproto"
+
+#S="${WORKDIR}/${PN}-2.7.5-${VERS}"
+S="${WORKDIR}/RasMol-${PV}"
+
+src_prepare() {
+	cd src || die
+
+	epatch \
+		"${FILESDIR}"/${P}-glib.h.patch \
+		"${FILESDIR}"/${P}-format-security.patch \
+		"${FILESDIR}"/${P}-longlong.patch
+
+	if use amd64 || use amd64-linux; then
+		mv rasmol.h rasmol_amd64_save.h && \
+		echo "#define _LONGLONG"|cat - rasmol_amd64_save.h > rasmol.h
+	fi
+
+	mv Imakefile_base Imakefile || die
+	epatch "${FILESDIR}"/2.7.5-bundled-lib.patch
+
+	eprefixify Imakefile
+
+	xmkmf -DGTKWIN ${myconf} || die "xmkmf failed with ${myconf}"
+}
+
+src_compile() {
+	emake -C src clean
+	emake \
+		-C src \
+		DEPTHDEF=-DTHIRTYTWOBIT \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install () {
+	libdir=$(get_libdir)
+	insinto /usr/${libdir}/${PN}
+	doins doc/rasmol.hlp
+	dobin src/rasmol
+	dodoc PROJECTS {README,TODO}.txt doc/*.{ps,pdf}.gz doc/rasmol.txt.gz
+	doman doc/rasmol.1
+	insinto /usr/${libdir}/${PN}/databases
+	doins data/*
+
+	dohtml -r *html doc/*.html html_graphics
+}