Fix build: encoding/line fork removal; new Go release.

build.pl

@@ -242,7 +242,7 @@ TARGET: server/go/sigserver
     - lib/go/ext/openpgp/armor
 
 TARGET: website
-    - lib/go/line
+    # (no deps)
 
 TARGET: clients/go/camput
     - lib/go/client
@@ -258,9 +258,6 @@ TARGET: clients/go/camget
 TARGET: lib/go/http
     # (no deps, fork of Go's http library)
 
-TARGET: lib/go/line
-    # (no deps, fork of Go's encoding/line library)
-
 TARGET: lib/go/ext/openpgp/error
     # (no deps)
 

website/Makefile

@@ -1,7 +1,5 @@
 include $(GOROOT)/src/Make.inc
 
-PREREQ=$(QUOTED_GOROOT)/pkg/$(GOOS)_$(GOARCH)/camli/encoding/line.a
-
 TARG=camweb
 GOFILES=\
 	camweb.go\

website/camweb.go

@@ -100,7 +100,7 @@ func writeText(w io.Writer, text []byte, html bool) {
 
 func applyTemplate(t *template.Template, name string, data interface{}) []byte {
 	var buf bytes.Buffer
-	if err := t.Execute(data, &buf); err != nil {
+	if err := t.Execute(&buf, data); err != nil {
 		log.Printf("%s.Execute: %s", name, err)
 	}
 	return buf.Bytes()
@@ -117,7 +117,7 @@ func servePage(w http.ResponseWriter, title, subtitle string, content []byte) {
 		content,
 	}
 
-	if err := pageHtml.Execute(&d, w); err != nil {
+	if err := pageHtml.Execute(w, &d); err != nil {
 		log.Printf("godocHTML.Execute: %s", err)
 	}
 }