This revision fixes the insecure RUNPATH issues and executable stacks on x86.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 122 insertions, 2 deletions

diff --git a/sci-mathematics/pari/ChangeLog b/sci-mathematics/pari/ChangeLog
index a49f57735f78..4f2b5a984f9e 100644
--- a/sci-mathematics/pari/ChangeLog
+++ b/sci-mathematics/pari/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/pari
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.24 2006/01/21 14:11:14 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.25 2006/01/22 13:19:48 markusle Exp $
+
+*pari-2.1.7-r1 (22 Jan 2006)
+
+  22 Jan 2006; Markus Dittrich <markusle@gentoo.org> 
+  +files/pari-non-exec-stack-x86-gentoo.patch, +pari-2.1.7-r1.ebuild:
+  This revision fixes the insecure RUNPATH issues and executable 
+  stacks on x86.
 
   21 Jan 2006; Michael Hanselmann <hansmi@gentoo.org> pari-2.1.7.ebuild:
   Stable on ppc.
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 59acb4878b79..372289336709 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,11 +1,14 @@
-MD5 c3953c200c50ed51f393133745ce4629 ChangeLog 6046
+MD5 6d3af88a44c29cb0f4eded1bfd81d05c ChangeLog 6286
 MD5 ee951aeeb2122fab2aaf9803097fad76 files/digest-pari-2.1.5-r4 63
 MD5 2fd9906f2bf293fdad42d572846508de files/digest-pari-2.1.6 60
 MD5 af657a173514360dabaac40ecd6ee695 files/digest-pari-2.1.7 60
+MD5 af657a173514360dabaac40ecd6ee695 files/digest-pari-2.1.7-r1 60
 MD5 c3f89da5ddbdb73646e3d64ee31ea887 files/docs.patch 915
+MD5 78c8899d1c750e318c88a8cf08a5eefc files/pari-non-exec-stack-x86-gentoo.patch 345
 MD5 dccf7ef464f99fa750a5c7fc3ec67e8f files/wrong_functype-r1.patch 1498
 MD5 cbd309a01e2fee1a5ba6cb3a93ba5708 files/wrong_functype.patch 1946
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 12d02fbdc3b89b45adf6fae221237532 pari-2.1.5-r4.ebuild 2523
 MD5 944e7cfb4a53d51b8619a0d3dc3b4be9 pari-2.1.6.ebuild 2485
+MD5 996ca1ed69457a8639fd2d724d6908fe pari-2.1.7-r1.ebuild 2869
 MD5 4a28dcda56cadfd8401a5f163d4e134b pari-2.1.7.ebuild 2450
diff --git a/sci-mathematics/pari/files/digest-pari-2.1.7-r1 b/sci-mathematics/pari/files/digest-pari-2.1.7-r1
new file mode 100644
index 000000000000..8f7c18b600af
--- /dev/null
+++ b/sci-mathematics/pari/files/digest-pari-2.1.7-r1
@@ -0,0 +1 @@
+MD5 357b7a42e89e2761a5367bbcbfcca5f2 pari-2.1.7.tgz 1542137
diff --git a/sci-mathematics/pari/files/pari-non-exec-stack-x86-gentoo.patch b/sci-mathematics/pari/files/pari-non-exec-stack-x86-gentoo.patch
new file mode 100644
index 000000000000..a3ee992b8859
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-non-exec-stack-x86-gentoo.patch
@@ -0,0 +1,11 @@
+diff -Naur pari-2.1.7-old/src/kernel/ix86/l0asm.c pari-2.1.7/src/kernel/ix86/l0asm.c
+--- pari-2.1.7-old/src/kernel/ix86/l0asm.c	2002-04-06 12:14:02.000000000 +0000
++++ pari-2.1.7/src/kernel/ix86/l0asm.c	2006-01-19 19:22:49.000000000 +0000
+@@ -206,3 +206,7 @@
+ FUNEND()
+ 
+ 	ALIGN
++
++#ifdef __ELF__
++	.section .note.GNU-stack,"",@progbits
++#endif
diff --git a/sci-mathematics/pari/pari-2.1.7-r1.ebuild b/sci-mathematics/pari/pari-2.1.7-r1.ebuild
new file mode 100644
index 000000000000..a85cde41d954
--- /dev/null
+++ b/sci-mathematics/pari/pari-2.1.7-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.1.7-r1.ebuild,v 1.1 2006/01/22 13:19:48 markusle Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="pari (or pari-gp) : a software package for computer-aided number theory"
+HOMEPAGE="http://pari.math.u-bordeaux.fr/"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/pari/unix/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="doc emacs"
+
+DEPEND="doc? ( virtual/tetex )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/docs.patch
+
+	# remove exec stacks for x86; see bug #117434
+	epatch ${FILESDIR}/pari-non-exec-stack-x86-gentoo.patch
+}
+
+src_compile() {
+	# Fix usage of toolchain
+	tc-getAS; tc-getLD; tc-getCC; tc-getCXX
+
+	# Special handling for sparc
+	local myhost
+	[ "${PROFILE_ARCH}" == "sparc64" ] && myhost="sparc64-linux" \
+		|| myhost="$(echo ${CHOST} | cut -f "1 3" -d '-')"
+	einfo "Building for ${myhost}"
+
+	#need to force optimization here, as it breaks without
+	if   is-flag -O0; then
+		replace-flags -O0 -O2
+	elif ! is-flag -O?; then
+		append-flags -O2
+	fi
+	#we also need to force -fPIC throughout on amd64
+	if [ "${ARCH}" = "amd64" ] && ! is-flag -fPIC; then append-flags -fPIC; fi
+
+	# fix up build scripts to get rid of insecure RUNPATHS
+	# see bug #117434
+	sed -e "s|\$runpathprefix \$TOP/\$objdir:\$tmp||" \
+	    -e "s|\$runpathprefix \$tmp||" -i config/Makefile.SH || \
+		die "Failed to fix Makefile.SH"
+	sed -e "s|-L\$libdir|-L./|" -i Configure || \
+		die "Failed to fix Configure"
+
+	./Configure \
+		--host=${myhost} \
+		--prefix=/usr \
+		--miscdir=/usr/share/doc/${PF} \
+		--datadir=/usr/share/${P} \
+		--libdir=/usr/$(get_libdir) \
+		--mandir=/usr/share/man/man1 || die "./configure failed"
+	addwrite "/var/lib/texmf"
+	addwrite "/usr/share/texmf"
+	addwrite "/var/cache/fonts"
+
+	if use hppa
+	then
+		mymake=DLLD\=/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
+	fi
+
+	# Shared libraries should be PIC on ALL architectures.
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/31
+	# Fixes BUG #49583
+	einfo "Building shared library..."
+	cd Olinux-* || die "Bad directory. File a BUG!"
+	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" lib-dyn || die "Building shared library failed!"
+
+	einfo "Building executables..."
+	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp || die "Building executables failed!"
+
+	use doc || rm -rf doc/*.tex
+	use doc && emake doc
+}
+
+src_test() {
+	cd ${S}
+	ebegin "Testing pari kernel"
+	make CFLAGS="-Wl,-lpari" test-kernel > /dev/null
+	eend $?
+}
+
+src_install() {
+	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || die
+	if use emacs; then
+		insinto /usr/share/emacs/site-lisp
+		doins emacs/pari.el
+	fi
+	dodoc AUTHORS Announce.2.1 CHANGES README TODO
+}