From f01d2c2e5ce9bb4f5314d692975391f3388775de Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 1 Jul 2013 14:18:49 -0700 Subject: [PATCH] bump(dev-lang/go): sync with upstream --- .../portage-stable/dev-lang/go/ChangeLog | 8 +- .../portage-stable/dev-lang/go/Manifest | 13 +- .../dev-lang/go/files/go-1.0.2-hardened.patch | 44 ------ .../dev-lang/go/files/go-1.0.3-hardened.patch | 44 ------ ...-Werror.patch => go-1.1.1-no-Werror.patch} | 0 .../dev-lang/go/go-1.1.1.ebuild | 139 ++++++++++++++++++ 6 files changed, 154 insertions(+), 94 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.0.2-hardened.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.0.3-hardened.patch rename sdk_container/src/third_party/portage-stable/dev-lang/go/files/{go-1.0.3-no-Werror.patch => go-1.1.1-no-Werror.patch} (100%) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.1.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-lang/go/ChangeLog index 82d009638a..3d4c7f7ab8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/go # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.14 2013/05/20 20:56:40 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.15 2013/06/14 01:10:58 williamh Exp $ + +*go-1.1.1 (14 Jun 2013) + + 14 Jun 2013; William Hubbs +go-1.1.1.ebuild, + +files/go-1.1.1-no-Werror.patch: + version bump for #473150 20 May 2013; William Hubbs -files/go-1.0.3-hardened.patch, -files/go-1.0.3-no-Werror.patch, diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest index 14fef80a28..d733af2e06 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest @@ -2,15 +2,18 @@ Hash: SHA256 AUX go-1.1-no-Werror.patch 236 SHA256 32ccfb12b9bcf7a0353fe99102f49c98d0ca1987c54bd232134d3612a691d68f SHA512 2942ebab53195247b7bc77ae876438a7b3115dc7a962d45e41a0dee1335b6a6d000bb2705be0861c0f6ffbb250d0290768e7f560205bf0c17748fd50a4eac581 WHIRLPOOL 391f119e05cc4fae792a079f47668940b2ce7a98e79e9a4a1d74ffdd60a9b9dd7168002b90d8b46cc200edabf1051e65b1377f69e2fc1565acdcdd5dc12c895b +AUX go-1.1.1-no-Werror.patch 236 SHA256 32ccfb12b9bcf7a0353fe99102f49c98d0ca1987c54bd232134d3612a691d68f SHA512 2942ebab53195247b7bc77ae876438a7b3115dc7a962d45e41a0dee1335b6a6d000bb2705be0861c0f6ffbb250d0290768e7f560205bf0c17748fd50a4eac581 WHIRLPOOL 391f119e05cc4fae792a079f47668940b2ce7a98e79e9a4a1d74ffdd60a9b9dd7168002b90d8b46cc200edabf1051e65b1377f69e2fc1565acdcdd5dc12c895b +DIST go1.1.1.src.tar.gz 9045336 SHA256 257f74b8d812bbdec695e842de587a1495e7728b4e63d280586a14786adbb5af SHA512 0e990eb8fcbbad29650e2773e483b72084a9846d6f0651c862efdea8168e8d36a6ba02cfacbb8793d0e2624718c65825edaa32dd7d0aec009f97c070d4c6ea02 WHIRLPOOL 937c1c7ab9c86e0e8ca1abe69a3454ac3660ac41e6ebbbab92334f5760424a6a13f5b5dbe902c5ebdcbbd1bc940ae4cef2c81c1032ca4093d0f5997bee7dcca7 DIST go1.1.src.tar.gz 9041413 SHA256 bf1d057d8386e840f9cd3f787252e26d8ee196852e9232a6f9ce762337b19cb6 SHA512 5ae241f2893a39f872214a1b008d28a19d68ece81700422dc917160a69a8388b6fcb27442ea10b533a3c6f94ef09e24425727d2a315c3457ce076bbe42fd033a WHIRLPOOL b3cde4ab5ecb5697c195c33f4bbe11ede0428910f208ded11f4a7fc567697be7af62153fc16105a5f33dcbb84bfcdd182ec44ea1a0722a0bce74b2adc2328d03 +EBUILD go-1.1.1.ebuild 3232 SHA256 ac6e4d9eed70b286d18bda0c0d0d739b72835c3a2802ad718af44cef85f58cf8 SHA512 1be647a94d48f55f93175f8e32592195107b63af5c496fd1072dd99978fd0c69964b1fa9c1f574dda118a9748a0376c4e5bf03c176ad222d39cd99a4ff474e53 WHIRLPOOL 3ada32cef92102357d751372b52e6913f5018041cdca96b97eb349b504a118f671d353e06352834363b1b4fbfc6506a4f796880e610623c2636203d21bd798e2 EBUILD go-1.1.ebuild 3230 SHA256 366b2acf2c565c70a7942074034d3f15664757f4b8267ae10416a8babca561ed SHA512 c4390161718215e9b760a49e27621789ec529a91c98053bf85e3b20838ad821996313726e9555ebe0cdd2933e947520956e11591a7eb34dd3c4a016e28a29428 WHIRLPOOL 1d3e95f6bfea86877048925ac0a2cb4d566ed62eb8621d15937738da389275edff6b5f38630aa19892156d1578475dc4d22f180c88afc0d724ffd24c884a83df EBUILD go-9999.ebuild 3232 SHA256 44863a6978c5218cb3a30b6c917e74c1e62e5632d1fb42536f7dfe7fa1200d52 SHA512 7a9ac9c3c3bfd5d7a3497c8134f2abc03a4ea5426d323f3ea0606e1428289136d23a0c04ea08eb52ec1e5af85c2c1fa0e0d1947823537fa2a3e53ec3f7c722e6 WHIRLPOOL 1757d1b881a0bf7fe7e59a9c18953beb296cfb24f395a548ff935ae4ebdd5e7914cb902f631bd6c74c49419a012838978e66c2bd43eeb0066b15b87053a3b0cd -MISC ChangeLog 2625 SHA256 610e57439c833ccb745731304613ec572788092aee8c0e1ee17d724db9d21453 SHA512 14fb89d64cd80b8f65d24d22dd70bba27518d866fcc7bfedbb91004b9299d7d3509a953ec82e72fc294a311a33950b28c720cea430e6dc1e2266021b43e98ccb WHIRLPOOL b4b76adeed9ba313a4fcc2956d01ced25add2f06d625ba9139141114aa218fdca0f4172cabeb614a87da668266a1874884e3ecee3b74fc01826c4803092a4a5f +MISC ChangeLog 2782 SHA256 474fb8daee6148dbae185554c4bfa4cddd535fe47ac04fb9b79eefa83f829e12 SHA512 1f8d66e80a9f01298fa567e63f382062eeb71cc3b7dea78a6b3e976a8eaad1381bd20a769291815a8f2a64748da911427570532c4b9ab44f0e9c18a0e73297f1 WHIRLPOOL 4dfbeb9c636915fbcfa5965694395d1f06f4c3808fde0cc2ad145227d86b0fa8c53c48709709636a03da757f87b84706de1eb209a087466379f335b5401599e3 MISC metadata.xml 448 SHA256 d53ad6b454d72353e0308a91a989a1a3345ae97c0199748dee1862576ad4476a SHA512 0c5fb551437353e87f87c91e576ef224b770f686700150c19e7f34e6903ba26910293bb74db9732a220006b873113662464646dd96e61503e4aa90cc84e14f75 WHIRLPOOL b3846a0fad8844ad7ec961b512cb12a9d588bfac28b2dc53798399ac8628ccbf6c06c5666b03eabef05b0acb0cea04d563252eaaa893341c5b3fe59475ffdab5 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlGajjIACgkQblQW9DDEZTjC9gCeJCsOi1nAsksRdtkq5CM4kqBM -yhcAniHJDyHTpbo+QQyOLyI6P+n2fWTL -=IvlW +iEYEAREIAAYFAlG6bbQACgkQblQW9DDEZThsWgCgthnRjLtPerk3i1EwGZT6REm6 +U7sAn2XC51VssE+D11eCoqKpHG6Ag7g9 +=myxS -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.0.2-hardened.patch b/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.0.2-hardened.patch deleted file mode 100644 index 39e9ccb44c..0000000000 --- a/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.0.3-hardened.patch b/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.0.3-hardened.patch deleted file mode 100644 index 39e9ccb44c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.0.3-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/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.0.3-no-Werror.patch b/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.1.1-no-Werror.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.0.3-no-Werror.patch rename to sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.1.1-no-Werror.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.1.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.1.1.ebuild new file mode 100644 index 0000000000..646c8b9650 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.1.1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.1.1.ebuild,v 1.1 2013/06/14 01:10:58 williamh Exp $ + +EAPI=5 + +export CTARGET=${CTARGET:-${CHOST}} + +inherit bash-completion-r1 elisp-common eutils + +if [[ ${PV} = 9999 ]]; then + EHG_REPO_URI="https://go.googlecode.com/hg" + inherit mercurial +else + 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" +RDEPEND="bash-completion? ( app-shells/bash-completion ) + emacs? ( virtual/emacs ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + zsh-completion? ( app-shells/zsh-completion )" + +# The tools in /usr/lib/go should not cause the multilib-strict check to fail. +QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/linux.*/.*" + +# The go language uses *.a files which 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}-no-Werror.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 include 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 -type f \ + -exec touch -r "${ROOT}"${tref} {} \; + eend $? +} + +pkg_postrm() +{ + if use emacs; then + elisp-site-regen + fi +}