New upstream version 0.3.2

Author: anthonyfok

make.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"net/url"
 	"os"
 	"os/exec"
 	"os/user"
@@ -133,30 +134,35 @@ func (u *upstream) get(gopath, repo, rev string) error {
 	return rr.VCS.Create(dir, rr.Repo)
 }
 
-func (u *upstream) tarballFromHoster(repo string) error {
-	var url string
-	parts := strings.Split(repo, "/")
-	if len(parts) < 3 {
-		return fmt.Errorf("Unsupported hoster")
+func (u *upstream) tarballFromHoster() error {
+	var tarURL string
+	repo := strings.TrimSuffix(u.rr.Repo, ".git")
+	repoU, err := url.Parse(repo)
+	if err != nil {
+		return err
 	}
-	host, owner, project := parts[0], parts[1], parts[2]
 
-	switch host {
+	switch repoU.Host {
 	case "github.com":
-		url = fmt.Sprintf("https://%s/%s/%s/archive/v%s.tar.%s",
-			host, owner, project, u.version, u.compression)
+		tarURL = fmt.Sprintf("%s/archive/v%s.tar.%s",
+			repo, u.version, u.compression)
 	case "gitlab.com":
-		url = fmt.Sprintf("https://%s/%s/%s/-/archive/v%s/%s-%s.tar.%s",
-			host, owner, project, u.version, project, u.version, u.compression)
+		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)
 	default:
 		return fmt.Errorf("Unsupported hoster")
 	}
 
 	done := make(chan struct{})
 	go progressSize("Download", u.tarPath, done)
 
-	log.Printf("Downloading %s", url)
-	err := downloadFile(u.tarPath, url)
+	log.Printf("Downloading %s", tarURL)
+	err = downloadFile(u.tarPath, tarURL)
 
 	close(done)
 
@@ -176,7 +182,7 @@ func (u *upstream) tar(gopath, repo string) error {
 			log.Printf("Godeps/_workspace exists, not downloading tarball from hoster.")
 		} else {
 			u.compression = "gz"
-			err := u.tarballFromHoster(repo)
+			err := u.tarballFromHoster()
 			if err != nil && err.Error() == "Unsupported hoster" {
 				log.Printf("INFO: Hoster does not provide release tarball\n")
 			} else {
@@ -537,48 +543,40 @@ func normalizeDebianProgramName(str string) string {
 }
 
 func shortHostName(gopkg string, allowUnknownHoster bool) (host string, err error) {
+	knownHosts := map[string]string{
+		// keep the list in alphabetical order
+		"bazil.org":         "bazil",
+		"bitbucket.org":     "bitbucket",
+		"blitiri.com.ar":    "blitiri",
+		"cloud.google.com":  "googlecloud",
+		"code.google.com":   "googlecode",
+		"git.sr.ht":         "sourcehut",
+		"github.com":        "github",
+		"gitlab.com":        "gitlab",
+		"go.uber.org":       "uber",
+		"go4.org":           "go4",
+		"gocloud.dev":       "gocloud",
+		"golang.org":        "golang",
+		"google.golang.org": "google",
+		"gopkg.in":          "gopkg",
+		"howett.net":        "howett",
+		"k8s.io":            "k8s",
+		"pault.ag":          "pault",
+		"salsa.debian.org":  "debian",
+		"sigs.k8s.io":       "k8s-sigs",
+	}
 	parts := strings.Split(gopkg, "/")
 	fqdn := parts[0]
-
-	switch fqdn {
-	case "github.com":
-		host = "github"
-	case "code.google.com":
-		host = "googlecode"
-	case "cloud.google.com":
-		host = "googlecloud"
-	case "gopkg.in":
-		host = "gopkg"
-	case "golang.org":
-		host = "golang"
-	case "google.golang.org":
-		host = "google"
-	case "gitlab.com":
-		host = "gitlab"
-	case "bitbucket.org":
-		host = "bitbucket"
-	case "bazil.org":
-		host = "bazil"
-	case "blitiri.com.ar":
-		host = "blitiri"
-	case "pault.ag":
-		host = "pault"
-	case "howett.net":
-		host = "howett"
-	case "go4.org":
-		host = "go4"
-	case "salsa.debian.org":
-		host = "debian"
-	default:
-		if allowUnknownHoster {
-			suffix, _ := publicsuffix.PublicSuffix(host)
-			host = fqdn[:len(fqdn)-len(suffix)-len(".")]
-			log.Printf("WARNING: Using %q as canonical hostname for %q. If that is not okay, please file a bug against %s.\n", host, fqdn, os.Args[0])
-		} else {
-			err = fmt.Errorf("unknown hoster %q", fqdn)
-		}
+	if host, ok := knownHosts[fqdn]; ok {
+		return host, nil
+	}
+	if !allowUnknownHoster {
+		return "", fmt.Errorf("unknown hoster %q", fqdn)
 	}
-	return host, err
+	suffix, _ := publicsuffix.PublicSuffix(fqdn)
+	host = fqdn[:len(fqdn)-len(suffix)-len(".")]
+	log.Printf("WARNING: Using %q as canonical hostname for %q. If that is not okay, please file a bug against %s.\n", host, fqdn, os.Args[0])
+	return host, nil
 }
 
 // debianNameFromGopkg maps a Go package repo path to a Debian package name,

metadata.go

@@ -26,8 +26,8 @@ var githubLicenseToDebianLicense = map[string]string{
 	"isc":      "ISC",
 	"lgpl-2.1": "LGPL-2.1",
 	"lgpl-3.0": "LGPL-3.0",
-	//"mit" - expat?
-	"mpl-2.0": "MPL-2.0", // include in base-files >= 9.9
+	"mit":      "Expat",
+	"mpl-2.0":  "MPL-2.0", // include in base-files >= 9.9
 	//"unlicense" (not in debian)
 }
 

progress.go

@@ -15,8 +15,6 @@ const (
 	Mebi
 	Gibi
 	Tebi
-	Pebi
-	Exbi
 )
 
 func humanizeBytes(b int64) string {

template.go

@@ -112,13 +112,11 @@ func addLibraryPackage(f *os.File, gopkg, debLib string, dependencies []string)
 	addDescription(f, gopkg, "(library)")
 }
 
-func addProgramPackage(f *os.File, gopkg, debProg string, dependencies []string) {
+func addProgramPackage(f *os.File, gopkg, debProg string) {
 	fmt.Fprintf(f, "\n")
 	fmt.Fprintf(f, "Package: %s\n", debProg)
 	fmt.Fprintf(f, "Architecture: any\n")
-	deps := dependencies
-	sort.Strings(deps)
-	deps = append(deps, "${misc:Depends}", "${shlibs:Depends}")
+	deps := []string{"${misc:Depends}", "${shlibs:Depends}"}
 	fprintfControlField(f, "Depends", deps)
 	fmt.Fprintf(f, "Built-Using: ${misc:Built-Using}\n")
 	addDescription(f, gopkg, "(program)")
@@ -159,7 +157,7 @@ func writeDebianControl(dir, gopkg, debsrc, debLib, debProg string, pkgType pack
 		log.Fatalf("Invalid pkgType %d in writeDebianControl(), aborting", pkgType)
 	}
 
-	fmt.Fprintf(f, "Standards-Version: 4.4.1\n")
+	fmt.Fprintf(f, "Standards-Version: 4.5.0\n")
 	fmt.Fprintf(f, "Vcs-Browser: https://salsa.debian.org/go-team/packages/%s\n", debsrc)
 	fmt.Fprintf(f, "Vcs-Git: https://salsa.debian.org/go-team/packages/%s.git\n", debsrc)
 	fmt.Fprintf(f, "Homepage: %s\n", getHomepageForGopkg(gopkg))
@@ -172,12 +170,12 @@ func writeDebianControl(dir, gopkg, debsrc, debLib, debProg string, pkgType pack
 	case typeLibrary:
 		addLibraryPackage(f, gopkg, debLib, dependencies)
 	case typeProgram:
-		addProgramPackage(f, gopkg, debProg, dependencies)
+		addProgramPackage(f, gopkg, debProg)
 	case typeLibraryProgram:
 		addLibraryPackage(f, gopkg, debLib, dependencies)
-		addProgramPackage(f, gopkg, debProg, dependencies)
+		addProgramPackage(f, gopkg, debProg)
 	case typeProgramLibrary:
-		addProgramPackage(f, gopkg, debProg, dependencies)
+		addProgramPackage(f, gopkg, debProg)
 		addLibraryPackage(f, gopkg, debLib, dependencies)
 	default:
 		log.Fatalf("Invalid pkgType %d in writeDebianControl(), aborting", pkgType)

version.go

@@ -32,7 +32,7 @@ func pkgVersionFromGit(gitdir string, u *upstream, forcePrerelease bool) (string
 	var commitsAhead int
 
 	// Find @latest version tag (whether annotated or not)
-	cmd := exec.Command("git", "describe", "--abbrev=0", "--tags")
+	cmd := exec.Command("git", "describe", "--abbrev=0", "--tags", "--exclude", "*/v*")
 	cmd.Dir = gitdir
 	if out, err := cmd.Output(); err == nil {
 		latestTag = strings.TrimSpace(string(out))