From 1781112c69a6aeaeb25956e02f8f46ba1b74baa2 Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Fri, 9 Aug 2019 04:55:54 +0000
Subject: [PATCH 1/2] Add x509-signature-splice project

This is needed in order to bump the ncdns version.
---
 .../config                                    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 projects/github.com,namecoin,x509-signature-splice/config

diff --git a/projects/github.com,namecoin,x509-signature-splice/config b/projects/github.com,namecoin,x509-signature-splice/config
new file mode 100644
index 0000000..3f16b80
--- /dev/null
+++ b/projects/github.com,namecoin,x509-signature-splice/config
@@ -0,0 +1,22 @@
+version: '[% c("abbrev") %]'
+git_url:  https://github.com/namecoin/x509-signature-splice.git
+# go1.11 branch
+git_hash: 'c3ef8e04f5bd6315a4a9476964df6c410700913a'
+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: github.com/namecoin/x509-signature-splice
+  go_lib_install:
+    - github.com/namecoin/x509-signature-splice/x509
+  build_go_lib_pre: |
+    export CGO_ENABLED=0
+    go generate github.com/namecoin/x509-signature-splice/x509
+
+input_files:
+  - project: container-image
+  - name: go
+    project: go

From 566cce8e44c5af9f0b351f92a15cc1021796f2ab Mon Sep 17 00:00:00 2001
From: JeremyRand <biolizard89@gmail.com>
Date: Fri, 9 Aug 2019 04:55:28 +0000
Subject: [PATCH 2/2] Bump ncdns version

This adds name-constrained CA support to generate_nmc_cert.
---
 projects/ncdns/build  | 1 -
 projects/ncdns/config | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/projects/ncdns/build b/projects/ncdns/build
index 9485379..c79c548 100644
--- a/projects/ncdns/build
+++ b/projects/ncdns/build
@@ -29,7 +29,6 @@ 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/ncdns-[% c('version') %] $GOPATH/src/github.com/namecoin/ncdns
 
-go generate github.com/namecoin/ncdns/x509
 go install -ldflags '-s' github.com/namecoin/ncdns/...
 
 #mkdir -p /var/tmp/build
diff --git a/projects/ncdns/config b/projects/ncdns/config
index 4943026..2fc865a 100644
--- a/projects/ncdns/config
+++ b/projects/ncdns/config
@@ -3,7 +3,7 @@ git_url: https://github.com/namecoin/ncdns.git
 # Using latest master branch because we need the RPC timeout feature.  Once
 # it's in a tagged release, we'll go back to using a version tag here.
 #git_hash: 'v[% c("version") %]'
-git_hash: '4ea036742bd5b10a7b56765355dcc88724632f32'
+git_hash: '006f537e01cf20db01b18e399ed51f57211db91c'
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -18,6 +18,7 @@ var:
     - 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
@@ -49,7 +50,7 @@ targets:
         - 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
@@ -85,6 +86,8 @@ input_files:
     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