From e9177f8f9a433350cb4adff9b6ac27ea1a3f57f9 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 24 Jun 2019 05:28:53 +0000 Subject: [PATCH 1/4] Add crosssignnameconstraint Fixes https://github.com/namecoin/ncdns-repro/issues/5 --- .../config | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 projects/github.com,namecoin,crosssignnameconstraint/config diff --git a/projects/github.com,namecoin,crosssignnameconstraint/config b/projects/github.com,namecoin,crosssignnameconstraint/config new file mode 100644 index 0000000..3aae293 --- /dev/null +++ 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 From 158b2589c38315c1f87b4da8f160ab4b6113cacd Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 24 Jun 2019 05:29:07 +0000 Subject: [PATCH 2/4] Add tlsrestrictnss Fixes https://github.com/namecoin/ncdns-repro/issues/7 Fixes https://github.com/namecoin/ncdns-repro/issues/9 --- .../github.com,namecoin,tlsrestrictnss/config | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 projects/github.com,namecoin,tlsrestrictnss/config diff --git a/projects/github.com,namecoin,tlsrestrictnss/config b/projects/github.com,namecoin,tlsrestrictnss/config new file mode 100644 index 0000000..a7505ef --- /dev/null +++ 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") %]' From 0857ed471e331567b236b339c4e4cef5163987d4 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 24 Jun 2019 05:30:02 +0000 Subject: [PATCH 3/4] Bump ncdns version The new version is necessary because ncprop279 needs the RPC timeout feature that was added recently to ncdns. --- projects/ncdns/config | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/projects/ncdns/config b/projects/ncdns/config index 157c902..e52a54f 100644 --- 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 @@ -44,6 +48,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 @@ -77,6 +82,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 From 022071b2b5f774c5a9c1fb9deef3ee160c48df81 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 24 Jun 2019 05:30:21 +0000 Subject: [PATCH 4/4] Add ncprop279 Fixes https://github.com/namecoin/ncdns-repro/issues/35 --- projects/ncprop279/build | 45 +++++++++++++++++++++++++++++++++++++++ projects/ncprop279/config | 33 ++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 projects/ncprop279/build create mode 100644 projects/ncprop279/config diff --git a/projects/ncprop279/build b/projects/ncprop279/build new file mode 100644 index 0000000..bd3262a --- /dev/null +++ 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'), + }) %] diff --git a/projects/ncprop279/config b/projects/ncprop279/config new file mode 100644 index 0000000..5271651 --- /dev/null +++ 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