Merge remote-tracking branch 'origin/master'

Author: fkollmann

AUTHORS

@@ -353,7 +353,7 @@ Elena Grahovac <[email protected]>
 Elias Naur <[email protected]>
 Elliot Morrison-Reed <[email protected]>
 Emerson Lin <[email protected]>
-Emil Hessman <[email protected]> <[email protected]>
+Emil Hessman <[email protected]>
 Emilien Kenler <[email protected]>
 Emmanuel Odeke <[email protected]> <[email protected]>
 Empirical Interfaces Inc.

CONTRIBUTORS

@@ -473,7 +473,7 @@ Elena Grahovac <[email protected]>
 Elias Naur <[email protected]>
 Elliot Morrison-Reed <[email protected]>
 Emerson Lin <[email protected]>
-Emil Hessman <[email protected]> <[email protected]>
+Emil Hessman <[email protected]>
 Emilien Kenler <[email protected]>
 Emmanuel Odeke <[email protected]> <[email protected]>
 Eoghan Sherry <[email protected]>
@@ -641,7 +641,7 @@ Ingo Krabbe <[email protected]>
 Ingo Oeser <[email protected]> <[email protected]>
 Irieda Noboru <[email protected]>
 Isaac Wagner <[email protected]>
-Iskander Sharipov <[email protected]>
+Iskander Sharipov <[email protected]> <[email protected]>
 Ivan Babrou <[email protected]>
 Ivan Bertona <[email protected]>
 Ivan Krasin <[email protected]>

README.md

@@ -31,7 +31,7 @@ in your web browser for source installation instructions.
 
 ### Contributing
 
-Go is the work of hundreds of contributors. We appreciate your help!
+Go is the work of thousands of contributors. We appreciate your help!
 
 To contribute, please read the contribution guidelines:
 	https://golang.org/doc/contribute.html

api/README

@@ -11,4 +11,3 @@ compatibility.
 next.txt is the only file intended to be mutated. It's a list of
 features that may be added to the next version. It only affects
 warning output from the go api tool.
-

api/except.txt

@@ -2,6 +2,7 @@ pkg encoding/json, method (*RawMessage) MarshalJSON() ([]uint8, error)
 pkg math/big, const MaxBase = 36
 pkg math/big, type Word uintptr
 pkg net, func ListenUnixgram(string, *UnixAddr) (*UDPConn, error)
+pkg os, const ModeType = 2399141888
 pkg os (linux-arm), const O_SYNC = 4096
 pkg os (linux-arm-cgo), const O_SYNC = 4096
 pkg syscall (darwin-386), const ImplementsGetwd = false
@@ -361,3 +362,24 @@ pkg syscall (openbsd-386-cgo), const SYS_KILL = 37
 pkg syscall (openbsd-amd64), const SYS_KILL = 37
 pkg syscall (openbsd-amd64-cgo), const SYS_KILL = 37
 pkg unicode, const Version = "9.0.0"
+pkg text/template/parse, method (*VariableNode) Copy() Node
+pkg text/template/parse, method (*VariableNode) String() string
+pkg text/template/parse, method (VariableNode) Position() Pos
+pkg text/template/parse, method (VariableNode) Type() NodeType
+pkg text/template/parse, type PipeNode struct, Decl []*VariableNode
+pkg text/template/parse, type VariableNode struct
+pkg text/template/parse, type VariableNode struct, Ident []string
+pkg text/template/parse, type VariableNode struct, embedded NodeType
+pkg text/template/parse, type VariableNode struct, embedded Pos
+pkg syscall (windows-386), type CertChainPolicyPara struct, ExtraPolicyPara uintptr
+pkg syscall (windows-386), type CertChainPolicyStatus struct, ExtraPolicyStatus uintptr
+pkg syscall (windows-386), type CertContext struct, CertInfo uintptr
+pkg syscall (windows-386), type CertRevocationInfo struct, CrlInfo uintptr
+pkg syscall (windows-386), type CertRevocationInfo struct, OidSpecificInfo uintptr
+pkg syscall (windows-386), type CertSimpleChain struct, TrustListInfo uintptr
+pkg syscall (windows-amd64), type CertChainPolicyPara struct, ExtraPolicyPara uintptr
+pkg syscall (windows-amd64), type CertChainPolicyStatus struct, ExtraPolicyStatus uintptr
+pkg syscall (windows-amd64), type CertContext struct, CertInfo uintptr
+pkg syscall (windows-amd64), type CertRevocationInfo struct, CrlInfo uintptr
+pkg syscall (windows-amd64), type CertRevocationInfo struct, OidSpecificInfo uintptr
+pkg syscall (windows-amd64), type CertSimpleChain struct, TrustListInfo uintptr

doc/contribute.html

@@ -579,13 +579,14 @@ <h2 id="commit_messages">Writing good commit messages</h2>
 
 Fixes #159
 </pre>
+
 </p>
 
 <h3>First line</h3>
 
 <p>
-The first line of the change description is conventionally a one-line
-summary of the change, prefixed by the primary affected package.</p>
+The first line of the change description is conventionally a short one-line
+summary of the change, prefixed by the primary affected package.
 
 <p>It should be written so to complete the sentence "This change modifies Go to _____."</p>
 
@@ -595,7 +596,7 @@ <h3>Main content</h3>
 change and explain what it does.
 Write in complete sentences with correct punctuation, just like
 for your comments in Go.
-If there is a helpful reference, mention it here.
+Don't use HTML, Markdown, or any other markup language.
 </p>
 
 <h3>Referencing issues</h3>
@@ -621,10 +622,6 @@ <h3>Referencing issues</h3>
 </p>
 
 
-
-
-
-
 <h2 id="review">The review process</h2>
 
 <p>

doc/devel/release.html

@@ -16,11 +16,11 @@ <h2 id="policy">Release Policy</h2>
 
 <p>
 Each major Go release is supported until there are two newer major releases.
-For example, Go 1.8 is supported until Go 1.10 is released,
-and Go 1.9 is supported until Go 1.11 is released.
+For example, Go 1.5 was supported until the Go 1.7 release, and Go 1.6 was
+supported until the Go 1.8 release.
 We fix critical problems, including <a href="/security">critical security problems</a>,
 in supported releases as needed by issuing minor revisions
-(for example, Go 1.9.1, Go 1.9.2, and so on).
+(for example, Go 1.6.1, Go 1.6.2, and so on).
 </p>
 
 <h2 id="go1.10">go1.10 (released 2018/02/16)</h2>
@@ -30,6 +30,17 @@ <h2 id="go1.10">go1.10 (released 2018/02/16)</h2>
 Read the <a href="/doc/go1.10">Go 1.10 Release Notes</a> for more information.
 </p>
 
+<h3 id="go1.10.minor">Minor revisions</h3>
+
+<p>
+go1.10.1 (released 2018/03/28) includes fixes to the compiler, runtime, and the
+<code>archive/zip</code>, <code>crypto/tls</code>, <code>crypto/x509</code>,
+<code>encoding/json</code>, <code>net</code>, <code>net/http</code>, and
+<code>net/http/pprof</code> packages.
+See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.10.1">Go
+1.10.1 milestone</a> on our issue tracker for details.
+</p>
+
 <h2 id="go1.9">go1.9 (released 2017/08/24)</h2>
 
 <p>
@@ -70,6 +81,13 @@ <h3 id="go1.9.minor">Minor revisions</h3>
 1.9.4</a> milestone on our issue tracker for details.
 </p>
 
+<p>
+go1.9.5 (released 2018/03/28) includes fixes to the compiler, go command, and
+<code>net/http/pprof</code> package.
+See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.9.5">Go
+1.9.5 milestone</a> on our issue tracker for details.
+</p>
+
 <h2 id="go1.8">go1.8 (released 2017/02/16)</h2>
 
 <p>

doc/install-source.html

@@ -307,7 +307,7 @@ <h2 id="testing">Testing your installation</h2>
 import "fmt"
 
 func main() {
-    fmt.Printf("hello, world\n")
+	fmt.Printf("hello, world\n")
 }
 </pre>
 

doc/install.html

@@ -106,6 +106,14 @@ <h3 id="tarball">Linux, Mac OS X, and FreeBSD tarballs</h3>
 export PATH=$PATH:/usr/local/go/bin
 </pre>
 
+<p>
+<b>Note</b>: changes made to a <code>profile</code> file may not apply until the
+next time you log into your computer.
+To apply the changes immediately, just run the shell commands directly
+or execute them from the profile using a command such as
+<code>source $HOME/.profile</code>.
+</p>
+
 <h4 id="tarball_non_standard">Installing to a custom location</h4>
 
 <p>
@@ -236,7 +244,7 @@ <h2 id="testing">Test your installation</h2>
 import "fmt"
 
 func main() {
-    fmt.Printf("hello, world\n")
+	fmt.Printf("hello, world\n")
 }
 </pre>
 
@@ -278,7 +286,7 @@ <h2 id="testing">Test your installation</h2>
 <p>
 You can run <code>go</code> <code>install</code> to install the binary into
 your workspace's <code>bin</code> directory
-or <code>go</code> <code>clean</code> to remove it.
+or <code>go</code> <code>clean</code> <code>-i</code> to remove it.
 </p>
 
 <p>

misc/ios/detect.go

@@ -14,6 +14,7 @@ package main
 
 import (
 	"bytes"
+	"crypto/x509"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -22,20 +23,21 @@ import (
 )
 
 func main() {
-	devID := detectDevID()
+	udids := getLines(exec.Command("idevice_id", "-l"))
+	if len(udids) == 0 {
+		fail("no udid found; is a device connected?")
+	}
 
-	udid := detectUDID()
-	mps := detectMobileProvisionFiles(udid)
+	mps := detectMobileProvisionFiles(udids)
 	if len(mps) == 0 {
-		fail("did not find mobile provision matching device udid %s", udid)
+		fail("did not find mobile provision matching device udids %q", udids)
 	}
 
 	fmt.Println("Available provisioning profiles below.")
 	fmt.Println("NOTE: Any existing app on the device with the app id specified by GOIOS_APP_ID")
 	fmt.Println("will be overwritten when running Go programs.")
 	for _, mp := range mps {
 		fmt.Println()
-		fmt.Printf("export GOIOS_DEV_ID=%s\n", devID)
 		f, err := ioutil.TempFile("", "go_ios_detect_")
 		check(err)
 		fname := f.Name()
@@ -46,6 +48,12 @@ func main() {
 		check(err)
 		check(f.Close())
 
+		cert, err := plistExtract(fname, "DeveloperCertificates:0")
+		check(err)
+		pcert, err := x509.ParseCertificate(cert)
+		check(err)
+		fmt.Printf("export GOIOS_DEV_ID=\"%s\"\n", pcert.Subject.CommonName)
+
 		appID, err := plistExtract(fname, "Entitlements:application-identifier")
 		check(err)
 		fmt.Printf("export GOIOS_APP_ID=%s\n", appID)
@@ -56,39 +64,7 @@ func main() {
 	}
 }
 
-func detectDevID() string {
-	cmd := exec.Command("security", "find-identity", "-p", "codesigning", "-v")
-	lines := getLines(cmd)
-
-	for _, line := range lines {
-		if !bytes.Contains(line, []byte("iPhone Developer")) {
-			continue
-		}
-		if bytes.Contains(line, []byte("REVOKED")) {
-			continue
-		}
-		fields := bytes.Fields(line)
-		return string(fields[1])
-	}
-	fail("no code signing identity found")
-	panic("unreachable")
-}
-
-var udidPrefix = []byte("UniqueDeviceID: ")
-
-func detectUDID() []byte {
-	cmd := exec.Command("ideviceinfo")
-	lines := getLines(cmd)
-	for _, line := range lines {
-		if bytes.HasPrefix(line, udidPrefix) {
-			return bytes.TrimPrefix(line, udidPrefix)
-		}
-	}
-	fail("udid not found; is the device connected?")
-	panic("unreachable")
-}
-
-func detectMobileProvisionFiles(udid []byte) []string {
+func detectMobileProvisionFiles(udids [][]byte) []string {
 	cmd := exec.Command("mdfind", "-name", ".mobileprovision")
 	lines := getLines(cmd)
 
@@ -98,11 +74,17 @@ func detectMobileProvisionFiles(udid []byte) []string {
 			continue
 		}
 		xmlLines := getLines(parseMobileProvision(string(line)))
-		for _, xmlLine := range xmlLines {
-			if bytes.Contains(xmlLine, udid) {
-				files = append(files, string(line))
+		matches := 0
+		for _, udid := range udids {
+			for _, xmlLine := range xmlLines {
+				if bytes.Contains(xmlLine, udid) {
+					matches++
+				}
 			}
 		}
+		if matches == len(udids) {
+			files = append(files, string(line))
+		}
 	}
 	return files
 }
@@ -121,7 +103,12 @@ func plistExtract(fname string, path string) ([]byte, error) {
 
 func getLines(cmd *exec.Cmd) [][]byte {
 	out := output(cmd)
-	return bytes.Split(out, []byte("\n"))
+	lines := bytes.Split(out, []byte("\n"))
+	// Skip the empty line at the end.
+	if len(lines[len(lines)-1]) == 0 {
+		lines = lines[:len(lines)-1]
+	}
+	return lines
 }
 
 func output(cmd *exec.Cmd) []byte {

misc/ios/go_darwin_arm_exec.go

@@ -94,6 +94,13 @@ func main() {
 		log.Fatal(err)
 	}
 
+	appdir := filepath.Join(tmpdir, "gotest.app")
+	os.RemoveAll(appdir)
+
+	if err := assembleApp(appdir, os.Args[1]); err != nil {
+		log.Fatal(err)
+	}
+
 	// This wrapper uses complicated machinery to run iOS binaries. It
 	// works, but only when running one binary at a time.
 	// Use a file lock to make sure only one wrapper is running at a time.
@@ -108,6 +115,7 @@ func main() {
 	if err := syscall.Flock(int(lock.Fd()), syscall.LOCK_EX); err != nil {
 		log.Fatal(err)
 	}
+
 	// Approximately 1 in a 100 binaries fail to start. If it happens,
 	// try again. These failures happen for several reasons beyond
 	// our control, but all of them are safe to retry as they happen
@@ -118,7 +126,7 @@ func main() {
 		if i > 0 {
 			fmt.Fprintln(os.Stderr, "start timeout, trying again")
 		}
-		err = run(os.Args[1], os.Args[2:])
+		err = run(appdir, os.Args[2:])
 		if err == nil || err != errRetry {
 			break
 		}
@@ -140,9 +148,7 @@ func getenv(envvar string) string {
 	return s
 }
 
-func run(bin string, args []string) (err error) {
-	appdir := filepath.Join(tmpdir, "gotest.app")
-	os.RemoveAll(appdir)
+func assembleApp(appdir, bin string) error {
 	if err := os.MkdirAll(appdir, 0755); err != nil {
 		return err
 	}
@@ -182,7 +188,10 @@ func run(bin string, args []string) (err error) {
 	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("codesign: %v", err)
 	}
+	return nil
+}
 
+func run(appdir string, args []string) (err error) {
 	oldwd, err := os.Getwd()
 	if err != nil {
 		return err
@@ -259,11 +268,9 @@ func run(bin string, args []string) (err error) {
 	}
 
 	started = true
-
-	s.doCmd("run", "stop reason = signal SIGINT", 20*time.Second)
-
 	startTestsLen := s.out.Len()
-	fmt.Fprintln(s.in, `process continue`)
+
+	fmt.Fprintln(s.in, "run")
 
 	passed := func(out *buf) bool {
 		// Just to make things fun, lldb sometimes translates \n into \r\n.
@@ -319,7 +326,6 @@ func newSession(appdir string, args []string, opts options) (*lldbSession, error
 		iosdPath,
 		"--debug",
 		"-u",
-		"-r",
 		"-n",
 		`--args=` + strings.Join(args, " ") + ``,
 		"--bundle", appdir,