From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 06DE513888F for ; Fri, 23 Oct 2015 10:33:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D74CE0817; Fri, 23 Oct 2015 10:33:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2FFC0E0817 for ; Fri, 23 Oct 2015 10:33:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2E0A340566 for ; Fri, 23 Oct 2015 10:32:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 93E691646 for ; Fri, 23 Oct 2015 10:32:56 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1445596372.5923310384f4106c3980b94e82fb9e90e96ea3c0.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/shiftx2/, sci-chemistry/shiftx2/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/shiftx2/files/shiftx2-1.07_p20120106-format-security.patch sci-chemistry/shiftx2/files/shiftx2-1.07_p20120106-internal-name.patch sci-chemistry/shiftx2/shiftx2-1.07_p20120106.ebuild X-VCS-Directories: sci-chemistry/shiftx2/files/ sci-chemistry/shiftx2/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 5923310384f4106c3980b94e82fb9e90e96ea3c0 X-VCS-Branch: master Date: Fri, 23 Oct 2015 10:32:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 824eb53f-de6f-4690-897f-e7ab90ad4577 X-Archives-Hash: 442282ce7bacf6f5ec0a75ab8a24693e commit: 5923310384f4106c3980b94e82fb9e90e96ea3c0 Author: Justin Lecher gentoo org> AuthorDate: Fri Oct 23 10:32:52 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri Oct 23 10:32:52 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=59233103 sci-chemistry/shiftx2: Fix for using glibc internal namings and format-security Package-Manager: portage-2.2.23 Signed-off-by: Justin Lecher gentoo.org> .../shiftx2-1.07_p20120106-format-security.patch | 16 ++++++++++++++ .../shiftx2-1.07_p20120106-internal-name.patch | 25 ++++++++++++++++++++++ .../shiftx2/shiftx2-1.07_p20120106.ebuild | 6 ++++-- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/sci-chemistry/shiftx2/files/shiftx2-1.07_p20120106-format-security.patch b/sci-chemistry/shiftx2/files/shiftx2-1.07_p20120106-format-security.patch new file mode 100644 index 0000000..fc4a61e --- /dev/null +++ b/sci-chemistry/shiftx2/files/shiftx2-1.07_p20120106-format-security.patch @@ -0,0 +1,16 @@ + modules/resmf/libc/misc.lib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/resmf/libc/misc.lib.c b/modules/resmf/libc/misc.lib.c +index 0ef12a4..1e22424 100755 +--- a/modules/resmf/libc/misc.lib.c ++++ b/modules/resmf/libc/misc.lib.c +@@ -71,7 +71,7 @@ void show_msg(msg) + char *msg; + { + +- fprintf(stdout, msg); ++ fprintf(stdout, "%s", msg); + + } /* show_msg */ + diff --git a/sci-chemistry/shiftx2/files/shiftx2-1.07_p20120106-internal-name.patch b/sci-chemistry/shiftx2/files/shiftx2-1.07_p20120106-internal-name.patch new file mode 100644 index 0000000..4fa5447 --- /dev/null +++ b/sci-chemistry/shiftx2/files/shiftx2-1.07_p20120106-internal-name.patch @@ -0,0 +1,25 @@ + modules/resmf/hydropho_cal.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/resmf/hydropho_cal.c b/modules/resmf/hydropho_cal.c +index 1fde394..a889d08 100755 +--- a/modules/resmf/hydropho_cal.c ++++ b/modules/resmf/hydropho_cal.c +@@ -184,7 +184,7 @@ float hydroscore(Hydroscale *scale, char residue){ + } + + /* function for copying string */ +-char * strndup (const char *s, size_t n) ++char * new_strndup (const char *s, size_t n) + { + char *result; + size_t len = strlen (s); +@@ -206,7 +206,7 @@ char* substring(const char* str, size_t begin, size_t len) + { + if (str == 0 || strlen(str) == 0 || strlen(str) < begin || strlen(str) < (begin+len)) + return 0; +- return (char *) strndup(str + begin, len); ++ return (char *) new_strndup(str + begin, len); + } + + /* calculate the average value from begin to end in the given array */ diff --git a/sci-chemistry/shiftx2/shiftx2-1.07_p20120106.ebuild b/sci-chemistry/shiftx2/shiftx2-1.07_p20120106.ebuild index 9baabd4..b56d269 100644 --- a/sci-chemistry/shiftx2/shiftx2-1.07_p20120106.ebuild +++ b/sci-chemistry/shiftx2/shiftx2-1.07_p20120106.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -41,7 +41,9 @@ QA_PREBUILT="/opt/.*" src_prepare() { epatch \ "${FILESDIR}"/${P}-java.patch \ - "${FILESDIR}"/${P}-system.patch + "${FILESDIR}"/${P}-system.patch \ + "${FILESDIR}"/${P}-internal-name.patch \ + "${FILESDIR}"/${P}-format-security.patch rm "${S}"/src/FeatureRanges.java || die