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 EDA4F1381FB for ; Fri, 28 Dec 2012 16:47:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B541521C112; Fri, 28 Dec 2012 16:47:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A79A21C112 for ; Fri, 28 Dec 2012 16:47:26 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0E7D33C3B4 for ; Fri, 28 Dec 2012 16:47:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7E309E543D for ; Fri, 28 Dec 2012 16:47:23 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1356656514.d587119df2b8c8b21303adae530adbbd78faca0d.blueness@gentoo> Subject: [gentoo-commits] dev/blueness:master commit in: dev-util/plan9port/files/, dev-util/plan9port/ X-VCS-Repository: dev/blueness X-VCS-Files: dev-util/plan9port/ChangeLog dev-util/plan9port/Manifest dev-util/plan9port/files/plan9port-9660srv-errno.patch dev-util/plan9port/files/plan9port-noexecstack.patch dev-util/plan9port/metadata.xml dev-util/plan9port/plan9port-20121219.ebuild X-VCS-Directories: dev-util/plan9port/files/ dev-util/plan9port/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: d587119df2b8c8b21303adae530adbbd78faca0d X-VCS-Branch: master Date: Fri, 28 Dec 2012 16:47:23 +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: b18b9981-4d1f-4a1c-9566-5ba2c8267a12 X-Archives-Hash: f51bae5c38b9b8351b360eb861edd857 commit: d587119df2b8c8b21303adae530adbbd78faca0d Author: Anthony G. Basile gentoo org> AuthorDate: Fri Dec 28 01:01:54 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Dec 28 01:01:54 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=d587119d dev-util/plan9port: testing Package-Manager: portage-2.1.11.31 Manifest-Sign-Key: 0xF52D4BBA --- dev-util/plan9port/ChangeLog | 40 ++++++++++ dev-util/plan9port/Manifest | 26 +++++++ .../plan9port/files/plan9port-9660srv-errno.patch | 19 +++++ .../plan9port/files/plan9port-noexecstack.patch | 54 ++++++++++++++ dev-util/plan9port/metadata.xml | 15 ++++ dev-util/plan9port/plan9port-20121219.ebuild | 76 ++++++++++++++++++++ 6 files changed, 230 insertions(+), 0 deletions(-) diff --git a/dev-util/plan9port/ChangeLog b/dev-util/plan9port/ChangeLog new file mode 100644 index 0000000..f6f3365 --- /dev/null +++ b/dev-util/plan9port/ChangeLog @@ -0,0 +1,40 @@ +# ChangeLog for dev-util/plan9port +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/ChangeLog,v 1.3 2009/03/20 17:43:23 jmbsvicetto Exp $ + +*plan9port-20121219 (27 Dec 2012) + + 27 Dec 2012; Andy Spencer -plan9port-20110320.ebuild, + -plan9port-no-lex.patch, +plan9port-20121219.ebuild: + Version bump, update noexecstack patch, remove unneeded lex patch. Changed + sed command to use grep instead of file to prevent spawning excess processes. + +*plan9port-20110320 (20 Mar 2011) + + 20 Mar 2011; Andy Spencer +plan9port-20110320.ebuild, + +plan9port-9660srv-errno.patch, +plan9port-noexecstack.patch, + +plan9port-no-lex.patch: + Version bump (bug #273890), change prefix to /opt/plan9, replace PREFIX patch + with sed command, change DEPEND to x11-apps/xauth, added EAPI=4 and + PORTAGE_DOCOMPORESS (bug #224209), patched AFLAGS with --noexecstack, convert + -jN to NPROC=N for mk, generate 30plan9 env file on-the-fly, Thanks to John + David for some work on this. + + 20 Mar 2009; Jorge Manuel B. S. Vicetto + metadata.xml: + Removing anant as a maintainer since he was retired. + +*plan9port-20080130 (11 Mar 2008) + + 11 Mar 2008; Santiago M. Mola + plan9port-20070522.ebuild, +plan9port-20080130.ebuild: + Version bump, added patch to fix shebangs (bug #201404), marked ~amd64 (bug + #209553), use elog. + +*plan9port-20070522 (29 May 2007) + + 29 May 2007; Anant Narayanan +files/30plan9, + +metadata.xml, +plan9port-20070522.ebuild: + Initial ebuild for Plan9Port, a set of Plan 9 utilities ported to POSIX + environments. + diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest new file mode 100644 index 0000000..d523619 --- /dev/null +++ b/dev-util/plan9port/Manifest @@ -0,0 +1,26 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX plan9port-9660srv-errno.patch 455 SHA256 62b77ee10409715bf5b73eb1acad09ae7e76c5e9edb12cbb87928e1d6c05c7cb SHA512 049def3e250acfc0e0ecd1829328afa1a6bf9abbc7da9d5776c6558aed5c4b18dcbcd082315afd50fd0645dc92421e3f0edfb1b899e43a07a12a9c26cb2f99d8 WHIRLPOOL 0d6e903f2eafeff7f3c43ef77fb6abfac26784efaf233ff0c1eeb79248d2e202fea2f39aef57e0c15bf0e527b9c5c4c5487800cf6f7f7e5a44bf0f256df68f4d +AUX plan9port-noexecstack.patch 984 SHA256 eafebec7adf9310eba6b4bc1aec1ea41ad3cdd73b366471278dd4439643351ea SHA512 160f0a793345603c4c905e65a6fa4a25b1a1c1084f0eadd4ada49ba5b6efc48b975031d14926fdfc2bd48d2e3860c987da449d9d9973038ab510f42528383da8 WHIRLPOOL 997262eb672ce3836309216eb31219671051d1e7b936c98811a668cbe481a820140ec07555871940a367e730e7206ab90e7d8705ee9f0fae50fe613c400f5e22 +DIST plan9port-20121219.tgz 54175831 SHA256 289a355f0dee5900ece427a5360a510879e305e31c02f76dfe0495629ff38824 SHA512 6086fc3330327a36059fc2ce4170a3b7abac7562d141206e305dff20ec970d11d7fffe3d72848bd6def66179b70908444b638f10064e10f7f97a8e4630438892 WHIRLPOOL eb859377af45b053d1ebcf8132ecc043f1d60c0f30f6a6b59db1cc1f9a899b61432179d6d67129c4400a0bb7c935f9a341bb4111de4d5daf15888c949b343f41 +EBUILD plan9port-20121219.ebuild 2186 SHA256 df96c51f3be2372f44b8fe5e0d30414ee24d6e52798dacde6071feb63d989a43 SHA512 05b9d5fd0a3eb3363d1229c823fc773192468e4c3ea01286b6ff50876743e531558d44b948478d4c23ac7e891d5683a12e1825e3f6d7ab8491afa237c5ff1c54 WHIRLPOOL f106e8c6099471ac15b0bc2f54723733da77636e8c9d3002a61827d14c78f3f3703728ddf8e0b4d307ac777bdf32389d3b64e82cbb090f0c1b852db1636a6b47 +MISC ChangeLog 1709 SHA256 41f76ac6fab41d32ac83b565d07fa925312887f5523b637f8af8d28d03a2e732 SHA512 cecba7733b5bd6dbaaf1efa90dab0171a33818ed55716399b78ecccd1062d3a936631691bbd9e38b21eca1116af423fad35c0372ea3cb79079ebeeeca1b9d435 WHIRLPOOL 5c0f853012e5af531a18792c9f71a1b7cffc866029f43f050fdd2f9463420f79dca9b5c8c51cb85c0fc16a394555982e6b4e2da27b5ee9a07f8b87887d2de97b +MISC metadata.xml 471 SHA256 26ff54a2c0ba3a7226b0d9aff3e75b5d09c3a53cfa1f289eea818cb35cf64dc9 SHA512 df8cf2ebdd4e7b09fd77bffe47d32dfc8ad9e2db759408fbe91ed715f630677520108fc19c508320e7332b87150d771a677b5f3bc6f329ff14e5ad5a90d0d7ba WHIRLPOOL 8712724339f8a64cb70b8154b38fb63fd5458c347c397277ad3c2b085c9f6373db4354d9a6b5a5eb4931e1433de864c2d4e850514ca030d1ae3cb077910b91c8 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQIcBAEBCAAGBQJQ3O+CAAoJEJOE+m71LUu6fI8QAKat5/GeJ4EHR8a+F63ZWUXn +R8MAcAF0jelf7uuyB1B7iOH4oRa1q0Zv1LLDaKkTEJs8zhCXW91V5TxHr029/tJc +/GBkSN9XpRvfCa7pdE6i9WxwtWiLc9g5w4jhp+fMb25q4oHZR4woEuH8Py9SS2P3 +V5ciyMP/Ezt0NzUojAt9GNxUpFHhgQyHOf8MVRBXYtKE+//khftPilhEYZ80espd +ID1dOocsJHWBodsLiNYOtOLpIyxs0xMMfhuZ8zRnzKig/EDPtfvd+M4dCdixwJjW +yqZK0svLIowyQuSY/1sXNhqmF16Eb7iBPGkACBaWPTgNtwJ8M3aZpXyTJkXXE1Uy +OlK6ps8TTsdHRh5/Rwm5LVflqgOb4I60VZiSi3PP3pXERwYlPYE67ZKatIKRYosl +r/yFGxuaGY/3Kq5ebUP3iRhCWELkLtD4tHv93FIK204WCPspMuAh5lqEGuISTgOa +PLOOrd5SebIirTtKy4sR7Ym0SvTbjC5ggnUjE4ENbsYcGqVodLhuZUlFlvIH3T0K +2I7olMqdo2OaTqUeLLsJZOuNK0mmZXAzaAzruWVPaaQzN5q0X8QIu2A6WUs8Z8MO +WdH8R7+qyWaLC1/4cMiSqKIhuEPGJLqEsceSGNdvh6BAqfB/retGgEFyR5AHV2R0 +5ScV87HqBiwXNiAHi9xv +=Vkdy +-----END PGP SIGNATURE----- diff --git a/dev-util/plan9port/files/plan9port-9660srv-errno.patch b/dev-util/plan9port/files/plan9port-9660srv-errno.patch new file mode 100644 index 0000000..a596321 --- /dev/null +++ b/dev-util/plan9port/files/plan9port-9660srv-errno.patch @@ -0,0 +1,19 @@ +Defining int errno; resuls in the following error on amd64: + + ld: errno: TLS definition in /lib64/libc.so.6 section .tbss mismatches + non-TLS reference in main.o + +Patch by Alex Efros: + + http://code.swtch.com/plan9port/issue/39/ +--- plan9/src/cmd/9660srv/main.c ++++ plan9.new/src/cmd/9660srv/main.c +@@ -38,7 +38,7 @@ + uchar mdata[Maxiosize]; + char fdata[Maxfdata]; + uchar statbuf[STATMAX]; +-int errno; ++#include + + + extern Xfsub *xsublist[]; diff --git a/dev-util/plan9port/files/plan9port-noexecstack.patch b/dev-util/plan9port/files/plan9port-noexecstack.patch new file mode 100644 index 0000000..fb4f19f --- /dev/null +++ b/dev-util/plan9port/files/plan9port-noexecstack.patch @@ -0,0 +1,54 @@ +Remove unneeded executable stack + +Assembly routines in libthread and libmp use an executable stack by +default. This is not needed and can be removed using --noexecstack. + +The plan9port 9a wrapper wrapper needs to be modified to pass flags to the +underlying assembler first though.. + +Patch by Andy Spencer + + http://code.swtch.com/plan9port/issue/76/ +--- a/bin/9a ++++ b/bin/9a +@@ -1,10 +1,5 @@ + #!/bin/sh + +-if [ $# != 1 ]; then +- echo 'usage: 9a file.s' 1>&2 +- exit 1 +-fi +- + test -f $PLAN9/config && . $PLAN9/config + + aflags="" +@@ -17,5 +12,16 @@ Darwin-*x86_64*) + ;; + esac + +-out=`echo $1 | sed 's/\.s$//;s/$/.o/'` +-exec as $aflags -o $out $1 ++for arg; do ++ case $arg in ++ -*) ++ opts="$opts $arg" ++ ;; ++ *.s) ++ src=$arg ++ dst=$(echo $arg | sed 's/\.s/\.o/') ++ ;; ++ esac ++done ++ ++exec as $aflags $opts -o $dst $src +--- a/src/mkhdr ++++ b/src/mkhdr +@@ -30,7 +30,7 @@ AR=9ar + INSTALL=install + CFLAGS= + LDFLAGS= +-AFLAGS= ++AFLAGS=--noexecstack + CLEANFILES= + NUKEFILES= + YACC=9 yacc diff --git a/dev-util/plan9port/metadata.xml b/dev-util/plan9port/metadata.xml new file mode 100644 index 0000000..e86c8cc --- /dev/null +++ b/dev-util/plan9port/metadata.xml @@ -0,0 +1,15 @@ + + + + + andy753421@gmail.com + + + blueness@gentoo.org + Anthony G. Basile + + + Plan9Port is a set of Plan 9 utilities ported to the POSIX + environment - also know as Plan 9 from User Space. + + diff --git a/dev-util/plan9port/plan9port-20121219.ebuild b/dev-util/plan9port/plan9port-20121219.ebuild new file mode 100644 index 0000000..659b550 --- /dev/null +++ b/dev-util/plan9port/plan9port-20121219.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20080130.ebuild,v 1.1 2008/03/11 13:03:53 coldwind Exp $ + +EAPI="4" + +inherit eutils + +DESCRIPTION="Port of many Plan 9 programs and libraries" +HOMEPAGE="http://swtch.com/plan9port/" +SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz" + +LICENSE="9base" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="x11-apps/xauth" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}" + +PLAN9=/usr/lib/plan9 + +src_prepare() +{ + epatch "${FILESDIR}/${PN}-"{9660srv-errno,noexecstack}".patch" + + # Fix paths, done in place of ./INSTALL -c + einfo "Fixing hard-coded /usr/local/plan9 paths" + grep --null -l -r '/usr/local/plan9' | + xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g" +} + +src_compile() { + # Convert -j5 to NPROC=5 for mk + export NPROC="$(echo "$MAKEOPTS" | sed -r -n 's/.*(^| )-j([0-9]*).*/\2/p')" + + # The INSTALL script builds mk then [re]builds everything using that + einfo "Compiling Plan 9 from User Space can take a very long time" + einfo "depending on the speed of your computer. Please be patient!" + ./INSTALL -b +} + +src_install() { + dodir "${PLAN9}" + + # P9P's man does not handle compression + docompress -x $PLAN9/man + + # do* plays with the executable bit, and we should not modify them + cp -a * "${D}/${PLAN9}" + + # build the environment variables and install them in env.d + cat > "${T}/30plan9" <<-EOF + PLAN9="${PLAN9}" + PATH="${PLAN9}/bin" + ROOTPATH="${PLAN9}/bin" + MANPATH="${PLAN9}/man" + EOF + doenvd "${T}/30plan9" +} + +pkg_postinst() { + elog "Plan 9 from User Space has been successfully installed into" + elog "${PLAN9}. Your PLAN9 and PATH environment variables have" + elog "also been appropriately set, please use env-update and" + elog "source /etc/profile to bring that into immediate effect." + elog + elog "Please note that ${PLAN9}/bin has been appended to the" + elog "*end* or your PATH to prevent conflicts. To use the Plan9" + elog "versions of common UNIX tools, use the absolute path:" + elog "${PLAN9}/bin or the 9 command (eg: 9 troff)" + elog + elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port." +}