diff options
-rw-r--r-- | dev-lang/go/Manifest | 9 | ||||
-rw-r--r-- | dev-lang/go/files/go-1.0.2-hardened.patch | 44 | ||||
-rw-r--r-- | dev-lang/go/go-1.0.2.ebuild | 139 |
3 files changed, 3 insertions, 189 deletions
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index b07396b50c88..5cd83b380c05 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -1,12 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX go-1.0.2-hardened.patch 1306 SHA256 793f3b25c8fdcaa39415388ee534aabeceb48c2c08ce1f59d7fa16abaf1034d2 SHA512 d31a11157884e6ea03d21c8bfab03087264f458ef120250e4e919a7eb595f30fbde913bb970918b0cb3af86ea6aefa59ab254af84a9295ab933f045a60e31085 WHIRLPOOL dcafb608fc2e1a2e4d72dfca7d0a58543f8a05a6f99502f74e4558764be33536392bbc63ef1c7c7fe21b7cf8e26b3cea46feee3d2d376bf4458f3ce6d16691ee AUX go-1.0.3-hardened.patch 1306 SHA256 793f3b25c8fdcaa39415388ee534aabeceb48c2c08ce1f59d7fa16abaf1034d2 SHA512 d31a11157884e6ea03d21c8bfab03087264f458ef120250e4e919a7eb595f30fbde913bb970918b0cb3af86ea6aefa59ab254af84a9295ab933f045a60e31085 WHIRLPOOL dcafb608fc2e1a2e4d72dfca7d0a58543f8a05a6f99502f74e4558764be33536392bbc63ef1c7c7fe21b7cf8e26b3cea46feee3d2d376bf4458f3ce6d16691ee AUX go-1.0.3-no-Werror.patch 236 SHA256 32ccfb12b9bcf7a0353fe99102f49c98d0ca1987c54bd232134d3612a691d68f SHA512 2942ebab53195247b7bc77ae876438a7b3115dc7a962d45e41a0dee1335b6a6d000bb2705be0861c0f6ffbb250d0290768e7f560205bf0c17748fd50a4eac581 WHIRLPOOL 391f119e05cc4fae792a079f47668940b2ce7a98e79e9a4a1d74ffdd60a9b9dd7168002b90d8b46cc200edabf1051e65b1377f69e2fc1565acdcdd5dc12c895b -DIST go1.0.2.src.tar.gz 9676404 SHA256 70fcfb455087c14cc59b7a65c78003fcd1323d73f9b991c1e52db535d6bc95a8 SHA512 ca91a5985236f78c90bda9a1ec652b2b34c2cde3048c0b0c8c0a466ee85b1174d399184a25267959262b8388f51e3eaf2dd39909ec3474765b2c14006c970a23 WHIRLPOOL a6a2ea7971b2283b0aa52877b8d85357d59912e35b3968bb4ecd3a0470bb57638174a28b993e74b0fa6238a49360dcab53807ec84855f4f50122f2feebcc6c33 DIST go1.0.3.src.tar.gz 7404849 SHA256 7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df SHA512 8006b1c38b7d49f3ae040e405d1897218cbc941a81349f270e6f5fdfeb84ed9267cfcbadb414da4cef1135bb0e2377b295ade3f3d6411c6ae15149f7e1b717b1 WHIRLPOOL 15d8576a7210dcac0da45e3e43686e2b3135c01cc047f8881338fb437a54fd56c69b8eacbc1a395ebc0813e6940bbdfcde37518b214ba162851bc669a268b0f4 -EBUILD go-1.0.2.ebuild 3191 SHA256 7dede5ef3aff941a9d11154ccfb7db7c7091d98b3df6c900da80c5687c2926d6 SHA512 97c889c9b43302ca7fe2fd10999086e2248930ae0104e9dfbc77b36d1fcafb62076a517fb49df0ab65fc7dcd288e166ee220e2b694a67f688dcfe04131b4682d WHIRLPOOL 98d190be371d00a3514372efda7bc25335746681b66b751098b5c9232c412f4523ecdd17fd164e22abe3e3e7ff5069bf029eec4aa16e2beadd8766aec16e5af5 EBUILD go-1.0.3.ebuild 3178 SHA256 327b5be73bbdc84816bde7042f6dd72a0dbad86ab92978935ee5caa72f585efd SHA512 1a1e530510ef046680f8b9f5b044b89704846b3cd1511bab83436b06fe2648b4eb39d104435c1b7ced9ef01517a24f8a863f616ebc113e2de9b4cba93f664445 WHIRLPOOL 02e0084b9487b3a5588ec83328ee6787b2295b27ec461f21b06050461fb81222a96a57f3b0080414125bda76cf8b6a814ec4ea90aefa6e6eaf10986e12c1ee36 EBUILD go-9999.ebuild 3133 SHA256 a6e7b528addaec0bae01c9cbf3185dc9b85ed68803d954b3135f07d820121996 SHA512 8fa7235018eafd5c2c242886bd0aff02731be12facb6eb69540584186418b65946e545ff7f45b15287c2218289624e7ae469938f9358bdb7ce8dd32432e8d94a WHIRLPOOL 7453ff1117c67e294869d9b9556e2aea0b9747ee2485449d86e26916dc768a5f4bd4d714c8e4048937478785a9dc122f03a06cfa8a099ca8bb9192671711447f MISC ChangeLog 1624 SHA256 2860328f9b9afd262a022457ae15e70043fd383ebfa0c50a695c7b3a39c440f1 SHA512 eae3e87add389c06e3a1c5b6eed1d50589de1f697f7b758cbeae8936d571792b60ac25db16fa4a801c8bf5d79d12148b013e9aac8eb527fc71161374e4d48407 WHIRLPOOL 0985904aec869647257e50ba198f765d62713b4e52789fe20b139868af4bc92d5981e3cd3107f11648d0b84ab97f7ee4b7af89fbd94b7a5ba7d83188f990fd1d @@ -14,7 +11,7 @@ MISC metadata.xml 448 SHA256 d53ad6b454d72353e0308a91a989a1a3345ae97c0199748dee1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlFs7XUACgkQblQW9DDEZTiMFwCfeRj9yuw0olf5tOsc7k5lMDF4 -GS0AoJvZ11eVkWMAvkD6GhD1Ee4CITwU -=p0a3 +iEYEAREIAAYFAlFs7h0ACgkQblQW9DDEZTjQxwCgh5hheKyNxAi6/RcJ6hpaAeXk +raUAoJ0o6TxrCNVwdkvq0Zb2EeXukyxg +=QUtQ -----END PGP SIGNATURE----- diff --git a/dev-lang/go/files/go-1.0.2-hardened.patch b/dev-lang/go/files/go-1.0.2-hardened.patch deleted file mode 100644 index 39e9ccb44c84..000000000000 --- a/dev-lang/go/files/go-1.0.2-hardened.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: src/cmd/6l/asm.c -=================================================================== ---- a/src/cmd/6l/asm.c -+++ b/src/cmd/6l/asm.c -@@ -1082,6 +1082,11 @@ - ph->type = PT_GNU_STACK; - ph->flags = PF_W+PF_R; - ph->align = 8; -+ -+ ph = newElfPhdr(); -+ ph->type = PT_PAX_FLAGS; -+ ph->flags = 0x2a00; // mprotect, randexec, emutramp disabled -+ ph->align = 8; - - sh = newElfShstrtab(elfstr[ElfStrShstrtab]); - sh->type = SHT_STRTAB; -Index: src/cmd/8l/asm.c -=================================================================== ---- a/src/cmd/8l/asm.c -+++ b/src/cmd/8l/asm.c -@@ -1127,6 +1127,11 @@ - ph->flags = PF_W+PF_R; - ph->align = 4; - -+ ph = newElfPhdr(); -+ ph->type = PT_PAX_FLAGS; -+ ph->flags = 0x2a00; // mprotect, randexec, emutramp disabled -+ ph->align = 8; -+ - sh = newElfShstrtab(elfstr[ElfStrShstrtab]); - sh->type = SHT_STRTAB; - sh->addralign = 1; -Index: src/cmd/ld/elf.h -=================================================================== ---- a/src/cmd/ld/elf.h -+++ b/src/cmd/ld/elf.h -@@ -251,6 +251,7 @@ - #define PT_LOPROC 0x70000000 /* First processor-specific type. */ - #define PT_HIPROC 0x7fffffff /* Last processor-specific type. */ - #define PT_GNU_STACK 0x6474e551 -+#define PT_PAX_FLAGS 0x65041580 - - /* Values for p_flags. */ - #define PF_X 0x1 /* Executable. */ diff --git a/dev-lang/go/go-1.0.2.ebuild b/dev-lang/go/go-1.0.2.ebuild deleted file mode 100644 index e830e9c5f8ed..000000000000 --- a/dev-lang/go/go-1.0.2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.0.2.ebuild,v 1.4 2012/09/14 18:29:06 maekke Exp $ - -EAPI=4 - -export CTARGET=${CTARGET:-${CHOST}} - -if [[ ${PV} = 9999 ]]; then - EHG_REPO_URI="https://go.googlecode.com/hg" - inherit mercurial -fi -inherit bash-completion-r1 elisp-common eutils - -if [[ ${PV} != 9999 ]]; then - SRC_URI="http://go.googlecode.com/files/go${PV}.src.tar.gz" - # Upstream only supports go on amd64, arm and x86 architectures. - KEYWORDS="-* ~amd64 ~arm ~x86" -fi - -DESCRIPTION="A concurrent garbage collected and typesafe programming language" -HOMEPAGE="http://www.golang.org" - -LICENSE="BSD" -SLOT="0" -IUSE="bash-completion emacs vim-syntax zsh-completion" - -DEPEND="sys-apps/ed - ${COMMON_DEPEND}" -RDEPEND="bash-completion? ( app-shells/bash-completion ) - emacs? ( virtual/emacs ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) - zsh-completion? ( app-shells/zsh-completion ) - ${COMMON_DEPEND}" - - # The go language stores binary data for packages in *.a files. - # These are _NOT_ libraries, and should not be stripped. -STRIP_MASK="/usr/lib/go/pkg/linux*/*.a" - -if [[ ${PV} != 9999 ]]; then - S="${WORKDIR}"/go -fi - -src_prepare() -{ - if [[ ${PV} != 9999 ]]; then - epatch "${FILESDIR}"/${P}-hardened.patch - fi - epatch_user -} - -src_compile() -{ - export GOROOT_FINAL=/usr/lib/go - export GOROOT="$(pwd)" - export GOBIN="${GOROOT}/bin" - if [[ $CTARGET = armv5* ]] - then - export GOARM=5 - fi - - cd src - ./make.bash || die "build failed" - cd .. - - if use emacs; then - elisp-compile misc/emacs/*.el - fi -} - -src_test() -{ - cd src - PATH="${GOBIN}:${PATH}" \ - ./run.bash --no-rebuild --banner || die "tests failed" -} - -src_install() -{ - dobin bin/* - dodoc AUTHORS CONTRIBUTORS PATENTS README - - dodir /usr/lib/go - insinto /usr/lib/go - - # There is a known issue which requires the source tree to be installed [1]. - # Once this is fixed, we can consider using the doc use flag to control - # installing the doc and src directories. - # [1] http://code.google.com/p/go/issues/detail?id=2775 - doins -r doc lib pkg src - - if use bash-completion; then - dobashcomp misc/bash/go - fi - - if use emacs; then - elisp-install ${PN} misc/emacs/*.el misc/emacs/*.elc - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r misc/vim/ftdetect - doins -r misc/vim/ftplugin - doins -r misc/vim/syntax - doins -r misc/vim/plugin - doins -r misc/vim/indent - fi - - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - doins misc/zsh/go - fi - - fperms -R +x /usr/lib/go/pkg/tool -} - -pkg_postinst() -{ - if use emacs; then - elisp-site-regen - fi - - # If the go tool sees a package file timestamped older than a dependancy it - # will rebuild that file. So, in order to stop go from rebuilding lots of - # packages for every build we need to fix the timestamps. The compiler and - # linker are also checked - so we need to fix them too. - ebegin "fixing timestamps to avoid unnecessary rebuilds" - tref="usr/lib/go/pkg/*/runtime.a" - find "${ROOT}"usr/lib/go/pkg -type f \ - -exec touch -r "${ROOT}"${tref} {} \; - eend $? -} - -pkg_postrm() -{ - if use emacs; then - elisp-site-regen - fi -} |