From f79095c197c347db3a761c484423a040b71a8aa2 Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Sun, 8 Sep 2019 09:45:28 +0000
Subject: [PATCH 1/6] Add clang project from upstream tor-browser-build

Upstream tor-browser-build now uses clang for go.
---
 keyring/clang.gpg | 1 +
 projects/clang    | 1 +
 2 files changed, 2 insertions(+)
 create mode 120000 keyring/clang.gpg
 create mode 120000 projects/clang

diff --git a/keyring/clang.gpg b/keyring/clang.gpg
new file mode 120000
index 0000000..f6a638a
--- /dev/null
+++ b/keyring/clang.gpg
@@ -0,0 +1 @@
+../tor-browser-build/keyring/clang.gpg
\ No newline at end of file
diff --git a/projects/clang b/projects/clang
new file mode 120000
index 0000000..7c0dd12
--- /dev/null
+++ b/projects/clang
@@ -0,0 +1 @@
+../tor-browser-build/projects/clang
\ No newline at end of file

From 62efef1f92f501456c1ff32d08be08f700e819a0 Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Sun, 8 Sep 2019 09:47:16 +0000
Subject: [PATCH 2/6] Add goxcrypto from upstream tor-browser-build

Now a dependency of upstream miekg/dns.
---
 projects/golang.org,x,crypto | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 projects/golang.org,x,crypto

diff --git a/projects/golang.org,x,crypto b/projects/golang.org,x,crypto
new file mode 120000
index 0000000..65c6fa8
--- /dev/null
+++ b/projects/golang.org,x,crypto
@@ -0,0 +1 @@
+../tor-browser-build/projects/goxcrypto
\ No newline at end of file

From 09ef3946d9c568f7c7af6caab89f22c3081e067d Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Sun, 8 Sep 2019 09:47:59 +0000
Subject: [PATCH 3/6] Add goxcrypto/ed25519

Now a dependency of upstream miekg/dns.
---
 projects/golang.org,x,crypto,ed25519/config | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 projects/golang.org,x,crypto,ed25519/config

diff --git a/projects/golang.org,x,crypto,ed25519/config b/projects/golang.org,x,crypto,ed25519/config
new file mode 100644
index 0000000..81f221c
--- /dev/null
+++ b/projects/golang.org,x,crypto,ed25519/config
@@ -0,0 +1,19 @@
+# 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") %]'
+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: golang.org/x/crypto
+  go_lib_install:
+    - golang.org/x/crypto/ed25519
+
+input_files:
+  - project: container-image
+  - name: go
+    project: go

From cf288bf35e2168d8794a828585d3b4821e584747 Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Sun, 8 Sep 2019 09:48:28 +0000
Subject: [PATCH 4/6] Add goxnet/ip

Now a dependency of upstream miekg/dns.
---
 projects/golang.org,x,net,ip/config | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 projects/golang.org,x,net,ip/config

diff --git a/projects/golang.org,x,net,ip/config b/projects/golang.org,x,net,ip/config
new file mode 100644
index 0000000..1eab197
--- /dev/null
+++ b/projects/golang.org,x,net,ip/config
@@ -0,0 +1,20 @@
+# 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") %]'
+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: golang.org/x/net
+  go_lib_install:
+    - golang.org/x/net/ipv4
+    - golang.org/x/net/ipv6
+
+input_files:
+  - project: container-image
+  - name: go
+    project: go

From 74684933e721a88a0a76a597096e1db4faf3f5a9 Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Sun, 8 Sep 2019 09:48:50 +0000
Subject: [PATCH 5/6] Add goxsys/unix

Now a dependency of upstream miekg/dns.
---
 projects/golang.org,x,sys,unix/config | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 projects/golang.org,x,sys,unix/config

diff --git a/projects/golang.org,x,sys,unix/config b/projects/golang.org,x,sys,unix/config
new file mode 100644
index 0000000..1453a27
--- /dev/null
+++ b/projects/golang.org,x,sys,unix/config
@@ -0,0 +1,19 @@
+# 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") %]'
+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: golang.org/x/sys
+  go_lib_install:
+    - golang.org/x/sys/unix
+
+input_files:
+  - project: container-image
+  - name: go
+    project: go

From 5816296a665adf1cc3bc531330d4c7ce644df4e1 Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Sun, 8 Sep 2019 09:49:42 +0000
Subject: [PATCH 6/6] Add goxcrypto/goxnet/goxsys dependencies to miekg/dns

These dependencies were added upstream.
---
 projects/github.com,miekg,dns/config | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/projects/github.com,miekg,dns/config b/projects/github.com,miekg,dns/config
index 8de5d33..858b482 100644
--- a/projects/github.com,miekg,dns/config
+++ b/projects/github.com,miekg,dns/config
@@ -9,9 +9,26 @@ var:
   container:
     use_container: 1
   go_lib: github.com/miekg/dns
-  go_lib_deps: []
+  go_lib_deps:
+    - golang.org,x,crypto,ed25519
+    - golang.org,x,net,ip
+    - golang.org,x,sys,unix
+
+targets:
+  windows:
+    var:
+      go_lib_deps:
+        - golang.org,x,crypto,ed25519
 
 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
+    enable: '[% ! c("var/windows") %]'
+  - name: golang.org,x,sys,unix
+    project: golang.org,x,sys,unix
+    enable: '[% ! c("var/windows") %]'