New upstream version 0.4.0

Author: anthonyfok

.travis.yml

@@ -10,6 +10,7 @@ go:
 arch:
   - amd64
   - arm64
+  - ppc64le
 
 jobs:
   allow_failures:

dh-make-golang.md

@@ -0,0 +1,47 @@
+% DH-MAKE-GOLANG(1) 2018-09-15
+
+# NAME
+
+dh-make-golang - automatically creates Debian packaging for Go packages
+
+# SYNOPSIS
+
+**dh-make-golang** [*globalflags*] <*command*> [*flags*] <*args*>
+
+# DESCRIPTION
+
+**dh-make-golang** is a tool to automatically create Debian packaging for Go
+packages. Its goal is to automate away as much of the work as possible when
+creating a Debian package for a Go library package.
+
+For backwards compatibility, when no command is specified, the **make**
+command is executed. To learn more about a command, run
+"dh-make-golang <*command*> -help", for example "dh-make-golang make -help".
+
+# COMMANDS
+
+**make** *go-package-importpath*
+:   Create a Debian package. **dh-make-golang** will create new files and
+    directories in the current working directory. It will connect to
+    the internet to download the specified Go package.
+
+**search** *pattern*
+:   Search Debian for already-existing packages. Uses Go's default
+    regexp syntax (https://golang.org/pkg/regexp/syntax/).
+
+**estimate** *go-package-importpath*
+:   Estimates the work necessary to bring *go-package-importpath*
+    into Debian by printing all currently unpacked repositories.
+
+**create-salsa-project** *project-name*
+:   Create a project for hosting Debian packaging.
+
+# OPTIONS
+
+Run **dh-make-golang** -help for more details.
+
+# AUTHOR
+
+This manual page was written by Michael Stapelberg <[email protected]>
+and Dr.\ Tobias Quathamer <[email protected]>,
+for the Debian project (and may be used by others).

go.mod

@@ -3,7 +3,7 @@ module github.com/Debian/dh-make-golang
 go 1.12
 
 require (
-	github.com/google/go-github/v28 v28.1.1
+	github.com/google/go-github/v32 v32.1.0
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
 	github.com/mattn/go-isatty v0.0.10
 	github.com/russross/blackfriday v1.5.2

go.sum

@@ -1,6 +1,6 @@
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/go-github/v28 v28.1.1 h1:kORf5ekX5qwXO2mGzXXOjMe/g6ap8ahVe0sBEulhSxo=
-github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-github/v32 v32.1.0 h1:GWkQOdXqviCPx7Q7Fj+KyPoGm4SwHRh8rheoPhd27II=
+github.com/google/go-github/v32 v32.1.0/go.mod h1:rIEpZD9CTDQwDK9GDrtMTycQNA4JU3qBsCizh3q2WCI=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
@@ -16,7 +16,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

main.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/google/go-github/v28/github"
+	"github.com/google/go-github/v32/github"
 	"github.com/gregjones/httpcache"
 )
 

make.go

@@ -107,6 +107,7 @@ type upstream struct {
 	tarPath     string   // path to the downloaded or generated orig tarball tempfile
 	compression string   // compression method, either "gz" or "xz"
 	version     string   // Debian package upstream version number, e.g. 0.0~git20180204.1d24609
+	tag         string   // Latest upstream tag, if any
 	commitIsh   string   // commit-ish corresponding to upstream version to be packaged
 	remote      string   // git remote, set to short hostname if upstream git history is included
 	firstMain   string   // import path of the first main package within repo, if any
@@ -144,16 +145,16 @@ func (u *upstream) tarballFromHoster() error {
 
 	switch repoU.Host {
 	case "github.com":
-		tarURL = fmt.Sprintf("%s/archive/v%s.tar.%s",
-			repo, u.version, u.compression)
+		tarURL = fmt.Sprintf("%s/archive/%s.tar.%s",
+			repo, u.tag, u.compression)
 	case "gitlab.com":
 		parts := strings.Split(repoU.Path, "/")
 		if len(parts) < 3 {
 			return fmt.Errorf("Incomplete repo URL: %s", u.rr.Repo)
 		}
 		project := parts[2]
-		tarURL = fmt.Sprintf("%s/-/archive/v%[3]s/%[2]s-%s.tar.%s",
-			repo, project, u.version, u.compression)
+		tarURL = fmt.Sprintf("%s/-/archive/%s/%s-%s.tar.%s",
+			repo, u.tag, project, u.tag, u.compression)
 	default:
 		return fmt.Errorf("Unsupported hoster")
 	}
@@ -563,6 +564,7 @@ func shortHostName(gopkg string, allowUnknownHoster bool) (host string, err erro
 		"howett.net":        "howett",
 		"k8s.io":            "k8s",
 		"pault.ag":          "pault",
+		"rsc.io":            "rsc",
 		"salsa.debian.org":  "debian",
 		"sigs.k8s.io":       "k8s-sigs",
 	}
@@ -596,7 +598,15 @@ func debianNameFromGopkg(gopkg string, t packageType, allowUnknownHoster bool) s
 	}
 	parts[0] = host
 
-	return strings.Trim("golang-"+strings.ToLower(strings.Replace(strings.Join(parts, "-"), "_", "-", -1)), "-")
+	for i := range parts {
+		if i == 0 {
+			continue
+		}
+
+		parts[i] = normalizeDebianProgramName(parts[i])
+	}
+
+	return strings.Trim("golang-"+strings.Join(parts, "-"), "-")
 }
 
 func getDebianName() string {

template.go

@@ -46,6 +46,9 @@ func writeTemplates(dir, gopkg, debsrc, debLib, debProg, debversion string,
 	if err := writeDebianPackageInstall(dir, debLib, debProg, pkgType); err != nil {
 		return err
 	}
+	if err := writeDebianUpstreamMetadata(dir, gopkg); err != nil {
+		return err
+	}
 
 	if err := writeDebianGbpConf(dir, dep14, pristineTar); err != nil {
 		return err
@@ -143,13 +146,12 @@ func writeDebianControl(dir, gopkg, debsrc, debLib, debProg string, pkgType pack
 	fmt.Fprintf(f, "Source: %s\n", debsrc)
 	fmt.Fprintf(f, "Maintainer: Debian Go Packaging Team <[email protected]>\n")
 	fprintfControlField(f, "Uploaders", []string{getDebianName() + " <" + getDebianEmail() + ">"})
-	// TODO: change this once we have a “golang” section.
-	fmt.Fprintf(f, "Section: devel\n")
+	fmt.Fprintf(f, "Section: golang\n")
 	fmt.Fprintf(f, "Testsuite: autopkgtest-pkg-go\n")
 	fmt.Fprintf(f, "Priority: optional\n")
 
 	builddeps := append([]string{
-		"debhelper-compat (= 12)",
+		"debhelper-compat (= 13)",
 		"dh-golang",
 		"golang-any"},
 		dependencies...)
@@ -378,6 +380,37 @@ func writeDebianPackageInstall(dir, debLib, debProg string, pkgType packageType)
 	return nil
 }
 
+func writeDebianUpstreamMetadata(dir, gopkg string) error {
+	// TODO: Support other hosters too
+	host := "github.com"
+
+	owner, repo, err := findGitHubRepo(gopkg)
+	if err != nil {
+		log.Printf("debian/upstream/metadata: Unable to resolve %s to github.com, skipping\n", gopkg)
+		return nil
+	}
+	if !strings.HasPrefix(gopkg, "github.com/") {
+		log.Printf("debian/upstream/metadata: %s resolves to %s/%s/%s\n", gopkg, host, owner, repo)
+	}
+
+	if err := os.Mkdir(filepath.Join(dir, "debian", "upstream"), 0755); err != nil {
+		return err
+	}
+	f, err := os.Create(filepath.Join(dir, "debian", "upstream", "metadata"))
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	fmt.Fprintf(f, "---\n")
+	fmt.Fprintf(f, "Bug-Database: https://%s/%s/%s/issues\n", host, owner, repo)
+	fmt.Fprintf(f, "Bug-Submit: https://%s/%s/%s/issues/new\n", host, owner, repo)
+	fmt.Fprintf(f, "Repository: https://%s/%s/%s.git\n", host, owner, repo)
+	fmt.Fprintf(f, "Repository-Browse: https://%s/%s/%s\n", host, owner, repo)
+
+	return nil
+}
+
 func writeDebianGitLabCI(dir string) error {
 	const gitlabciymlTmpl = `# auto-generated, DO NOT MODIFY.
 # The authoritative copy of this file lives at:

version.go

@@ -9,6 +9,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode"
 )
 
 var (
@@ -37,6 +38,7 @@ func pkgVersionFromGit(gitdir string, u *upstream, forcePrerelease bool) (string
 	if out, err := cmd.Output(); err == nil {
 		latestTag = strings.TrimSpace(string(out))
 		u.hasRelease = true
+		u.tag = latestTag
 		log.Printf("Found latest tag %q", latestTag)
 
 		if !semverRegexp.MatchString(latestTag) {
@@ -64,7 +66,9 @@ func pkgVersionFromGit(gitdir string, u *upstream, forcePrerelease bool) (string
 		}
 
 		u.commitIsh = latestTag
-		u.version = strings.TrimPrefix(latestTag, "v")
+		u.version = strings.TrimLeftFunc(latestTag, func(r rune) bool {
+			return !unicode.IsNumber(r)
+		})
 
 		if forcePrerelease {
 			log.Printf("INFO: Force packaging master (prerelease) as requested by user")

version_current.go

@@ -15,8 +15,8 @@ type Version struct {
 
 var currentVersion = Version{
 	major:      0,
-	minor:      3,
-	patch:      3,
+	minor:      4,
+	patch:      0,
 	preRelease: "",
 }
 

version_test.go

@@ -19,6 +19,9 @@ func gitCmdOrFatal(t *testing.T, tempdir string, arg ...string) {
 }
 
 func TestSnapshotVersion(t *testing.T) {
+	os.Setenv("TZ", "UTC")
+	defer os.Unsetenv("TZ")
+
 	tempdir, err := ioutil.TempDir("", "dh-make-golang")
 	if err != nil {
 		t.Fatalf("Could not create temp dir: %v", err)