commit:     c3937ad23fc8918c53bd0266017838adb2d35e06
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  6 18:39:14 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 18:52:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3937ad2

dev-lang/go: 1.13.15 security bump

Bug: https://bugs.gentoo.org/736156
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 dev-lang/go/Manifest          |   1 +
 dev-lang/go/go-1.13.15.ebuild | 197 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 198 insertions(+)

diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index fbb3ea463a8..9f7412defe3 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -12,5 +12,6 @@ DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 
0a45312f090d81ebf46fe59
 DIST go1.12.17.src.tar.gz 20725913 BLAKE2B 
2eef7374195302656268a42409619445dfeb3ede1f9218ae4eab195916876b97f7510cc62585a0bfdd9f86dddf8a74000032a84b29bc9891d84fc69db94f0274
 SHA512 
069f8f445d9d2268ebb14b2446fab34843d56283c04561636d122fd8b4c1ea0b63640a84437db7a7be71039440ffe170cd3f8025b03b0acf95f2a56fa2febec6
 DIST go1.13.13.src.tar.gz 21704330 BLAKE2B 
462a8c7a438c5638158645d012bcf361f5033b94209ee3b89b15b066c6a92ae7b632d9fa295be2bfd2ed20398471a3e9531eccea1c67f511901f6a7f77242557
 SHA512 
1bee57e6b5d7154e7d93ccf33b9bd8ccacb005d3de1f0dc2272d4d431ab171707a57fe81d65ff17f6016f5c94d5bec6618c13174d43538f7c370d923958529c3
 DIST go1.13.14.src.tar.gz 21704891 BLAKE2B 
fff860b45b296359cb226f123279b3351f654336d267f8d60607fb0eb9f555e99d2e8250331510ddcf40de43235a864867af4b16db153b3f0827a3ccff045c19
 SHA512 
49dd28394333eaa7676fdf530d2fc18a645546c814fbe9247c9613e36529eb23634816b5c84574fea1cd9191fa86e684130e75dc70545344851c6b47c846558d
+DIST go1.13.15.src.tar.gz 21705183 BLAKE2B 
eac8c6113dd6cef164cc5368732c2dce26f200e309c728ca71b4c312ace465382b8cc1dd8fb216bdf927211d6cb26c21090a9ac9c9ef2d7ac1b16c85feac0e0c
 SHA512 
35d3e7aaef1b0fc6ab684bb7352da3a23194115331ba7d1543225c35939cafcd437f454519aac38182cb8f222723ed9a297f9da566075b5e4079be26952a21e3
 DIST go1.14.5.src.tar.gz 22533577 BLAKE2B 
4e07fd46f977e14cf493d92a3c3e2d61c8eadf8f6e07b2de3eec7442d2ee0c736ac99f75eaaf405a48d1751144f4ae770692c3a1db9bc8e27e7c48e89fd74540
 SHA512 
1019b86304925fe60ebd81289349c4582e2e5932dc3ed35d9dc7b36ac293ee583ab6dcf3ae9a96f0f60274f24c295fb0662a8f4d06b717f624fa695c2b40e29c
 DIST go1.14.6.src.tar.gz 22534714 BLAKE2B 
9dacb150108dc30fe3600c6fdc1df3cd2c36f701518f402d2ad8cd2e4ba51203176e5097adf66ac9223181197b1bea7de625933c570567d9e7dddf485bc2c204
 SHA512 
5c865c8272fb0dc8eab1514732b0200dbc867276512714dd30afc658a0d2afac6bd758e00c6f576d8d254e411418a52a564c895399b56cfe06c2b1785271a8fd

diff --git a/dev-lang/go/go-1.13.15.ebuild b/dev-lang/go/go-1.13.15.ebuild
new file mode 100644
index 00000000000..d71bff70d90
--- /dev/null
+++ b/dev-lang/go/go-1.13.15.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+       EGIT_REPO_URI="https://github.com/golang/go.git";
+       inherit git-r3
+       ;;
+*)
+       SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+       S="${WORKDIR}"/go
+       case ${PV} in
+       *_beta*|*_rc*) ;;
+       *)
+               KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux 
~x86-linux ~x64-macos ~x64-solaris"
+               # The upstream tests fail under portage but pass if the build is
+               # run according to their documentation [1].
+               # I am restricting the tests on released versions until this is
+               # solved.
+               # [1] https://golang.org/issues/18442
+               RESTRICT="test"
+               ;;
+       esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org";
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+
+BDEPEND="|| (
+               dev-lang/go
+               dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+       usr/lib/go/src/debug/elf/testdata/*.obj
+       usr/lib/go/src/*.gox
+       "
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+       # By chance most portage arch names match Go
+       local portage_arch=$(tc-arch $@)
+       case "${portage_arch}" in
+               x86)    echo 386;;
+               x64-*)  echo amd64;;
+               ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo 
ppc64le ;;
+               s390) echo s390x ;;
+               *)              echo "${portage_arch}";;
+       esac
+}
+
+go_arm()
+{
+       case "${1:-${CHOST}}" in
+               armv5*) echo 5;;
+               armv6*) echo 6;;
+               armv7*) echo 7;;
+               *)
+                       die "unknown GOARM for ${1:-${CHOST}}"
+                       ;;
+       esac
+}
+
+go_os()
+{
+       case "${1:-${CHOST}}" in
+               *-linux*)       echo linux;;
+               *-darwin*)      echo darwin;;
+               *-freebsd*)     echo freebsd;;
+               *-netbsd*)      echo netbsd;;
+               *-openbsd*)     echo openbsd;;
+               *-solaris*)     echo solaris;;
+               *-cygwin*|*-interix*|*-winnt*)
+                       echo windows
+                       ;;
+               *)
+                       die "unknown GOOS for ${1:-${CHOST}}"
+                       ;;
+       esac
+}
+
+go_tuple()
+{
+       echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+       [[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile()
+{
+       if has_version -b dev-lang/go; then
+               export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+       elif has_version -b dev-lang/go-bootstrap; then
+               export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+       else
+               eerror "Go cannot be built without go or go-bootstrap installed"
+               die "Should not be here, please report a bug"
+       fi
+
+       export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+       export GOROOT="$(pwd)"
+       export GOBIN="${GOROOT}/bin"
+
+       # Go's build script does not use BUILD/HOST/TARGET consistently. :(
+       export GOHOSTARCH=$(go_arch ${CBUILD})
+       export GOHOSTOS=$(go_os ${CBUILD})
+       export CC=$(tc-getBUILD_CC)
+
+       export GOARCH=$(go_arch)
+       export GOOS=$(go_os)
+       export CC_FOR_TARGET=$(tc-getCC)
+       export CXX_FOR_TARGET=$(tc-getCXX)
+       if [[ ${ARCH} == arm ]]; then
+               export GOARM=$(go_arm)
+       fi
+
+       cd src
+       bash -x ./make.bash || die "build failed"
+}
+
+src_test()
+{
+       go_cross_compile && return 0
+
+       cd src
+       PATH="${GOBIN}:${PATH}" \
+       ./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+       local bin_path f x
+
+       dodir /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] https://golang.org/issue/2775
+       #
+       # deliberately use cp to retain permissions
+       cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+       if go_cross_compile; then
+               bin_path="bin/$(go_tuple)"
+       else
+               bin_path=bin
+       fi
+       for x in ${bin_path}/*; do
+               f=${x##*/}
+               dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+       done
+       einstalldocs
+
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               # fix install_name for test object (binutils_test) on Darwin, it
+               # is never used in real circumstances
+               local 
libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
+                     
libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
+               install_name_tool -id "${libmac64}" "${D}${libmac64}"
+       fi
+}

Reply via email to