Merge #58: Follow Tor conventions more closely

6abe839 Remove explicit empty go_lib_deps (JeremyRand) 7b06b22 Remove llvm project (JeremyRand) 740bea9 Remove hashlist (JeremyRand) 20e0d4f certdehydrate-dane-rest-api: Remove obsolete godns workaround (JeremyRand) 465c9a4 Rename Go projects to follow upstream Tor conventions (JeremyRand) Pull request description: This PR facilitates building `ncdns-repro` as a Git submodule of `tor-browser-build`.
namecoin · Sep 15, 2019 · fb342f1 · fb342f1
2 parents be04c48 + 6abe839
commit fb342f1
Show file tree

Hide file tree

Showing 48 changed files with 272 additions and 329 deletions.
diff --git a/hashlist b/hashlist
diff --git 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/github.com,miekg,dns') %]
-
 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

diff --git 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
@@ -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 → projects/goansicolor/config b/projects/github.com,shiena,ansicolor/config → 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/github.com,hlandauf,btcjson/config → projects/gobtcjson/config b/projects/github.com,hlandauf,btcjson/config → 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") %]'
@@ -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/github.com,hlandau,buildinfo/config → projects/gobuildinfo/config b/projects/github.com,hlandau,buildinfo/config → 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") %]'
@@ -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/...s/gopkg.in,hlandau,configurable.v1/config → projects/goconfigurable/config b/...s/gopkg.in,hlandau,configurable.v1/config → 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/...ects/github.com,namecoin,crosssign/config → projects/gocrosssign/config b/...ects/github.com,namecoin,crosssign/config → projects/gocrosssign/config
diff --git a/...m,namecoin,crosssignnameconstraint/config → projects/gocrosssignnameconstraint/config b/...m,namecoin,crosssignnameconstraint/config → projects/gocrosssignnameconstraint/config
diff --git a/projects/github.com,hlandau,degoutils/config → projects/godegoutils/config b/projects/github.com,hlandau,degoutils/config → 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") %]'
@@ -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/...ts/github.com,hlandau,dexlogconfig/config → projects/godexlogconfig/config b/...ts/github.com,hlandau,dexlogconfig/config → 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") %]'
@@ -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 → projects/godns/config b/projects/github.com,miekg,dns/config → 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") %]'
@@ -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
@@ -0,0 +1,35 @@
+version: 1.0.17
+git_url:  https://github.com/hlandau/easyconfig.git
+git_hash: c31249162931b4963bbe6e501cccb60d23271a3f
+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 → projects/gogroupcache/config b/projects/github.com,golang,groupcache/config → 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") %]'
@@ -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/github.com,mattn,go-isatty/config → projects/goisatty/config b/projects/github.com,mattn,go-isatty/config → 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") %]'
@@ -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") %]'