Fixing fcc 4.3.3 / fortify_sources error. Patch from Ubuntu. Closes #260180

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 136 insertions, 2 deletions

diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index 093cee26acaf..5c689814b390 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/yap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.25 2009/01/24 21:24:09 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.26 2009/03/02 00:27:35 patrick Exp $
+
+*yap-5.1.3-r2 (02 Mar 2009)
+
+  02 Mar 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/yap-5.1.3-fortify_sources-ubuntu.patch, +yap-5.1.3-r2.ebuild:
+  Fixing fcc 4.3.3 / fortify_sources error. Patch from Ubuntu. Closes
+  #260180
 
   24 Jan 2009; <keri@gentoo.org> files/yap-5.1.3-configure.patch,
   +files/yap-5.1.3-dynamic-lib.patch, yap-5.1.3-r1.ebuild:
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index cd6a8ed5a124..31a26097227f 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -23,6 +23,7 @@ AUX yap-5.1.3-clpbn-examples.patch 835 RMD160 dd586e555724d877b5161db7f3ac78b808
 AUX yap-5.1.3-config.h.patch 487 RMD160 ce256423d19639fce07aa4f768695c00957aa896 SHA1 f58d719775e1a9ad726e5b87dde921a9f2999dd7 SHA256 68142cf4196b1e83de47feb654e223076f8b2d1d482d4700b64becc54681bc8a
 AUX yap-5.1.3-configure.patch 6344 RMD160 044a25bdf173878c714ba415dde8945e4b024832 SHA1 5605079284fa0a76ef303801f7a8998f2501a52d SHA256 00543c065f54d629c5b7b9307a3b6ac5186d69e4200788e76ce1cd7f68a0c6e3
 AUX yap-5.1.3-dynamic-lib.patch 761 RMD160 b31c9763b8714aca0753227469ab156ecdc830da SHA1 6c3ea587ce44d528e9c299c000b1e6deb8440443 SHA256 8eb551710f8a0c9aba5d23a61b9d07ff7043d0c895e80061af8cd9b2cc821662
+AUX yap-5.1.3-fortify_sources-ubuntu.patch 910 RMD160 00518b6ffbe4a3119821799f86babf7ff3219a87 SHA1 0daa744ba7ff36da46dd9f246b2410784d248f4a SHA256 e8bbbbffbffc08d6920fcc630180401c0dbe942a158ae2ab89f6e23da239a317
 AUX yap-5.1.3-multilib.patch 10161 RMD160 d19b31c8b9a7b4c71165f6397076be3ed75d1112 SHA1 0225e01a9fb1b27b0f5e4df62e3c6251e62c4d78 SHA256 5a07da0160c8e5d56e2902e162a5bb4eb1e1027f7e78f8ff041fa025770ce06e
 AUX yap-5.1.3-parallel-make.patch 6384 RMD160 b5f107a748b4d13832dfc9f7f1446f4b90e6317c SHA1 d7a0b16cbd0a843a5c96bd6dcee901f383d92db0 SHA256 99edc0a21ccb7354437c43b66dea6b264c3764c3c748b6c441d70112b885414b
 AUX yap-5.1.3-tkyap.patch 695 RMD160 a723ec3962b2072b64fd045f424d3c7a1b1f0b03 SHA1 e04ea927dab423b358e025c563fcc7179fdf7cc5 SHA256 58f6b3314b7091f3abbf9f378dc65018390c91a6e3578d4a7826c7b49c5eb319
@@ -32,6 +33,7 @@ DIST Yap-5.1.3.tar.gz 3266063 RMD160 b2e1153c7a6853a4814a672992d2b8b3834796bc SH
 EBUILD yap-5.1.1.ebuild 2316 RMD160 66111b5c38d11a207f349cfd145ef1d3a26e389e SHA1 df3936df65a1dc2d489598851d9408750bb3cf2e SHA256 5f629dea7355275571629a5df397e1d6db756b55b6b7285bba6132e778973e72
 EBUILD yap-5.1.2.ebuild 2408 RMD160 dd3d262d1afc625ff3e0d472e7a68ff72d83be7f SHA1 dbeb27e9943a160540cdb3c009aeb78f5c96321f SHA256 3f6cceb286271a1f391666df2fb0b069b61e44e05f61e52a8e5ad91d603ca120
 EBUILD yap-5.1.3-r1.ebuild 2382 RMD160 badd66614fe4b52962d06e3a71605cedb4b65e9f SHA1 8640cd4abfcf3318bcba909da224cb8def8ae249 SHA256 4c23d83b9d5ec078a9db1ed6879e4dc3ab1be05b63ead94c9c88ff1645e43d6a
+EBUILD yap-5.1.3-r2.ebuild 2441 RMD160 dd698ee90cba56dca425f8117bddaf6c2c4c3723 SHA1 766dac2277b9ca43fa12b8438053c012f07133a4 SHA256 8cce0f9bfa73353fc2f4872f77ccb60c64b4a74019523fb531f43c41a48fa976
 EBUILD yap-5.1.3.ebuild 1990 RMD160 df46e51344c9d6641393ceab8ab8ff33e72d916e SHA1 48500d59348987856eefb5df236f130ea24f21f0 SHA256 c907e4c09b343143bfbc27388b6608e8718cac97f1ed2e13e8f94907edfe540c
-MISC ChangeLog 4356 RMD160 bab51db9cd466f9272f25210e9e13fe9911da195 SHA1 a978e1a72a38e73d8a988dd04c0d0c805d00b3d8 SHA256 ea889f0076ec0aa8288de8e4b70e8086873ef93de749a68f18a07ff305015ca1
+MISC ChangeLog 4590 RMD160 78d4043af506ff92b8fdc72a9105d24a9c96d694 SHA1 87e161fd8d4876f73d51b1e57bb229c230d30e9e SHA256 89fb188663a208d4d354219807cc6fceb139d34d7ae5e5941f6760095146f44a
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/yap/files/yap-5.1.3-fortify_sources-ubuntu.patch b/dev-lang/yap/files/yap-5.1.3-fortify_sources-ubuntu.patch
new file mode 100644
index 000000000000..b207f2c18ce4
--- /dev/null
+++ b/dev-lang/yap/files/yap-5.1.3-fortify_sources-ubuntu.patch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_gcc_4.3.dpatch by  <dktrkranz@ubuntu.com>
+## DP: Fix FTBFS with Ubuntu toolchain
+
+@DPATCH@
+diff -urNad yap-5.1.1~/C/alloc.c yap-5.1.1/C/alloc.c
+--- yap-5.1.1~/C/alloc.c	2006-03-24 18:15:18.000000000 +0100
++++ yap-5.1.1/C/alloc.c	2008-07-09 22:55:34.000000000 +0200
+@@ -796,7 +796,7 @@
+     itos(getpid(), &file[12]);
+ #endif /* HAVE_TMPNAM */
+ #endif /* HAVE_MKSTEMP */
+-    fd = open(file, O_CREAT|O_RDWR);
++    fd = open(file, O_CREAT|O_RDWR, 0644);
+     if (fd < 0) {
+       Yap_Error(FATAL_ERROR, TermNil, "mmap could not open %s", file);
+       return NULL;
+@@ -909,7 +909,7 @@
+     itos(getpid(), &file[12]);
+ #endif /* HAVE_TMPNAM */
+ #endif /* HAVE_MKSTEMP */
+-    fd = open(file, O_CREAT|O_RDWR);
++    fd = open(file, O_CREAT|O_RDWR, 0644);
+     if (fd < 0) {
+       Yap_ErrorMessage = Yap_ErrorSay;
+       snprintf4(Yap_ErrorMessage, MAX_ERROR_MSG_SIZE,
diff --git a/dev-lang/yap/yap-5.1.3-r2.ebuild b/dev-lang/yap/yap-5.1.3-r2.ebuild
new file mode 100644
index 000000000000..71ec40160a7d
--- /dev/null
+++ b/dev-lang/yap/yap-5.1.3-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-5.1.3-r2.ebuild,v 1.1 2009/03/02 00:27:35 patrick Exp $
+
+inherit autotools eutils java-pkg-opt-2
+
+MY_P="Yap-${PV}"
+
+DESCRIPTION="YAP is a high-performance Prolog compiler."
+HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/"
+SRC_URI="http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.1.3.tar.gz"
+
+LICENSE="Artistic LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc examples gmp java mpi mysql odbc readline static tk threads"
+
+DEPEND="gmp? ( dev-libs/gmp )
+	java? ( >=virtual/jdk-1.4 )
+	mpi? ( virtual/mpi )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	readline? ( sys-libs/readline )
+	doc? ( app-text/texi2html )"
+
+RDEPEND="${DEPEND}
+	tk? ( dev-lang/tk )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-config.h.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-multilib.patch
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+	epatch "${FILESDIR}"/${P}-dynamic-lib.patch
+	epatch "${FILESDIR}"/${P}-bootdir.patch
+	epatch "${FILESDIR}"/${P}-chr.patch
+	epatch "${FILESDIR}"/${P}-clpbn-examples.patch
+	epatch "${FILESDIR}"/${P}-tkyap.patch
+	epatch "${FILESDIR}"/${P}-fortify_sources-ubuntu.patch
+
+	eautoconf
+}
+
+src_compile() {
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--enable-cut-c \
+		$(use_enable !static dynamic-loading) \
+		$(use_enable threads) \
+		$(use_enable threads pthread-locking) \
+		$(use_enable debug debug-yap) \
+		$(use_enable debug low-level-tracer) \
+		$(use_enable mysql myddas-mysql) \
+		$(use_enable mysql myddas-stats) \
+		$(use_enable mysql myddas-top-level) \
+		$(use_enable odbc myddas-odbc) \
+		$(use_with gmp) \
+		$(use_with readline) \
+		$(use_with mpi) \
+		$(use_with mpi mpe) \
+		$(use_with java jpl) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+
+	if use doc ; then
+		emake html || die "emake html failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed."
+
+	if use tk ; then
+		exeinto /usr/bin
+		doexe misc/tkyap
+	fi
+
+	dodoc changes*.html README
+
+	if use doc ; then
+		dodoc yap.html
+	fi
+
+	if use examples ; then
+		docinto examples/clpbn
+		dodoc CLPBN/clpbn/examples/*.yap
+		docinto examples/clpbn/school
+		dodoc CLPBN/clpbn/examples/School/*.yap
+		if use mpi ; then
+			docinto examples/mpi
+			dodoc library/mpi/examples/*.pl
+		fi
+	fi
+}