From 465c9a4cb2bff94c0b1201df8de4531477811fae Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Wed, 11 Sep 2019 21:17:02 +0000
Subject: [PATCH 1/5] Rename Go projects to follow upstream Tor conventions

---
 projects/certdehydrate-dane-rest-api/build    |   2 +-
 projects/certdehydrate-dane-rest-api/config   |  30 ++---
 projects/dnssec-hsts-native/config            |  18 +--
 .../config                                    |   0
 .../config                                    |   0
 .../config                                    |   6 +-
 .../config                                    |   0
 .../config                                    |   0
 .../config                                    |   0
 .../config                                    |   6 +-
 .../config                                    |  30 ++---
 .../{github.com,miekg,dns => godns}/config    |  20 +--
 projects/goeasyconfig/config                  |  35 ++++++
 .../config                                    |   0
 .../config                                    |   6 +-
 .../config                                    |  12 +-
 .../config                                    |  18 +--
 .../config                                    |   6 +-
 .../config                                    |   0
 .../config                                    |   0
 .../config                                    |   6 +-
 .../gopkg.in,hlandau,easyconfig.v1/config     |  35 ------
 .../{github.com,kr,pretty => gopretty}/config |   6 +-
 .../config                                    |   6 +-
 .../config                                    |  12 +-
 .../config                                    |  22 ++--
 .../config                                    |   0
 .../config                                    |   0
 .../config                                    |   0
 .../{github.com,kr,text => gotext}/config     |   0
 .../config                                    |  28 ++---
 .../config                                    |   0
 .../config                                    |   0
 .../config                                    |   0
 .../config                                    |   0
 projects/{golang.org,x,crypto => goxcrypto}   |   0
 .../config                                    |   4 +-
 .../config                                    |  12 +-
 projects/{golang.org,x,net => goxnet}         |   0
 .../{golang.org,x,net,ip => goxnetip}/config  |   4 +-
 projects/{golang.org,x,sys => goxsys}         |   0
 .../config                                    |   4 +-
 projects/ncdns/config                         | 114 +++++++++---------
 projects/ncp11/config                         |  12 +-
 projects/ncprop279/config                     |  18 +--
 45 files changed, 236 insertions(+), 236 deletions(-)
 rename projects/{github.com,shiena,ansicolor => goansicolor}/config (100%)
 rename projects/{github.com,hlandauf,btcjson => gobtcjson}/config (100%)
 rename projects/{github.com,hlandau,buildinfo => gobuildinfo}/config (89%)
 rename projects/{gopkg.in,hlandau,configurable.v1 => goconfigurable}/config (100%)
 rename projects/{github.com,namecoin,crosssign => gocrosssign}/config (100%)
 rename projects/{github.com,namecoin,crosssignnameconstraint => gocrosssignnameconstraint}/config (100%)
 rename projects/{github.com,hlandau,degoutils => godegoutils}/config (86%)
 rename projects/{github.com,hlandau,dexlogconfig => godexlogconfig}/config (65%)
 rename projects/{github.com,miekg,dns => godns}/config (62%)
 create mode 100644 projects/goeasyconfig/config
 rename projects/{github.com,golang,groupcache => gogroupcache}/config (100%)
 rename projects/{github.com,mattn,go-isatty => goisatty}/config (84%)
 rename projects/{gopkg.in,alecthomas,kingpin.v2 => gokingpin}/config (66%)
 rename projects/{gopkg.in,hlandau,madns.v1 => gomadns}/config (77%)
 rename projects/{github.com,hlandau,ncbtcjsontypes => goncbtcjsontypes}/config (80%)
 rename projects/{github.com,ogier,pflag => gopflag}/config (100%)
 rename projects/{github.com,miekg,pkcs11 => gopkcs11}/config (100%)
 rename projects/{github.com,namecoin,pkcs11mod => gopkcs11mod}/config (94%)
 delete mode 100644 projects/gopkg.in,hlandau,easyconfig.v1/config
 rename projects/{github.com,kr,pretty => gopretty}/config (83%)
 rename projects/{github.com,namecoin,qlib => goqlib}/config (83%)
 rename projects/{github.com,namecoin,safetlsa => gosafetlsa}/config (74%)
 rename projects/{gopkg.in,hlandau,service.v2 => goservice}/config (80%)
 rename projects/{gopkg.in,hlandau,svcutils.v1 => gosvcutils}/config (100%)
 rename projects/{github.com,coreos,go-systemd => gosystemd}/config (100%)
 rename projects/{github.com,alecthomas,template => gotemplate}/config (100%)
 rename projects/{github.com,kr,text => gotext}/config (100%)
 rename projects/{github.com,namecoin,tlsrestrictnss => gotlsrestrictnss}/config (56%)
 rename projects/{github.com,BurntSushi,toml => gotoml}/config (100%)
 rename projects/{github.com,alecthomas,units => gounits}/config (100%)
 rename projects/{github.com,btcsuite,winsvc => gowinsvc}/config (100%)
 rename projects/{github.com,namecoin,x509-signature-splice => gox509signaturesplice}/config (100%)
 rename projects/{golang.org,x,crypto => goxcrypto} (100%)
 rename projects/{golang.org,x,crypto,ed25519 => goxcryptoed25519}/config (78%)
 rename projects/{github.com,hlandau,xlog => goxlog}/config (66%)
 rename projects/{golang.org,x,net => goxnet} (100%)
 rename projects/{golang.org,x,net,ip => goxnetip}/config (80%)
 rename projects/{golang.org,x,sys => goxsys} (100%)
 rename projects/{golang.org,x,sys,unix => goxsysunix}/config (78%)

diff --git a/projects/certdehydrate-dane-rest-api/build b/projects/certdehydrate-dane-rest-api/build
index a31a92d..e32a830 100644
--- a/projects/certdehydrate-dane-rest-api/build
+++ b/projects/certdehydrate-dane-rest-api/build
@@ -13,7 +13,7 @@ mkdir -p $distdir
 # TODO: remove this once upstream q is fixed for current dns versions
 rm -rf $GOPATH/src/github.com/miekg/dns
 rm -rf $GOPATH/pkg/${GOOS}_${GOARCH}/github.com/miekg/dns.a
-tar -C /var/tmp/dist -xf [% c('input_files_by_name/github.com,miekg,dns') %]
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/godns') %]
 
 mkdir -p $GOPATH/src/github.com/namecoin
 tar -C $GOPATH/src/github.com/namecoin -xf [% project %]-[% c('version') %].tar.gz
diff --git a/projects/certdehydrate-dane-rest-api/config b/projects/certdehydrate-dane-rest-api/config
index f3d08c6..c2066b6 100644
--- a/projects/certdehydrate-dane-rest-api/config
+++ b/projects/certdehydrate-dane-rest-api/config
@@ -7,11 +7,11 @@ var:
   container:
     use_container: 1
   go_lib_deps:
-    - github.com,miekg,dns
-    - github.com,namecoin,crosssign
-    - github.com,namecoin,qlib
-    - github.com,namecoin,safetlsa
-    - gopkg.in,hlandau,easyconfig.v1
+    - godns
+    - gocrosssign
+    - goqlib
+    - gosafetlsa
+    - goeasyconfig
   cgo: 0
   build_go_lib_pre: |
     export CGO_ENABLED=[% c("var/cgo") %] 
@@ -20,13 +20,13 @@ input_files:
   - project: container-image
   - name: go
     project: go
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
-  - name: github.com,namecoin,crosssign
-    project: github.com,namecoin,crosssign
-  - name: github.com,namecoin,qlib
-    project: github.com,namecoin,qlib
-  - name: github.com,namecoin,safetlsa
-    project: github.com,namecoin,safetlsa
+  - name: goeasyconfig
+    project: goeasyconfig
+  - name: godns
+    project: godns
+  - name: gocrosssign
+    project: gocrosssign
+  - name: goqlib
+    project: goqlib
+  - name: gosafetlsa
+    project: gosafetlsa
diff --git a/projects/dnssec-hsts-native/config b/projects/dnssec-hsts-native/config
index 39d2fa6..4cbe836 100644
--- a/projects/dnssec-hsts-native/config
+++ b/projects/dnssec-hsts-native/config
@@ -7,9 +7,9 @@ var:
   container:
     use_container: 1
   go_lib_deps:
-    - github.com,miekg,dns
-    - github.com,namecoin,qlib
-    - gopkg.in,hlandau,easyconfig.v1
+    - godns
+    - goqlib
+    - goeasyconfig
   cgo: 0
   build_go_lib_pre: |
     export CGO_ENABLED=[% c("var/cgo") %] 
@@ -18,9 +18,9 @@ input_files:
   - project: container-image
   - name: go
     project: go
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
-  - name: github.com,namecoin,qlib
-    project: github.com,namecoin,qlib
+  - name: goeasyconfig
+    project: goeasyconfig
+  - name: godns
+    project: godns
+  - name: goqlib
+    project: goqlib
diff --git a/projects/github.com,shiena,ansicolor/config b/projects/goansicolor/config
similarity index 100%
rename from projects/github.com,shiena,ansicolor/config
rename to projects/goansicolor/config
diff --git a/projects/github.com,hlandauf,btcjson/config b/projects/gobtcjson/config
similarity index 100%
rename from projects/github.com,hlandauf,btcjson/config
rename to projects/gobtcjson/config
diff --git a/projects/github.com,hlandau,buildinfo/config b/projects/gobuildinfo/config
similarity index 89%
rename from projects/github.com,hlandau,buildinfo/config
rename to projects/gobuildinfo/config
index 7d0547c..3b3d1b1 100644
--- a/projects/github.com,hlandau,buildinfo/config
+++ b/projects/gobuildinfo/config
@@ -10,7 +10,7 @@ var:
     use_container: 1
   go_lib: github.com/hlandau/buildinfo
   go_lib_deps:
-    - gopkg.in,hlandau,easyconfig.v1
+    - goeasyconfig
   build_go_lib_pre: |
     [% IF c("var/linux") %]
       [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
@@ -31,5 +31,5 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") %]'
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
+  - name: goeasyconfig
+    project: goeasyconfig
diff --git a/projects/gopkg.in,hlandau,configurable.v1/config b/projects/goconfigurable/config
similarity index 100%
rename from projects/gopkg.in,hlandau,configurable.v1/config
rename to projects/goconfigurable/config
diff --git a/projects/github.com,namecoin,crosssign/config b/projects/gocrosssign/config
similarity index 100%
rename from projects/github.com,namecoin,crosssign/config
rename to projects/gocrosssign/config
diff --git a/projects/github.com,namecoin,crosssignnameconstraint/config b/projects/gocrosssignnameconstraint/config
similarity index 100%
rename from projects/github.com,namecoin,crosssignnameconstraint/config
rename to projects/gocrosssignnameconstraint/config
diff --git a/projects/github.com,hlandau,degoutils/config b/projects/godegoutils/config
similarity index 86%
rename from projects/github.com,hlandau,degoutils/config
rename to projects/godegoutils/config
index 2e84354..e406a42 100644
--- a/projects/github.com,hlandau,degoutils/config
+++ b/projects/godegoutils/config
@@ -12,11 +12,11 @@ var:
   go_lib_install:
     - github.com/hlandau/degoutils/net
   go_lib_deps:
-    - golang.org,x,net
+    - goxnet
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: golang.org,x,net
-    project: golang.org,x,net
+  - name: goxnet
+    project: goxnet
diff --git a/projects/github.com,hlandau,dexlogconfig/config b/projects/godexlogconfig/config
similarity index 65%
rename from projects/github.com,hlandau,dexlogconfig/config
rename to projects/godexlogconfig/config
index af3e43d..c9de92e 100644
--- a/projects/github.com,hlandau,dexlogconfig/config
+++ b/projects/godexlogconfig/config
@@ -10,10 +10,10 @@ var:
     use_container: 1
   go_lib: github.com/hlandau/dexlogconfig
   go_lib_deps:
-    - github.com,hlandau,xlog
-    - gopkg.in,hlandau,easyconfig.v1
-    - github.com,coreos,go-systemd
-    - github.com,hlandau,buildinfo
+    - gobuildinfo
+    - goeasyconfig
+    - gosystemd
+    - goxlog
   build_go_lib_pre: |
     [% IF c("var/linux") %]
       [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
@@ -28,9 +28,9 @@ targets:
   windows:
     var:
       go_lib_deps:
-        - github.com,hlandau,xlog
-        - gopkg.in,hlandau,easyconfig.v1
-        - github.com,hlandau,buildinfo
+        - gobuildinfo
+        - goeasyconfig
+        - goxlog
 
 input_files:
   - project: container-image
@@ -42,12 +42,12 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") %]'
-  - name: github.com,hlandau,xlog
-    project: github.com,hlandau,xlog
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
-  - name: github.com,coreos,go-systemd
-    project: github.com,coreos,go-systemd
+  - name: goxlog
+    project: goxlog
+  - name: goeasyconfig
+    project: goeasyconfig
+  - name: gosystemd
+    project: gosystemd
     enable: '[% ! c("var/windows") %]'
-  - name: github.com,hlandau,buildinfo
-    project: github.com,hlandau,buildinfo
+  - name: gobuildinfo
+    project: gobuildinfo
diff --git a/projects/github.com,miekg,dns/config b/projects/godns/config
similarity index 62%
rename from projects/github.com,miekg,dns/config
rename to projects/godns/config
index 858b482..6e6c09d 100644
--- a/projects/github.com,miekg,dns/config
+++ b/projects/godns/config
@@ -10,25 +10,25 @@ var:
     use_container: 1
   go_lib: github.com/miekg/dns
   go_lib_deps:
-    - golang.org,x,crypto,ed25519
-    - golang.org,x,net,ip
-    - golang.org,x,sys,unix
+    - goxcryptoed25519
+    - goxnetip
+    - goxsysunix
 
 targets:
   windows:
     var:
       go_lib_deps:
-        - golang.org,x,crypto,ed25519
+        - goxcryptoed25519
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: golang.org,x,crypto,ed25519
-    project: golang.org,x,crypto,ed25519
-  - name: golang.org,x,net,ip
-    project: golang.org,x,net,ip
+  - name: goxcryptoed25519
+    project: goxcryptoed25519
+  - name: goxnetip
+    project: goxnetip
     enable: '[% ! c("var/windows") %]'
-  - name: golang.org,x,sys,unix
-    project: golang.org,x,sys,unix
+  - name: goxsysunix
+    project: goxsysunix
     enable: '[% ! c("var/windows") %]'
diff --git a/projects/goeasyconfig/config b/projects/goeasyconfig/config
new file mode 100644
index 0000000..40530cc
--- /dev/null
+++ b/projects/goeasyconfig/config
@@ -0,0 +1,35 @@
+version: '[% c("abbrev") %]'
+git_url:  https://github.com/hlandau/easyconfig.git
+git_hash: '[% config.var_p.id.${"gopkg.in/hlandau/easyconfig.v1"} %]'
+filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
+
+build: '[% c("projects/go/var/build_go_lib") %]'
+
+var:
+  container:
+    use_container: 1
+  go_lib: gopkg.in/hlandau/easyconfig.v1
+  go_lib_deps:
+    - goconfigurable
+    - gosvcutils
+    - gotoml
+    - gopflag
+    - gokingpin
+  go_lib_install:
+    - gopkg.in/hlandau/easyconfig.v1
+    - gopkg.in/hlandau/easyconfig.v1/cflag
+
+input_files:
+  - project: container-image
+  - name: go
+    project: go
+  - name: goconfigurable
+    project: goconfigurable
+  - name: gosvcutils
+    project: gosvcutils
+  - name: gotoml
+    project: gotoml
+  - name: gopflag
+    project: gopflag
+  - name: gokingpin
+    project: gokingpin
diff --git a/projects/github.com,golang,groupcache/config b/projects/gogroupcache/config
similarity index 100%
rename from projects/github.com,golang,groupcache/config
rename to projects/gogroupcache/config
diff --git a/projects/github.com,mattn,go-isatty/config b/projects/goisatty/config
similarity index 84%
rename from projects/github.com,mattn,go-isatty/config
rename to projects/goisatty/config
index 68fbbd1..a75d7cf 100644
--- a/projects/github.com,mattn,go-isatty/config
+++ b/projects/goisatty/config
@@ -14,12 +14,12 @@ targets:
   linux:
     var:
       go_lib_deps:
-        - golang.org,x,sys,unix
+        - goxsysunix
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: golang.org,x,sys,unix
-    project: golang.org,x,sys,unix
+  - name: goxsysunix
+    project: goxsysunix
     enable: '[% c("var/linux") %]'
diff --git a/projects/gopkg.in,alecthomas,kingpin.v2/config b/projects/gokingpin/config
similarity index 66%
rename from projects/gopkg.in,alecthomas,kingpin.v2/config
rename to projects/gokingpin/config
index 83164d7..cbf229d 100644
--- a/projects/gopkg.in,alecthomas,kingpin.v2/config
+++ b/projects/gokingpin/config
@@ -10,14 +10,14 @@ var:
     use_container: 1
   go_lib: gopkg.in/alecthomas/kingpin.v2
   go_lib_deps: 
-    - github.com,alecthomas,template
-    - github.com,alecthomas,units
+    - gotemplate
+    - gounits
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,alecthomas,template
-    project: github.com,alecthomas,template
-  - name: github.com,alecthomas,units
-    project: github.com,alecthomas,units
+  - name: gotemplate
+    project: gotemplate
+  - name: gounits
+    project: gounits
diff --git a/projects/gopkg.in,hlandau,madns.v1/config b/projects/gomadns/config
similarity index 77%
rename from projects/gopkg.in,hlandau,madns.v1/config
rename to projects/gomadns/config
index e6ea2aa..892c987 100644
--- a/projects/gopkg.in,hlandau,madns.v1/config
+++ b/projects/gomadns/config
@@ -10,9 +10,9 @@ var:
     use_container: 1
   go_lib: gopkg.in/hlandau/madns.v1
   go_lib_deps:
-    - github.com,miekg,dns
-    - github.com,hlandau,buildinfo
-    - github.com,hlandau,xlog
+    - godns
+    - gobuildinfo
+    - goxlog
   go_lib_install:
     - gopkg.in/hlandau/madns.v1
     - gopkg.in/hlandau/madns.v1/merr
@@ -36,9 +36,9 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") %]'
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
-  - name: github.com,hlandau,buildinfo
-    project: github.com,hlandau,buildinfo
-  - name: github.com,hlandau,xlog
-    project: github.com,hlandau,xlog
+  - name: godns
+    project: godns
+  - name: gobuildinfo
+    project: gobuildinfo
+  - name: goxlog
+    project: goxlog
diff --git a/projects/github.com,hlandau,ncbtcjsontypes/config b/projects/goncbtcjsontypes/config
similarity index 80%
rename from projects/github.com,hlandau,ncbtcjsontypes/config
rename to projects/goncbtcjsontypes/config
index 1ac8366..3141660 100644
--- a/projects/github.com,hlandau,ncbtcjsontypes/config
+++ b/projects/goncbtcjsontypes/config
@@ -10,11 +10,11 @@ var:
     use_container: 1
   go_lib: github.com/hlandau/ncbtcjsontypes
   go_lib_deps:
-    - github.com,hlandauf,btcjson
+    - gobtcjson
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,hlandauf,btcjson
-    project: github.com,hlandauf,btcjson
+  - name: gobtcjson
+    project: gobtcjson
diff --git a/projects/github.com,ogier,pflag/config b/projects/gopflag/config
similarity index 100%
rename from projects/github.com,ogier,pflag/config
rename to projects/gopflag/config
diff --git a/projects/github.com,miekg,pkcs11/config b/projects/gopkcs11/config
similarity index 100%
rename from projects/github.com,miekg,pkcs11/config
rename to projects/gopkcs11/config
diff --git a/projects/github.com,namecoin,pkcs11mod/config b/projects/gopkcs11mod/config
similarity index 94%
rename from projects/github.com,namecoin,pkcs11mod/config
rename to projects/gopkcs11mod/config
index f9334db..fe41551 100644
--- a/projects/github.com,namecoin,pkcs11mod/config
+++ b/projects/gopkcs11mod/config
@@ -10,7 +10,7 @@ var:
     use_container: 1
   go_lib: github.com/namecoin/pkcs11mod
   go_lib_deps:
-    - github.com,miekg,pkcs11
+    - gopkcs11
   cgo: 1
   build_go_lib_pre: |
     [% IF c("var/cgo") %]
@@ -52,5 +52,5 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") && c("var/cgo") %]'
-  - name: github.com,miekg,pkcs11
-    project: github.com,miekg,pkcs11
+  - name: gopkcs11
+    project: gopkcs11
diff --git a/projects/gopkg.in,hlandau,easyconfig.v1/config b/projects/gopkg.in,hlandau,easyconfig.v1/config
deleted file mode 100644
index 0d6145c..0000000
--- a/projects/gopkg.in,hlandau,easyconfig.v1/config
+++ /dev/null
@@ -1,35 +0,0 @@
-version: '[% c("abbrev") %]'
-git_url:  https://github.com/hlandau/easyconfig.git
-git_hash: '[% config.var_p.id.${"gopkg.in/hlandau/easyconfig.v1"} %]'
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-build: '[% c("projects/go/var/build_go_lib") %]'
-
-var:
-  container:
-    use_container: 1
-  go_lib: gopkg.in/hlandau/easyconfig.v1
-  go_lib_deps:
-    - gopkg.in,hlandau,configurable.v1
-    - gopkg.in,hlandau,svcutils.v1
-    - github.com,BurntSushi,toml
-    - github.com,ogier,pflag
-    - gopkg.in,alecthomas,kingpin.v2
-  go_lib_install:
-    - gopkg.in/hlandau/easyconfig.v1
-    - gopkg.in/hlandau/easyconfig.v1/cflag
-
-input_files:
-  - project: container-image
-  - name: go
-    project: go
-  - name: gopkg.in,hlandau,configurable.v1
-    project: gopkg.in,hlandau,configurable.v1
-  - name: gopkg.in,hlandau,svcutils.v1
-    project: gopkg.in,hlandau,svcutils.v1
-  - name: github.com,BurntSushi,toml
-    project: github.com,BurntSushi,toml
-  - name: github.com,ogier,pflag
-    project: github.com,ogier,pflag
-  - name: gopkg.in,alecthomas,kingpin.v2
-    project: gopkg.in,alecthomas,kingpin.v2
diff --git a/projects/github.com,kr,pretty/config b/projects/gopretty/config
similarity index 83%
rename from projects/github.com,kr,pretty/config
rename to projects/gopretty/config
index 957b657..5d62923 100644
--- a/projects/github.com,kr,pretty/config
+++ b/projects/gopretty/config
@@ -10,11 +10,11 @@ var:
     use_container: 1
   go_lib: github.com/kr/pretty
   go_lib_deps:
-    - github.com,kr,text
+    - gotext
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,kr,text
-    project: github.com,kr,text
+  - name: gotext
+    project: gotext
diff --git a/projects/github.com,namecoin,qlib/config b/projects/goqlib/config
similarity index 83%
rename from projects/github.com,namecoin,qlib/config
rename to projects/goqlib/config
index 9387a8d..b2b4f2a 100644
--- a/projects/github.com,namecoin,qlib/config
+++ b/projects/goqlib/config
@@ -10,7 +10,7 @@ var:
     use_container: 1
   go_lib: github.com/namecoin/qlib
   go_lib_deps:
-    - github.com,miekg,dns
+    - godns
   build_go_lib_pre: |
     export CGO_ENABLED=0
 
@@ -18,5 +18,5 @@ input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
+  - name: godns
+    project: godns
diff --git a/projects/github.com,namecoin,safetlsa/config b/projects/gosafetlsa/config
similarity index 74%
rename from projects/github.com,namecoin,safetlsa/config
rename to projects/gosafetlsa/config
index 429cd34..aa14581 100644
--- a/projects/github.com,namecoin,safetlsa/config
+++ b/projects/gosafetlsa/config
@@ -10,8 +10,8 @@ var:
     use_container: 1
   go_lib: github.com/namecoin/safetlsa
   go_lib_deps:
-    - github.com,miekg,dns
-    - github.com,namecoin,x509-signature-splice
+    - godns
+    - gox509signaturesplice
     - ncdns
   build_go_lib_pre: |
     export CGO_ENABLED=0
@@ -20,10 +20,10 @@ input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
-  - name: github.com,namecoin,x509-signature-splice
-    project: github.com,namecoin,x509-signature-splice
+  - name: godns
+    project: godns
+  - name: gox509signaturesplice
+    project: gox509signaturesplice
   - name: ncdns
     project: ncdns
     # Build ncdns as a library, not an executable.
diff --git a/projects/gopkg.in,hlandau,service.v2/config b/projects/goservice/config
similarity index 80%
rename from projects/gopkg.in,hlandau,service.v2/config
rename to projects/goservice/config
index 00477d7..5c50a94 100644
--- a/projects/gopkg.in,hlandau,service.v2/config
+++ b/projects/goservice/config
@@ -10,8 +10,8 @@ var:
     use_container: 1
   go_lib: gopkg.in/hlandau/service.v2
   go_lib_deps:
-    - gopkg.in,hlandau,svcutils.v1
-    - gopkg.in,hlandau,easyconfig.v1
+    - gosvcutils
+    - goeasyconfig
   build_go_lib_pre: |
     [% IF c("var/cgo") %]
       [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
@@ -50,9 +50,9 @@ targets:
   windows:
     var:
       go_lib_deps:
-        - github.com,btcsuite,winsvc
-        - gopkg.in,hlandau,svcutils.v1
-        - gopkg.in,hlandau,easyconfig.v1
+        - gowinsvc
+        - gosvcutils
+        - goeasyconfig
       cgo: 0
 
 input_files:
@@ -65,10 +65,10 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") && c("var/cgo") %]'
-  - name: github.com,btcsuite,winsvc
-    project: github.com,btcsuite,winsvc
+  - name: gowinsvc
+    project: gowinsvc
     enable: '[% c("var/windows") %]'
-  - name: gopkg.in,hlandau,svcutils.v1
-    project: gopkg.in,hlandau,svcutils.v1
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
+  - name: gosvcutils
+    project: gosvcutils
+  - name: goeasyconfig
+    project: goeasyconfig
diff --git a/projects/gopkg.in,hlandau,svcutils.v1/config b/projects/gosvcutils/config
similarity index 100%
rename from projects/gopkg.in,hlandau,svcutils.v1/config
rename to projects/gosvcutils/config
diff --git a/projects/github.com,coreos,go-systemd/config b/projects/gosystemd/config
similarity index 100%
rename from projects/github.com,coreos,go-systemd/config
rename to projects/gosystemd/config
diff --git a/projects/github.com,alecthomas,template/config b/projects/gotemplate/config
similarity index 100%
rename from projects/github.com,alecthomas,template/config
rename to projects/gotemplate/config
diff --git a/projects/github.com,kr,text/config b/projects/gotext/config
similarity index 100%
rename from projects/github.com,kr,text/config
rename to projects/gotext/config
diff --git a/projects/github.com,namecoin,tlsrestrictnss/config b/projects/gotlsrestrictnss/config
similarity index 56%
rename from projects/github.com,namecoin,tlsrestrictnss/config
rename to projects/gotlsrestrictnss/config
index c60873e..91e751a 100644
--- a/projects/github.com,namecoin,tlsrestrictnss/config
+++ b/projects/gotlsrestrictnss/config
@@ -10,8 +10,8 @@ var:
     use_container: 1
   go_lib: github.com/namecoin/tlsrestrictnss
   go_lib_deps:
-    - github.com,hlandau,xlog
-    - github.com,namecoin,crosssignnameconstraint
+    - goxlog
+    - gocrosssignnameconstraint
   go_lib_install:
     - github.com/namecoin/tlsrestrictnss
     - github.com/namecoin/tlsrestrictnss/tlsrestrictnsssync
@@ -22,22 +22,22 @@ targets:
   windows:
     var:
       go_lib_deps:
-        - github.com,hlandau,xlog
-        - github.com,namecoin,crosssignnameconstraint
-        - gopkg.in,hlandau,easyconfig.v1
-        - golang.org,x,sys
+        - goxlog
+        - gocrosssignnameconstraint
+        - goeasyconfig
+        - goxsys
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,hlandau,xlog
-    project: github.com,hlandau,xlog
-  - name: github.com,namecoin,crosssignnameconstraint
-    project: github.com,namecoin,crosssignnameconstraint
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
+  - name: goxlog
+    project: goxlog
+  - name: gocrosssignnameconstraint
+    project: gocrosssignnameconstraint
+  - name: goeasyconfig
+    project: goeasyconfig
     enable: '[% c("var/windows") %]'
-  - name: golang.org,x,sys
-    project: golang.org,x,sys
+  - name: goxsys
+    project: goxsys
     enable: '[% c("var/windows") %]'
diff --git a/projects/github.com,BurntSushi,toml/config b/projects/gotoml/config
similarity index 100%
rename from projects/github.com,BurntSushi,toml/config
rename to projects/gotoml/config
diff --git a/projects/github.com,alecthomas,units/config b/projects/gounits/config
similarity index 100%
rename from projects/github.com,alecthomas,units/config
rename to projects/gounits/config
diff --git a/projects/github.com,btcsuite,winsvc/config b/projects/gowinsvc/config
similarity index 100%
rename from projects/github.com,btcsuite,winsvc/config
rename to projects/gowinsvc/config
diff --git a/projects/github.com,namecoin,x509-signature-splice/config b/projects/gox509signaturesplice/config
similarity index 100%
rename from projects/github.com,namecoin,x509-signature-splice/config
rename to projects/gox509signaturesplice/config
diff --git a/projects/golang.org,x,crypto b/projects/goxcrypto
similarity index 100%
rename from projects/golang.org,x,crypto
rename to projects/goxcrypto
diff --git a/projects/golang.org,x,crypto,ed25519/config b/projects/goxcryptoed25519/config
similarity index 78%
rename from projects/golang.org,x,crypto,ed25519/config
rename to projects/goxcryptoed25519/config
index 81f221c..d065de1 100644
--- a/projects/golang.org,x,crypto,ed25519/config
+++ b/projects/goxcryptoed25519/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
-git_url: '[% pc("golang.org,x,crypto", "git_url") %]'
-git_hash: '[% pc("golang.org,x,crypto", "git_hash") %]'
+git_url: '[% pc("goxcrypto", "git_url") %]'
+git_hash: '[% pc("goxcrypto", "git_hash") %]'
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/github.com,hlandau,xlog/config b/projects/goxlog/config
similarity index 66%
rename from projects/github.com,hlandau,xlog/config
rename to projects/goxlog/config
index d33f570..8991f04 100644
--- a/projects/github.com,hlandau,xlog/config
+++ b/projects/goxlog/config
@@ -10,14 +10,14 @@ var:
     use_container: 1
   go_lib: github.com/hlandau/xlog
   go_lib_deps:
-    - github.com,mattn,go-isatty
-    - github.com,shiena,ansicolor
+    - goisatty
+    - goansicolor
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,mattn,go-isatty
-    project: github.com,mattn,go-isatty
-  - name: github.com,shiena,ansicolor
-    project: github.com,shiena,ansicolor
+  - name: goisatty
+    project: goisatty
+  - name: goansicolor
+    project: goansicolor
diff --git a/projects/golang.org,x,net b/projects/goxnet
similarity index 100%
rename from projects/golang.org,x,net
rename to projects/goxnet
diff --git a/projects/golang.org,x,net,ip/config b/projects/goxnetip/config
similarity index 80%
rename from projects/golang.org,x,net,ip/config
rename to projects/goxnetip/config
index 1eab197..67950f4 100644
--- a/projects/golang.org,x,net,ip/config
+++ b/projects/goxnetip/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
-git_url: '[% pc("golang.org,x,net", "git_url") %]'
-git_hash: '[% pc("golang.org,x,net", "git_hash") %]'
+git_url: '[% pc("goxnet", "git_url") %]'
+git_hash: '[% pc("goxnet", "git_hash") %]'
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/golang.org,x,sys b/projects/goxsys
similarity index 100%
rename from projects/golang.org,x,sys
rename to projects/goxsys
diff --git a/projects/golang.org,x,sys,unix/config b/projects/goxsysunix/config
similarity index 78%
rename from projects/golang.org,x,sys,unix/config
rename to projects/goxsysunix/config
index 1453a27..a2fe03c 100644
--- a/projects/golang.org,x,sys,unix/config
+++ b/projects/goxsysunix/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
-git_url: '[% pc("golang.org,x,sys", "git_url") %]'
-git_hash: '[% pc("golang.org,x,sys", "git_hash") %]'
+git_url: '[% pc("goxsys", "git_url") %]'
+git_hash: '[% pc("goxsys", "git_hash") %]'
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/ncdns/config b/projects/ncdns/config
index 9ab5baf..41d5185 100644
--- a/projects/ncdns/config
+++ b/projects/ncdns/config
@@ -10,19 +10,19 @@ var:
   container:
     use_container: 1
   go_lib_deps:
-    - github.com,golang,groupcache
-    - github.com,hlandau,degoutils
-    - github.com,hlandau,dexlogconfig
-    - github.com,hlandau,ncbtcjsontypes
-    - github.com,hlandauf,btcjson
-    - github.com,kr,pretty
-    - github.com,miekg,dns
-    - github.com,namecoin,tlsrestrictnss
-    - github.com,namecoin,x509-signature-splice
-    - gopkg.in,hlandau,madns.v1
-    - gopkg.in,hlandau,easyconfig.v1
-    - gopkg.in,hlandau,service.v2
-    - golang.org,x,net
+    - gogroupcache
+    - godegoutils
+    - godexlogconfig
+    - goncbtcjsontypes
+    - gobtcjson
+    - gopretty
+    - godns
+    - gotlsrestrictnss
+    - gox509signaturesplice
+    - gomadns
+    - goeasyconfig
+    - goservice
+    - goxnet
   go_lib_no_output: 1
 
 targets:
@@ -43,20 +43,20 @@ targets:
   windows:
     var:
       go_lib_deps:
-        - github.com,golang,groupcache
-        - github.com,hlandau,degoutils
-        - github.com,hlandau,dexlogconfig
-        - github.com,hlandau,ncbtcjsontypes
-        - github.com,hlandauf,btcjson
-        - github.com,kr,pretty
-        - github.com,miekg,dns
-        - github.com,namecoin,tlsrestrictnss
-        - github.com,namecoin,x509-signature-splice
-        - gopkg.in,hlandau,madns.v1
-        - gopkg.in,hlandau,easyconfig.v1
-        - gopkg.in,hlandau,service.v2
-        - golang.org,x,net
-        - golang.org,x,sys
+        - gogroupcache
+        - godegoutils
+        - godexlogconfig
+        - goncbtcjsontypes
+        - gobtcjson
+        - gopretty
+        - godns
+        - gotlsrestrictnss
+        - gox509signaturesplice
+        - gomadns
+        - goeasyconfig
+        - goservice
+        - goxnet
+        - goxsys
       cgo: 0
 
 input_files:
@@ -69,34 +69,34 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") && c("var/cgo") %]'
-  - name: github.com,hlandau,xlog
-    project: github.com,hlandau,xlog
-  - name: github.com,hlandau,dexlogconfig
-    project: github.com,hlandau,dexlogconfig
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
-  - name: gopkg.in,hlandau,service.v2
-    project: gopkg.in,hlandau,service.v2
-  - name: github.com,golang,groupcache
-    project: github.com,golang,groupcache
-  - name: github.com,hlandau,ncbtcjsontypes
-    project: github.com,hlandau,ncbtcjsontypes
-  - name: github.com,hlandauf,btcjson
-    project: github.com,hlandauf,btcjson
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
-  - name: github.com,namecoin,tlsrestrictnss
-    project: github.com,namecoin,tlsrestrictnss
-  - name: github.com,namecoin,x509-signature-splice
-    project: github.com,namecoin,x509-signature-splice
-  - name: gopkg.in,hlandau,madns.v1
-    project: gopkg.in,hlandau,madns.v1
-  - name: github.com,kr,pretty
-    project: github.com,kr,pretty
-  - name: github.com,hlandau,degoutils
-    project: github.com,hlandau,degoutils
-  - name: golang.org,x,net
-    project: golang.org,x,net
-  - name: golang.org,x,sys
-    project: golang.org,x,sys
+  - name: goxlog
+    project: goxlog
+  - name: godexlogconfig
+    project: godexlogconfig
+  - name: goeasyconfig
+    project: goeasyconfig
+  - name: goservice
+    project: goservice
+  - name: gogroupcache
+    project: gogroupcache
+  - name: goncbtcjsontypes
+    project: goncbtcjsontypes
+  - name: gobtcjson
+    project: gobtcjson
+  - name: godns
+    project: godns
+  - name: gotlsrestrictnss
+    project: gotlsrestrictnss
+  - name: gox509signaturesplice
+    project: gox509signaturesplice
+  - name: gomadns
+    project: gomadns
+  - name: gopretty
+    project: gopretty
+  - name: godegoutils
+    project: godegoutils
+  - name: goxnet
+    project: goxnet
+  - name: goxsys
+    project: goxsys
     enable: '[% c("var/windows") %]'
diff --git a/projects/ncp11/config b/projects/ncp11/config
index dc95e67..b981fae 100644
--- a/projects/ncp11/config
+++ b/projects/ncp11/config
@@ -7,8 +7,8 @@ var:
   container:
     use_container: 1
   go_lib_deps:
-    - github.com,miekg,pkcs11
-    - github.com,namecoin,pkcs11mod
+    - gopkcs11
+    - gopkcs11mod
   cgo: 1
 
 input_files:
@@ -21,7 +21,7 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") && c("var/cgo") %]'
-  - name: github.com,miekg,pkcs11
-    project: github.com,miekg,pkcs11
-  - name: github.com,namecoin,pkcs11mod
-    project: github.com,namecoin,pkcs11mod
+  - name: gopkcs11
+    project: gopkcs11
+  - name: gopkcs11mod
+    project: gopkcs11mod
diff --git a/projects/ncprop279/config b/projects/ncprop279/config
index 7ba95c1..37f5631 100644
--- a/projects/ncprop279/config
+++ b/projects/ncprop279/config
@@ -7,9 +7,9 @@ var:
   container:
     use_container: 1
   go_lib_deps:
-    - github.com,miekg,dns
-    - gopkg.in,hlandau,easyconfig.v1
-    - gopkg.in,hlandau,madns.v1
+    - godns
+    - goeasyconfig
+    - gomadns
     - ncdns
   cgo: 0
   build_go_lib_pre: |
@@ -19,12 +19,12 @@ input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
-  - name: gopkg.in,hlandau,madns.v1
-    project: gopkg.in,hlandau,madns.v1
+  - name: godns
+    project: godns
+  - name: goeasyconfig
+    project: goeasyconfig
+  - name: gomadns
+    project: gomadns
   - name: ncdns
     project: ncdns
     # Build ncdns as a library, not an executable.

From 20e0d4ff609f1fc573a671496766398dd25b2baf Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Wed, 11 Sep 2019 21:18:38 +0000
Subject: [PATCH 2/5] certdehydrate-dane-rest-api: Remove obsolete godns
 workaround

qlib now supports the current godns release.
---
 projects/certdehydrate-dane-rest-api/build | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/projects/certdehydrate-dane-rest-api/build b/projects/certdehydrate-dane-rest-api/build
index e32a830..6df2e50 100644
--- a/projects/certdehydrate-dane-rest-api/build
+++ b/projects/certdehydrate-dane-rest-api/build
@@ -9,12 +9,6 @@ mkdir -p $distdir
   tar -C /var/tmp/dist -xf [% c('input_files_by_name/' _ dep) %]
 [% END -%]
 
-# Workaround for mixed versions of miekg/dns
-# TODO: remove this once upstream q is fixed for current dns versions
-rm -rf $GOPATH/src/github.com/miekg/dns
-rm -rf $GOPATH/pkg/${GOOS}_${GOARCH}/github.com/miekg/dns.a
-tar -C /var/tmp/dist -xf [% c('input_files_by_name/godns') %]
-
 mkdir -p $GOPATH/src/github.com/namecoin
 tar -C $GOPATH/src/github.com/namecoin -xf [% project %]-[% c('version') %].tar.gz
 mv $GOPATH/src/github.com/namecoin/certdehydrate-dane-rest-api-[% c('version') %] $GOPATH/src/github.com/namecoin/certdehydrate-dane-rest-api

From 740bea972f7f77bd913effbe62708b8a99209b5e Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Wed, 11 Sep 2019 21:39:17 +0000
Subject: [PATCH 3/5] Remove hashlist

This aligns us better with upstream Tor conventions
---
 hashlist                         | 28 ----------------------------
 projects/goansicolor/config      |  2 +-
 projects/gobtcjson/config        |  2 +-
 projects/gobuildinfo/config      |  2 +-
 projects/goconfigurable/config   |  2 +-
 projects/godegoutils/config      |  2 +-
 projects/godexlogconfig/config   |  2 +-
 projects/godns/config            |  4 ++--
 projects/goeasyconfig/config     |  4 ++--
 projects/gogroupcache/config     |  2 +-
 projects/goisatty/config         |  4 ++--
 projects/gokingpin/config        |  4 ++--
 projects/gomadns/config          |  4 ++--
 projects/goncbtcjsontypes/config |  2 +-
 projects/gopflag/config          |  2 +-
 projects/gopkcs11/config         |  4 ++--
 projects/gopkcs11mod/config      |  4 ++--
 projects/gopretty/config         |  2 +-
 projects/goservice/config        |  4 ++--
 projects/gosvcutils/config       |  4 ++--
 projects/gosystemd/config        |  4 ++--
 projects/gotemplate/config       |  2 +-
 projects/gotext/config           |  4 ++--
 projects/gotoml/config           |  2 +-
 projects/gounits/config          |  2 +-
 projects/gowinsvc/config         |  4 ++--
 projects/goxlog/config           |  4 ++--
 rbm.conf                         | 14 --------------
 28 files changed, 39 insertions(+), 81 deletions(-)
 delete mode 100644 hashlist

diff --git a/hashlist b/hashlist
deleted file mode 100644
index 6336d24..0000000
--- a/hashlist
+++ /dev/null
@@ -1,28 +0,0 @@
-git github.com/alecthomas/template fb15b899a75114aa79cc930e33c46b577cc664b1 heads/master
-git github.com/alecthomas/units c3de453c63f4bdb4dadffab9805ec00426c505f7 heads/master
-git github.com/btcsuite/winsvc f8fb11f83f7e860e3769a08e6811d1b399a43722 tags/v1.0.0
-git github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 heads/master
-git github.com/coreos/go-systemd e64a0ec8b42a61e2a9801dc1d0abe539dea79197 tags/v20
-git github.com/golang/groupcache 869f871628b6baa9cfbc11732cdf6546b17c1298 heads/master
-git github.com/hlandau/buildinfo 337a29b5499734e584d4630ce535af64c5fe7813 heads/master
-git github.com/hlandau/degoutils 8fa2440b63444dad556d76366f1c3ee070c8a577 heads/master+
-git github.com/hlandau/dexlogconfig 244f29bd260884993b176cd14ef2f7631f6f3c18 heads/master
-git github.com/hlandauf/btcjson c9ac42e8122a8d002c734a140212c50c2fc77a0e heads/master
-git github.com/hlandau/ncbtcjsontypes 02ea7272dd11bb6153a3cd06899a0999ac6a16e0 heads/master
-git github.com/hlandau/xlog 197ef798aed28e08ed3e176e678fda81be993a31 tags/v1.0.0
-git github.com/kr/pretty 71e7e49937503c662b9b636fd6b2c14b1aa818a5 heads/master
-git github.com/kr/text e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f tags/v0.1.0
-git github.com/mattn/go-isatty e1f7b56ace729e4a73a29a6b4fac6cd5fcda7ab3 tags/v0.0.9
-git github.com/miekg/dns c67445656579a3c3836047c509073f97022da0ed tags/v1.1.16
-git github.com/miekg/pkcs11 210dc1e16747c5ba98a03bcbcf728c38086ea357 tags/v1.0.3
-git github.com/namecoin/ncdns 19534f1dcfd1151bd9c072459caac12f6fb384df tags/v0.0.6
-git github.com/namecoin/pkcs11mod f7dce61fc5379851e99cfa2111834a29e3d36305 heads/master
-git github.com/ogier/pflag 45c278ab3607870051a2ea9040bb85fcb8557481 heads/master
-git github.com/shiena/ansicolor a422bbe96644373c5753384a59d678f7d261ff10 heads/master
-git golang.org/x/net e0c57d8f86c17f0724497efcb3bc617e82834821 heads/master
-git gopkg.in/alecthomas/kingpin.v2 947dcec5ba9c011838740e680966fd7087a71d0d tags/v2.2.6
-git gopkg.in/hlandau/configurable.v1 34642c4c8cbf56801d0e34f0e82187305983ac26 heads/master
-git gopkg.in/hlandau/easyconfig.v1 c31249162931b4963bbe6e501cccb60d23271a3f tags/v1.0.17
-git gopkg.in/hlandau/madns.v1 b82ebc776bd8a13824350c7c108180d601e38352 tags/v1.0.7
-git gopkg.in/hlandau/service.v2 b64b3467ebd16f64faec1640c25e318efc0c0d7b tags/v2.0.16
-git gopkg.in/hlandau/svcutils.v1 c25dac49e50cbbcbef8c81b089f56156f4067729 tags/v1.0.10
diff --git a/projects/goansicolor/config b/projects/goansicolor/config
index bfe67af..6d1a73e 100644
--- a/projects/goansicolor/config
+++ b/projects/goansicolor/config
@@ -1,6 +1,6 @@
 version: '[% c("abbrev") %]'
 git_url:  https://github.com/shiena/ansicolor.git
-git_hash: '[% config.var_p.id.${"github.com/shiena/ansicolor"} %]'
+git_hash: a422bbe96644373c5753384a59d678f7d261ff10
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gobtcjson/config b/projects/gobtcjson/config
index 398e070..033342c 100644
--- a/projects/gobtcjson/config
+++ b/projects/gobtcjson/config
@@ -1,6 +1,6 @@
 version: '[% c("abbrev") %]'
 git_url:  https://github.com/hlandauf/btcjson.git
-git_hash: '[% config.var_p.id.${"github.com/hlandauf/btcjson"} %]'
+git_hash: c9ac42e8122a8d002c734a140212c50c2fc77a0e
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gobuildinfo/config b/projects/gobuildinfo/config
index 3b3d1b1..90d8caf 100644
--- a/projects/gobuildinfo/config
+++ b/projects/gobuildinfo/config
@@ -1,6 +1,6 @@
 version: '[% c("abbrev") %]'
 git_url:  https://github.com/hlandau/buildinfo.git
-git_hash: '[% config.var_p.id.${"github.com/hlandau/buildinfo"} %]'
+git_hash: 337a29b5499734e584d4630ce535af64c5fe7813
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/goconfigurable/config b/projects/goconfigurable/config
index 1cad373..07bace5 100644
--- a/projects/goconfigurable/config
+++ b/projects/goconfigurable/config
@@ -1,6 +1,6 @@
 version: '[% c("abbrev") %]'
 git_url:  https://github.com/hlandau/configurable.git
-git_hash: '[% config.var_p.id.${"gopkg.in/hlandau/configurable.v1"} %]'
+git_hash: 34642c4c8cbf56801d0e34f0e82187305983ac26
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/godegoutils/config b/projects/godegoutils/config
index e406a42..f4f380a 100644
--- a/projects/godegoutils/config
+++ b/projects/godegoutils/config
@@ -1,6 +1,6 @@
 version: '[% c("abbrev") %]'
 git_url:  https://github.com/hlandau/degoutils.git
-git_hash: '[% config.var_p.id.${"github.com/hlandau/degoutils"} %]'
+git_hash: 8fa2440b63444dad556d76366f1c3ee070c8a577
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/godexlogconfig/config b/projects/godexlogconfig/config
index c9de92e..39162c6 100644
--- a/projects/godexlogconfig/config
+++ b/projects/godexlogconfig/config
@@ -1,6 +1,6 @@
 version: '[% c("abbrev") %]'
 git_url:  https://github.com/hlandau/dexlogconfig.git
-git_hash: '[% config.var_p.id.${"github.com/hlandau/dexlogconfig"} %]'
+git_hash: 244f29bd260884993b176cd14ef2f7631f6f3c18
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/godns/config b/projects/godns/config
index 6e6c09d..99f63a6 100644
--- a/projects/godns/config
+++ b/projects/godns/config
@@ -1,6 +1,6 @@
-version: '[% c("abbrev") %]'
+version: 1.1.16
 git_url:  https://github.com/miekg/dns.git
-git_hash: '[% config.var_p.id.${"github.com/miekg/dns"} %]'
+git_hash: c67445656579a3c3836047c509073f97022da0ed
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/goeasyconfig/config b/projects/goeasyconfig/config
index 40530cc..a87283e 100644
--- a/projects/goeasyconfig/config
+++ b/projects/goeasyconfig/config
@@ -1,6 +1,6 @@
-version: '[% c("abbrev") %]'
+version: 1.0.17
 git_url:  https://github.com/hlandau/easyconfig.git
-git_hash: '[% config.var_p.id.${"gopkg.in/hlandau/easyconfig.v1"} %]'
+git_hash: c31249162931b4963bbe6e501cccb60d23271a3f
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gogroupcache/config b/projects/gogroupcache/config
index e7e90f9..12d7d3b 100644
--- a/projects/gogroupcache/config
+++ b/projects/gogroupcache/config
@@ -1,6 +1,6 @@
 version: '[% c("abbrev") %]'
 git_url:  https://github.com/golang/groupcache.git
-git_hash: '[% config.var_p.id.${"github.com/golang/groupcache"} %]'
+git_hash: 869f871628b6baa9cfbc11732cdf6546b17c1298
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/goisatty/config b/projects/goisatty/config
index a75d7cf..09690ac 100644
--- a/projects/goisatty/config
+++ b/projects/goisatty/config
@@ -1,6 +1,6 @@
-version: '[% c("abbrev") %]'
+version: 0.0.9
 git_url:  https://github.com/mattn/go-isatty.git
-git_hash: '[% config.var_p.id.${"github.com/mattn/go-isatty"} %]'
+git_hash: e1f7b56ace729e4a73a29a6b4fac6cd5fcda7ab3
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gokingpin/config b/projects/gokingpin/config
index cbf229d..a9cacbb 100644
--- a/projects/gokingpin/config
+++ b/projects/gokingpin/config
@@ -1,6 +1,6 @@
-version: '[% c("abbrev") %]'
+version: 2.2.6
 git_url:  https://github.com/alecthomas/kingpin.git
-git_hash: '[% config.var_p.id.${"gopkg.in/alecthomas/kingpin.v2"} %]'
+git_hash: 947dcec5ba9c011838740e680966fd7087a71d0d
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gomadns/config b/projects/gomadns/config
index 892c987..6add296 100644
--- a/projects/gomadns/config
+++ b/projects/gomadns/config
@@ -1,6 +1,6 @@
-version: '[% c("abbrev") %]'
+version: 1.0.7
 git_url:  https://github.com/hlandau/madns.git
-git_hash: '[% config.var_p.id.${"gopkg.in/hlandau/madns.v1"} %]'
+git_hash: b82ebc776bd8a13824350c7c108180d601e38352
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/goncbtcjsontypes/config b/projects/goncbtcjsontypes/config
index 3141660..50002de 100644
--- a/projects/goncbtcjsontypes/config
+++ b/projects/goncbtcjsontypes/config
@@ -1,6 +1,6 @@
 version: '[% c("abbrev") %]'
 git_url:  https://github.com/hlandau/ncbtcjsontypes.git
-git_hash: '[% config.var_p.id.${"github.com/hlandau/ncbtcjsontypes"} %]'
+git_hash: 02ea7272dd11bb6153a3cd06899a0999ac6a16e0
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gopflag/config b/projects/gopflag/config
index ad735b1..403d84b 100644
--- a/projects/gopflag/config
+++ b/projects/gopflag/config
@@ -1,6 +1,6 @@
 version: '[% c("abbrev") %]'
 git_url:  https://github.com/ogier/pflag.git
-git_hash: '[% config.var_p.id.${"github.com/ogier/pflag"} %]'
+git_hash: 45c278ab3607870051a2ea9040bb85fcb8557481
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gopkcs11/config b/projects/gopkcs11/config
index 8fc7e5d..ef1b031 100644
--- a/projects/gopkcs11/config
+++ b/projects/gopkcs11/config
@@ -1,6 +1,6 @@
-version: '[% c("abbrev") %]'
+version: 1.0.3
 git_url:  https://github.com/miekg/pkcs11.git
-git_hash: '[% config.var_p.id.${"github.com/miekg/pkcs11"} %]'
+git_hash: 210dc1e16747c5ba98a03bcbcf728c38086ea357
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gopkcs11mod/config b/projects/gopkcs11mod/config
index fe41551..ffd9d07 100644
--- a/projects/gopkcs11mod/config
+++ b/projects/gopkcs11mod/config
@@ -1,6 +1,6 @@
-version: '0.0.1'
+version: 0.0.1
 git_url:  https://github.com/namecoin/pkcs11mod.git
-git_hash: '[% config.var_p.id.${"github.com/namecoin/pkcs11mod"} %]'
+git_hash: f7dce61fc5379851e99cfa2111834a29e3d36305
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gopretty/config b/projects/gopretty/config
index 5d62923..a2ceecf 100644
--- a/projects/gopretty/config
+++ b/projects/gopretty/config
@@ -1,6 +1,6 @@
 version: '[% c("abbrev") %]'
 git_url:  https://github.com/kr/pretty.git
-git_hash: '[% config.var_p.id.${"github.com/kr/pretty"} %]'
+git_hash: 71e7e49937503c662b9b636fd6b2c14b1aa818a5
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/goservice/config b/projects/goservice/config
index 5c50a94..f683437 100644
--- a/projects/goservice/config
+++ b/projects/goservice/config
@@ -1,6 +1,6 @@
-version: '[% c("abbrev") %]'
+version: 2.0.16
 git_url:  https://github.com/hlandau/service.git
-git_hash: '[% config.var_p.id.${"gopkg.in/hlandau/service.v2"} %]'
+git_hash: b64b3467ebd16f64faec1640c25e318efc0c0d7b
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gosvcutils/config b/projects/gosvcutils/config
index 05c6cf5..34e09b2 100644
--- a/projects/gosvcutils/config
+++ b/projects/gosvcutils/config
@@ -1,6 +1,6 @@
-version: '[% c("abbrev") %]'
+version: 1.0.10
 git_url:  https://github.com/hlandau/svcutils.git
-git_hash: '[% config.var_p.id.${"gopkg.in/hlandau/svcutils.v1"} %]'
+git_hash: c25dac49e50cbbcbef8c81b089f56156f4067729
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gosystemd/config b/projects/gosystemd/config
index d19e35c..898a34a 100644
--- a/projects/gosystemd/config
+++ b/projects/gosystemd/config
@@ -1,6 +1,6 @@
-version: '[% c("abbrev") %]'
+version: 20
 git_url:  https://github.com/coreos/go-systemd.git
-git_hash: '[% config.var_p.id.${"github.com/coreos/go-systemd"} %]'
+git_hash: e64a0ec8b42a61e2a9801dc1d0abe539dea79197
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gotemplate/config b/projects/gotemplate/config
index 8de3c89..783ae71 100644
--- a/projects/gotemplate/config
+++ b/projects/gotemplate/config
@@ -1,6 +1,6 @@
 version: '[% c("abbrev") %]'
 git_url:  https://github.com/alecthomas/template.git
-git_hash: '[% config.var_p.id.${"github.com/alecthomas/template"} %]'
+git_hash: fb15b899a75114aa79cc930e33c46b577cc664b1
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gotext/config b/projects/gotext/config
index b1a8145..04e26b5 100644
--- a/projects/gotext/config
+++ b/projects/gotext/config
@@ -1,6 +1,6 @@
-version: '[% c("abbrev") %]'
+version: 0.1.0
 git_url:  https://github.com/kr/text.git
-git_hash: '[% config.var_p.id.${"github.com/kr/text"} %]'
+git_hash: e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gotoml/config b/projects/gotoml/config
index caad070..d96fc55 100644
--- a/projects/gotoml/config
+++ b/projects/gotoml/config
@@ -1,6 +1,6 @@
 version: '[% c("abbrev") %]'
 git_url:  https://github.com/BurntSushi/toml.git
-git_hash: '[% config.var_p.id.${"github.com/BurntSushi/toml"} %]'
+git_hash: 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gounits/config b/projects/gounits/config
index c850ec9..b0f9467 100644
--- a/projects/gounits/config
+++ b/projects/gounits/config
@@ -1,6 +1,6 @@
 version: '[% c("abbrev") %]'
 git_url:  https://github.com/alecthomas/units.git
-git_hash: '[% config.var_p.id.${"github.com/alecthomas/units"} %]'
+git_hash: c3de453c63f4bdb4dadffab9805ec00426c505f7
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/gowinsvc/config b/projects/gowinsvc/config
index 9ea0fb2..8475f5c 100644
--- a/projects/gowinsvc/config
+++ b/projects/gowinsvc/config
@@ -1,6 +1,6 @@
-version: '[% c("abbrev") %]'
+version: 1.0.0
 git_url:  https://github.com/btcsuite/winsvc.git
-git_hash: '[% config.var_p.id.${"github.com/btcsuite/winsvc"} %]'
+git_hash: f8fb11f83f7e860e3769a08e6811d1b399a43722
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/goxlog/config b/projects/goxlog/config
index 8991f04..fa47d30 100644
--- a/projects/goxlog/config
+++ b/projects/goxlog/config
@@ -1,6 +1,6 @@
-version: '[% c("abbrev") %]'
+version: 1.0.0
 git_url:  https://github.com/hlandau/xlog.git
-git_hash: '[% config.var_p.id.${"github.com/hlandau/xlog"} %]'
+git_hash: 197ef798aed28e08ed3e176e678fda81be993a31
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/rbm.conf b/rbm.conf
index bc8f973..2703577 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -402,18 +402,6 @@ ENV:
 --- |
   # This part of the file contains options written in perl
   use IO::CaptureOutput qw(capture_exec);
-
-  my $hashlist = {};
-  open(my $f, '<:encoding(UTF-8)', 'hashlist') or die "Cannot open hashlist";
-  while (my $row = <$f>) {
-    chomp $row;
-    my @words = split / /, $row;
-    my $repo = $words[1];
-    my $hash = $words[2];
-    $hashlist->{$repo} = $hash;
-    #print "$repo = $hash\n";
-  }
-
   (
     var_p => {
       # runc100 is true if we are using runc >= 1.0.0
@@ -428,7 +416,5 @@ ENV:
         my ($out) = capture_exec('sudo', 'runc', '--version');
         return $out =~ m/^.*spec: 1\.[0-9]+\.[0-9]+(?:-dev)?$/m;
       },
-
-      id => $hashlist,
     },
   )

From 7b06b22f1c9fa5b203d67f01779b9b1b753e68b1 Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Wed, 11 Sep 2019 21:40:08 +0000
Subject: [PATCH 4/5] Remove llvm project

It's no longer present in upstream tor-browser-build.
---
 projects/llvm | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 projects/llvm

diff --git a/projects/llvm b/projects/llvm
deleted file mode 120000
index 7ab866e..0000000
--- a/projects/llvm
+++ /dev/null
@@ -1 +0,0 @@
-../tor-browser-build/projects/llvm
\ No newline at end of file

From 6abe8395a5372f57234d129250d1851d462cf72e Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Sat, 14 Sep 2019 01:46:30 +0000
Subject: [PATCH 5/5] Remove explicit empty go_lib_deps

This brings us closer to upstream Tor conventions.
---
 projects/gobtcjson/config    | 1 -
 projects/gogroupcache/config | 1 -
 projects/gopflag/config      | 1 -
 projects/gosystemd/config    | 1 -
 projects/gotemplate/config   | 1 -
 projects/gotext/config       | 1 -
 projects/gotoml/config       | 1 -
 projects/gounits/config      | 1 -
 8 files changed, 8 deletions(-)

diff --git a/projects/gobtcjson/config b/projects/gobtcjson/config
index 033342c..58e196c 100644
--- a/projects/gobtcjson/config
+++ b/projects/gobtcjson/config
@@ -9,7 +9,6 @@ var:
   container:
     use_container: 1
   go_lib: github.com/hlandauf/btcjson
-  go_lib_deps: []
 
 input_files:
   - project: container-image
diff --git a/projects/gogroupcache/config b/projects/gogroupcache/config
index 12d7d3b..15493ef 100644
--- a/projects/gogroupcache/config
+++ b/projects/gogroupcache/config
@@ -11,7 +11,6 @@ var:
   go_lib: github.com/golang/groupcache
   go_lib_install:
     - github.com/golang/groupcache/lru
-  go_lib_deps: []
 
 input_files:
   - project: container-image
diff --git a/projects/gopflag/config b/projects/gopflag/config
index 403d84b..16141cc 100644
--- a/projects/gopflag/config
+++ b/projects/gopflag/config
@@ -9,7 +9,6 @@ var:
   container:
     use_container: 1
   go_lib: github.com/ogier/pflag
-  go_lib_deps: []
 
 input_files:
   - project: container-image
diff --git a/projects/gosystemd/config b/projects/gosystemd/config
index 898a34a..95819cc 100644
--- a/projects/gosystemd/config
+++ b/projects/gosystemd/config
@@ -11,7 +11,6 @@ var:
   go_lib: github.com/coreos/go-systemd
   go_lib_install:
     - github.com/coreos/go-systemd/journal
-  go_lib_deps: []
   build_go_lib_pre: |
     [% IF c("var/linux") %]
       [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
diff --git a/projects/gotemplate/config b/projects/gotemplate/config
index 783ae71..62cddc9 100644
--- a/projects/gotemplate/config
+++ b/projects/gotemplate/config
@@ -9,7 +9,6 @@ var:
   container:
     use_container: 1
   go_lib: github.com/alecthomas/template
-  go_lib_deps: []
 
 input_files:
   - project: container-image
diff --git a/projects/gotext/config b/projects/gotext/config
index 04e26b5..5493329 100644
--- a/projects/gotext/config
+++ b/projects/gotext/config
@@ -9,7 +9,6 @@ var:
   container:
     use_container: 1
   go_lib: github.com/kr/text
-  go_lib_deps: []
 
 input_files:
   - project: container-image
diff --git a/projects/gotoml/config b/projects/gotoml/config
index d96fc55..c40c582 100644
--- a/projects/gotoml/config
+++ b/projects/gotoml/config
@@ -9,7 +9,6 @@ var:
   container:
     use_container: 1
   go_lib: github.com/BurntSushi/toml
-  go_lib_deps: []
 
 input_files:
   - project: container-image
diff --git a/projects/gounits/config b/projects/gounits/config
index b0f9467..2b450ad 100644
--- a/projects/gounits/config
+++ b/projects/gounits/config
@@ -9,7 +9,6 @@ var:
   container:
     use_container: 1
   go_lib: github.com/alecthomas/units
-  go_lib_deps: []
 
 input_files:
   - project: container-image