1 |
commit: 86c7faa85ac4383a8083c7fa91296524e5b8136e |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 31 18:04:21 2018 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 31 18:20:06 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c7faa8 |
7 |
|
8 |
dev-lang/go: 1.10.1 security bump for bug #650014 |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
RepoMan-Options: --force |
12 |
|
13 |
dev-lang/go/Manifest | 1 + |
14 |
dev-lang/go/go-1.10.1.ebuild | 228 +++++++++++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 229 insertions(+) |
16 |
|
17 |
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest |
18 |
index bda36bca360..35a76b7ee58 100644 |
19 |
--- a/dev-lang/go/Manifest |
20 |
+++ b/dev-lang/go/Manifest |
21 |
@@ -9,6 +9,7 @@ DIST go-linux-ppc64-bootstrap-1.8.tbz 52315782 BLAKE2B 6be0a48e8bc4e5fed4d34f8aa |
22 |
DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 BLAKE2B 7a28ec5a381369c4e9415c8360e904c2545380513afd328077c584e8af0bf6bd818aa03e5a58c350cbb98facc1c9dccb02b06adcb27233875497cf5d33265912 SHA512 6931d999dd0ee1ff44c4cec48acb27af061f57f87aa74802dcebab78553b46bc8ac732f07fe91e5074dbdd32c55b707994875934bfb12bb4276d71eb1d06c4ba |
23 |
DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324bbb30a383d599e31a0d2093d24797dbcd0e799a662a3589dbb87d2f5dd16df07c4cf8f1e444e87b540ec732746bb025dc9271f8 SHA512 d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a |
24 |
DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d |
25 |
+DIST go1.10.1.src.tar.gz 18305765 BLAKE2B 61b8db22c50b9a4653244dc18267f405607755932d84ea2c475338a9f4a5421da2bb8cc808dbd166aa35c3c8778180bf47d6e51ebe303bc62e582516919058f9 SHA512 13f6b0643a4f92eeca04444b9fa10de38fc3427daea9aa3227cf9a5738ffee1a3f2e355ba5faf711b8506f7de118bdcd3b9064b65407a22613523e29ffd73415 |
26 |
DIST go1.10.src.tar.gz 18300467 BLAKE2B 2058c450fb72f008464381443d180902b9a0bb11691d112d16bcc1a3f5177bfc39d15ed4532c0d85997398b2f07e40c1f9fedf46f1d0e08c636af1e44bd8ef10 SHA512 59f089e1ffb2d3aba5ada329d4f0d1181c3c4f01fa64f19d0b753f8a989cb59cf290ad88d215cadc18ef99aba8518e44c9bc258c07eaffc834c55e4a37bd4651 |
27 |
DIST go1.9.1.src.tar.gz 16377700 BLAKE2B 63558227bdbff43da788c43e082e54dfa0210e53de650b3e2a4ab09c55a9937a0d1fee66be8263653c2d8be774611f2485c7e673b8a5fbc7f7c0adc5fd4fdc1f SHA512 3c5d11089a54c61acd1a4fad9618ddb2058cc783a54564407ee50e37c864deaadfd5effeab623080c136a599096f448aae091ef41d0afca1abfcdb98adf4a793 |
28 |
DIST go1.9.2.src.tar.gz 16383591 BLAKE2B 3ad9d0e7b6b817a4eab7ffcca30ba86a0e50e68ed028b11f54b8813f4b1a9a0598c79d501c733e7fbf77831c8f7df681692f9aa6b860b16a6288dcab59d40226 SHA512 1034098575c317eeaf648629690a4dea0c479a69c3b80d9917f6b96c8781ce79c0f29859f667dc4e07d47a44972aa09bd0163a458f897cf45f9d09eb03e4abb5 |
29 |
|
30 |
diff --git a/dev-lang/go/go-1.10.1.ebuild b/dev-lang/go/go-1.10.1.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..ca35487e101 |
33 |
--- /dev/null |
34 |
+++ b/dev-lang/go/go-1.10.1.ebuild |
35 |
@@ -0,0 +1,228 @@ |
36 |
+# Copyright 1999-2018 Gentoo Foundation |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=6 |
40 |
+ |
41 |
+export CBUILD=${CBUILD:-${CHOST}} |
42 |
+export CTARGET=${CTARGET:-${CHOST}} |
43 |
+ |
44 |
+MY_PV=${PV/_/} |
45 |
+ |
46 |
+inherit toolchain-funcs |
47 |
+ |
48 |
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist" |
49 |
+BOOTSTRAP_VERSION="bootstrap-1.8" |
50 |
+BOOTSTRAP_URI=" |
51 |
+amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz ) |
52 |
+arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz ) |
53 |
+arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz ) |
54 |
+ppc64? ( |
55 |
+ ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz |
56 |
+ ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz |
57 |
+) |
58 |
+s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz ) |
59 |
+x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz ) |
60 |
+amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz ) |
61 |
+x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz ) |
62 |
+x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz ) |
63 |
+x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz ) |
64 |
+" |
65 |
+ |
66 |
+case ${PV} in |
67 |
+*9999*) |
68 |
+ EGIT_REPO_URI="https://github.com/golang/go.git" |
69 |
+ inherit git-r3 |
70 |
+ ;; |
71 |
+*) |
72 |
+ SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz " |
73 |
+ S="${WORKDIR}"/go |
74 |
+ case ${PV} in |
75 |
+ *_beta*|*_rc*) ;; |
76 |
+ *) |
77 |
+ KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris" |
78 |
+ # The upstream tests fail under portage but pass if the build is |
79 |
+ # run according to their documentation [1]. |
80 |
+ # I am restricting the tests on released versions until this is |
81 |
+ # solved. |
82 |
+ # [1] https://golang.org/issues/18442 |
83 |
+ RESTRICT="test" |
84 |
+ ;; |
85 |
+ esac |
86 |
+esac |
87 |
+SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )" |
88 |
+ |
89 |
+DESCRIPTION="A concurrent garbage collected and typesafe programming language" |
90 |
+HOMEPAGE="https://golang.org" |
91 |
+ |
92 |
+LICENSE="BSD" |
93 |
+SLOT="0/${PV}" |
94 |
+IUSE="gccgo" |
95 |
+ |
96 |
+DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )" |
97 |
+RDEPEND="!<dev-go/go-tools-0_pre20150902" |
98 |
+ |
99 |
+# These test data objects have writable/executable stacks. |
100 |
+QA_EXECSTACK=" |
101 |
+ usr/lib/go/src/debug/elf/testdata/*.obj |
102 |
+ usr/lib/go/src/go/internal/gccgoimporter/testdata/escapeinfo.gox |
103 |
+ usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox |
104 |
+ usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox |
105 |
+ " |
106 |
+ |
107 |
+# Do not complain about CFLAGS, etc, since Go doesn't use them. |
108 |
+QA_FLAGS_IGNORED='.*' |
109 |
+ |
110 |
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*" |
111 |
+ |
112 |
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail. |
113 |
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*" |
114 |
+ |
115 |
+# Do not strip this package. Stripping is unsupported upstream and may |
116 |
+# fail. |
117 |
+RESTRICT+=" strip" |
118 |
+ |
119 |
+DOCS=( |
120 |
+AUTHORS |
121 |
+CONTRIBUTING.md |
122 |
+CONTRIBUTORS |
123 |
+PATENTS |
124 |
+README.md |
125 |
+) |
126 |
+ |
127 |
+go_arch() |
128 |
+{ |
129 |
+ # By chance most portage arch names match Go |
130 |
+ local portage_arch=$(tc-arch $@) |
131 |
+ case "${portage_arch}" in |
132 |
+ x86) echo 386;; |
133 |
+ x64-*) echo amd64;; |
134 |
+ ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;; |
135 |
+ s390) echo s390x ;; |
136 |
+ *) echo "${portage_arch}";; |
137 |
+ esac |
138 |
+} |
139 |
+ |
140 |
+go_arm() |
141 |
+{ |
142 |
+ case "${1:-${CHOST}}" in |
143 |
+ armv5*) echo 5;; |
144 |
+ armv6*) echo 6;; |
145 |
+ armv7*) echo 7;; |
146 |
+ *) |
147 |
+ die "unknown GOARM for ${1:-${CHOST}}" |
148 |
+ ;; |
149 |
+ esac |
150 |
+} |
151 |
+ |
152 |
+go_os() |
153 |
+{ |
154 |
+ case "${1:-${CHOST}}" in |
155 |
+ *-linux*) echo linux;; |
156 |
+ *-darwin*) echo darwin;; |
157 |
+ *-freebsd*) echo freebsd;; |
158 |
+ *-netbsd*) echo netbsd;; |
159 |
+ *-openbsd*) echo openbsd;; |
160 |
+ *-solaris*) echo solaris;; |
161 |
+ *-cygwin*|*-interix*|*-winnt*) |
162 |
+ echo windows |
163 |
+ ;; |
164 |
+ *) |
165 |
+ die "unknown GOOS for ${1:-${CHOST}}" |
166 |
+ ;; |
167 |
+ esac |
168 |
+} |
169 |
+ |
170 |
+go_tuple() |
171 |
+{ |
172 |
+ echo "$(go_os $@)_$(go_arch $@)" |
173 |
+} |
174 |
+ |
175 |
+go_cross_compile() |
176 |
+{ |
177 |
+ [[ $(go_tuple ${CBUILD}) != $(go_tuple) ]] |
178 |
+} |
179 |
+ |
180 |
+pkg_pretend() |
181 |
+{ |
182 |
+ # make.bash does not understand cross-compiling a cross-compiler |
183 |
+ if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then |
184 |
+ die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}" |
185 |
+ fi |
186 |
+} |
187 |
+ |
188 |
+src_unpack() |
189 |
+{ |
190 |
+ if [[ ${PV} = 9999 ]]; then |
191 |
+ git-r3_src_unpack |
192 |
+ fi |
193 |
+ default |
194 |
+} |
195 |
+ |
196 |
+src_compile() |
197 |
+{ |
198 |
+ export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap |
199 |
+ if use gccgo; then |
200 |
+ mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die |
201 |
+ local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version) |
202 |
+ [[ -x ${go_binary} ]] || go_binary=$( |
203 |
+ find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) | |
204 |
+ sort -V | tail -n1) |
205 |
+ [[ -x ${go_binary} ]] || |
206 |
+ die "go-$(gcc-major-version): command not found" |
207 |
+ ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die |
208 |
+ fi |
209 |
+ export GOROOT_FINAL="${EPREFIX}"/usr/lib/go |
210 |
+ export GOROOT="$(pwd)" |
211 |
+ export GOBIN="${GOROOT}/bin" |
212 |
+ |
213 |
+ # Go's build script does not use BUILD/HOST/TARGET consistently. :( |
214 |
+ export GOHOSTARCH=$(go_arch ${CBUILD}) |
215 |
+ export GOHOSTOS=$(go_os ${CBUILD}) |
216 |
+ export CC=$(tc-getBUILD_CC) |
217 |
+ |
218 |
+ export GOARCH=$(go_arch) |
219 |
+ export GOOS=$(go_os) |
220 |
+ export CC_FOR_TARGET=$(tc-getCC) |
221 |
+ export CXX_FOR_TARGET=$(tc-getCXX) |
222 |
+ if [[ ${ARCH} == arm ]]; then |
223 |
+ export GOARM=$(go_arm) |
224 |
+ fi |
225 |
+ einfo "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}" |
226 |
+ |
227 |
+ cd src |
228 |
+ ./make.bash || die "build failed" |
229 |
+} |
230 |
+ |
231 |
+src_test() |
232 |
+{ |
233 |
+ go_cross_compile && return 0 |
234 |
+ |
235 |
+ cd src |
236 |
+ PATH="${GOBIN}:${PATH}" \ |
237 |
+ ./run.bash -no-rebuild || die "tests failed" |
238 |
+} |
239 |
+ |
240 |
+src_install() |
241 |
+{ |
242 |
+ local bin_path f x |
243 |
+ |
244 |
+ dodir /usr/lib/go |
245 |
+ |
246 |
+ # There is a known issue which requires the source tree to be installed [1]. |
247 |
+ # Once this is fixed, we can consider using the doc use flag to control |
248 |
+ # installing the doc and src directories. |
249 |
+ # [1] https://golang.org/issue/2775 |
250 |
+ # |
251 |
+ # deliberately use cp to retain permissions |
252 |
+ cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go |
253 |
+ if go_cross_compile; then |
254 |
+ bin_path="bin/$(go_tuple)" |
255 |
+ else |
256 |
+ bin_path=bin |
257 |
+ fi |
258 |
+ for x in ${bin_path}/*; do |
259 |
+ f=${x##*/} |
260 |
+ dosym ../lib/go/${bin_path}/${f} /usr/bin/${f} |
261 |
+ done |
262 |
+ einstalldocs |
263 |
+} |