Merge #34: Add ncprop279 project

022071b Add ncprop279 (JeremyRand) 0857ed4 Bump ncdns version (JeremyRand) 158b258 Add tlsrestrictnss (JeremyRand) e9177f8 Add crosssignnameconstraint (JeremyRand) Pull request description: Fixes https://github.com/namecoin/ncdns-repro/issues/5 Fixes https://github.com/namecoin/ncdns-repro/issues/7 Fixes https://github.com/namecoin/ncdns-repro/issues/9 Fixes https://github.com/namecoin/ncdns-repro/issues/35
5 years ago · b23fd76972
parent fe722c596e 022071b2b5
commit b23fd76972
5 changed files with 148 additions and 2 deletions
--- a/projects/github.com,namecoin,crosssignnameconstraint/config
+++ b/projects/github.com,namecoin,crosssignnameconstraint/config
@ -0,0 +1,18 @@
+version: '[% c("abbrev") %]'
+git_url:  https://github.com/namecoin/crosssignnameconstraint.git
+git_hash: '76052b08844e6b81678430656c5fc9f79a49f795'
+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/crosssignnameconstraint
+  build_go_lib_pre: |
+    export CGO_ENABLED=0
+
+input_files:
+  - project: container-image
+  - name: go
+    project: go
--- a/projects/github.com,namecoin,tlsrestrictnss/config
+++ b/projects/github.com,namecoin,tlsrestrictnss/config
@ -0,0 +1,43 @@
+version: '[% c("abbrev") %]'
+git_url:  https://github.com/namecoin/tlsrestrictnss.git
+git_hash: '01a37997e55de687f4b5228e0e9315a6d698bd2a'
+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/tlsrestrictnss
+  go_lib_deps:
+    - github.com,hlandau,xlog
+    - github.com,namecoin,crosssignnameconstraint
+  go_lib_install:
+    - github.com/namecoin/tlsrestrictnss
+    - github.com/namecoin/tlsrestrictnss/tlsrestrictnsssync
+  build_go_lib_pre: |
+    export CGO_ENABLED=0
+
+targets:
+  windows:
+    var:
+      go_lib_deps:
+        - github.com,hlandau,xlog
+        - github.com,namecoin,crosssignnameconstraint
+        - gopkg.in,hlandau,easyconfig.v1
+        - golang.org,x,sys
+
+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
+    enable: '[% c("var/windows") %]'
+  - name: golang.org,x,sys
+    project: golang.org,x,sys
+    enable: '[% c("var/windows") %]'
--- a/projects/ncdns/config
+++ b/projects/ncdns/config
@ -1,6 +1,9 @@
-version: 0.0.8
+#version: 0.0.8
 git_url: https://github.com/namecoin/ncdns.git
-git_hash: 'v[% c("version") %]'
+# 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'
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'

 var:
@ -14,6 +17,7 @@ var:
    - github.com,hlandauf,btcjson
    - github.com,kr,pretty
    - github.com,miekg,dns
+    - github.com,namecoin,tlsrestrictnss
    - gopkg.in,hlandau,madns.v1
    - gopkg.in,hlandau,easyconfig.v1
    - gopkg.in,hlandau,service.v2
@ -45,6 +49,7 @@ targets:
        - github.com,hlandauf,btcjson
        - github.com,kr,pretty
        - github.com,miekg,dns
+        - github.com,namecoin,tlsrestrictnss
        - gopkg.in,hlandau,madns.v1
        - gopkg.in,hlandau,easyconfig.v1
        - gopkg.in,hlandau,service.v2
@ -78,6 +83,8 @@ input_files:
    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: gopkg.in,hlandau,madns.v1
    project: gopkg.in,hlandau,madns.v1
  - name: github.com,kr,pretty
--- a/projects/ncprop279/build
+++ b/projects/ncprop279/build
@ -0,0 +1,45 @@
+#!/bin/bash
+[% c("var/set_default_env") -%]
+[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %]
+export CGO_ENABLED=[% c("var/cgo") %]
+distdir=/var/tmp/dist/[% project %]
+mkdir -p $distdir
+
+[% FOREACH dep = c("var/go_lib_deps") -%]
+  tar -C /var/tmp/dist -xf [% c('input_files_by_name/' _ dep) %]
+[% END -%]
+
+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/ncprop279-[% c('version') %] $GOPATH/src/github.com/namecoin/ncprop279
+
+go install -ldflags '-s' github.com/namecoin/ncprop279
+
+#mkdir -p /var/tmp/build
+#tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
+#cd /var/tmp/build/[% project %]-[% c('version') %]
+
+#mkdir -p "$GOPATH/src/github.com/namecoin"
+#ln -sf "$PWD" "$GOPATH/src/github.com/namecoin/ncdns"
+
+#mkdir -p out
+#cd out
+#for x in .. ../ncdumpzone ../generate_nmc_cert; do
+#  go build -ldflags '-s' "$x"
+#done
+
+[% IF c("var/linux-x86_64") -%]
+  GOPATHBIN="${GOPATH}/bin"
+[% ELSE -%]
+  GOPATHBIN="${GOPATH}/bin/${GOOS}_${GOARCH}"
+[% END -%]
+
+ls $GOPATHBIN
+
+cp -a $GOPATHBIN/ncprop279[% IF c("var/windows") %].exe[% END %] $distdir/
+
+cd $distdir
+[% c('tar', {
+     tar_src   => [ '.' ],
+     tar_args  => '-czf ' _ dest_dir _ '/' _ c('filename'),
+   }) %]
--- a/projects/ncprop279/config
+++ b/projects/ncprop279/config
@ -0,0 +1,33 @@
+version: '[% c("abbrev") %]'
+git_url:  https://github.com/namecoin/ncprop279.git
+git_hash: 'd72977987d841fa0b7fa51108a868263e7f4a9a0'
+filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
+
+var:
+  container:
+    use_container: 1
+  go_lib_deps:
+    - github.com,miekg,dns
+    - gopkg.in,hlandau,easyconfig.v1
+    - gopkg.in,hlandau,madns.v1
+    - ncdns
+  cgo: 0
+  build_go_lib_pre: |
+    export CGO_ENABLED=[% c("var/cgo") %] 
+
+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: ncdns
+    project: ncdns
+    # Build ncdns as a library, not an executable.
+    # TODO: refactor this once our build_go_lib executable patch is merged by upstream Tor
+    var:
+      go_lib_no_output: 0