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] 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,
     },
   )