From ab7a90354f7932ce6c58b6d703e8702522932686 Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:57:53 +0000 Subject: [PATCH 01/27] Bump encaya --- projects/encaya/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/encaya/config b/projects/encaya/config index 31d1100..cfef304 100644 --- a/projects/encaya/config +++ b/projects/encaya/config @@ -1,6 +1,6 @@ -version: '0.0.1' +version: '0.1' git_url: https://github.com/namecoin/encaya.git -git_hash: '2eeb272f4bb7dffc13e39a609b308656a5a121ea' +git_hash: 'fe553b2a8664654f54fd8b3673bbdc362ca27108' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: From cc34ff4a9cce17020742cf42a30d7b071e68ad91 Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:57:55 +0000 Subject: [PATCH 02/27] Bump goansicolor --- projects/goansicolor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/goansicolor/config b/projects/goansicolor/config index 6d1a73e..9b92cb1 100644 --- a/projects/goansicolor/config +++ b/projects/goansicolor/config @@ -1,6 +1,6 @@ version: '[% c("abbrev") %]' git_url: https://github.com/shiena/ansicolor.git -git_hash: a422bbe96644373c5753384a59d678f7d261ff10 +git_hash: c7312218db184c554578219828d6c9498d02dcb1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 6e8e097004a31a848453491a0c6c68d769b7a4c1 Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:57:56 +0000 Subject: [PATCH 03/27] Bump gobtcd --- projects/gobtcd/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/gobtcd/config b/projects/gobtcd/config index 4aa0819..fd5ad20 100644 --- a/projects/gobtcd/config +++ b/projects/gobtcd/config @@ -1,6 +1,6 @@ -version: 0.20.1 +version: 0.21.0 git_url: https://github.com/namecoin/btcd.git -git_hash: a271c34c473209705917e75ea9656972bd32da1a +git_hash: ac482bd97741fdc736c7e1290bc8ea5282e1b08b filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 0cb337501f8cb40d9224e0ffd24215251d396cdf Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:00 +0000 Subject: [PATCH 04/27] Bump gobtcutil --- projects/gobtcutil/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/gobtcutil/config b/projects/gobtcutil/config index 8d7290b..b793310 100644 --- a/projects/gobtcutil/config +++ b/projects/gobtcutil/config @@ -1,6 +1,6 @@ -version: '1.0.1' +version: '1.0.2' git_url: https://github.com/btcsuite/btcutil.git -git_hash: 02a4fd9de1d52e877491996349a92d54c653ccbf +git_hash: b2bf7f89d674a3702182b7e15f52807896051af3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 2eb22831e18c83894b0ed996f3bf902c9e6f3a30 Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:03 +0000 Subject: [PATCH 05/27] Bump goconfigurable --- projects/goconfigurable/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/goconfigurable/config b/projects/goconfigurable/config index 07bace5..bec774d 100644 --- a/projects/goconfigurable/config +++ b/projects/goconfigurable/config @@ -1,6 +1,6 @@ version: '[% c("abbrev") %]' git_url: https://github.com/hlandau/configurable.git -git_hash: 34642c4c8cbf56801d0e34f0e82187305983ac26 +git_hash: bf2d3415bde94ee9235e0b8c666476015c84b508 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From e023d1c6f4f604e602e1ac10e5979552dd746728 Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:09 +0000 Subject: [PATCH 06/27] Bump godexlogconfig --- projects/godexlogconfig/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/godexlogconfig/config b/projects/godexlogconfig/config index 39162c6..57ae50b 100644 --- a/projects/godexlogconfig/config +++ b/projects/godexlogconfig/config @@ -1,6 +1,6 @@ version: '[% c("abbrev") %]' git_url: https://github.com/hlandau/dexlogconfig.git -git_hash: 244f29bd260884993b176cd14ef2f7631f6f3c18 +git_hash: 709dfd27e98611cd00a106ccfd6819d9ed2821a0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 045ab8d85b53fbf67a0dde6f0680b654370f8589 Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:10 +0000 Subject: [PATCH 07/27] Bump godns --- projects/godns/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/godns/config b/projects/godns/config index 4b7699d..ad69f2b 100644 --- a/projects/godns/config +++ b/projects/godns/config @@ -1,6 +1,6 @@ -version: 1.1.27 +version: 1.1.42 git_url: https://github.com/miekg/dns.git -git_hash: 6c0c4e6581f8e173cc562c8b3363ab984e4ae071 +git_hash: 9f8f2e3a3c12a701d9137ce4e7bb65f9c931f550 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 3c2b5058d7a415379d21dcfe0c5d1d1d1c6e64f5 Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:13 +0000 Subject: [PATCH 08/27] Bump gogroupcache --- projects/gogroupcache/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/gogroupcache/config b/projects/gogroupcache/config index 4cd4775..5702045 100644 --- a/projects/gogroupcache/config +++ b/projects/gogroupcache/config @@ -1,6 +1,6 @@ version: '[% c("abbrev") %]' git_url: https://github.com/golang/groupcache.git -git_hash: 215e87163ea771ffa998a96c611387313bb5a403 +git_hash: 41bb18bfe9da5321badc438f91158cd790a33aa3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 7346cbb89c26bf7d7e510f831cf86ebe6b53e5ae Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:14 +0000 Subject: [PATCH 09/27] Bump goisatty --- projects/goisatty/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/goisatty/config b/projects/goisatty/config index 7d0c3e7..25a3938 100644 --- a/projects/goisatty/config +++ b/projects/goisatty/config @@ -1,6 +1,6 @@ -version: 0.0.11 +version: 0.0.12 git_url: https://github.com/mattn/go-isatty.git -git_hash: 31745d66dd679ac0ac4f8d3ecff168fce6170c6a +git_hash: 7b513a986450394f7bbf1476909911b3aa3a55ce filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 44d81ab7d920e0592f156d2e2841449b88be1581 Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:17 +0000 Subject: [PATCH 10/27] Bump gomadns --- projects/gomadns/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/gomadns/config b/projects/gomadns/config index c77e39f..b11bcf5 100644 --- a/projects/gomadns/config +++ b/projects/gomadns/config @@ -1,6 +1,6 @@ -version: 2.0.1 +version: 2.0.2 git_url: https://github.com/hlandau/madns.git -git_hash: 26979b3e4b5aa3e0bd53cf0a014f9eaf43b578e3 +git_hash: b579963a2a3ce6d9ca7c118cf3848b05a3919034 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 7587fecc4b58bc98442d235d9b4d55f6860d9dd5 Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:21 +0000 Subject: [PATCH 11/27] Bump gopflag --- projects/gopflag/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/gopflag/config b/projects/gopflag/config index 16141cc..06759a0 100644 --- a/projects/gopflag/config +++ b/projects/gopflag/config @@ -1,6 +1,6 @@ version: '[% c("abbrev") %]' git_url: https://github.com/ogier/pflag.git -git_hash: 45c278ab3607870051a2ea9040bb85fcb8557481 +git_hash: 73e519546fc0bce0c395610afcf6aa4e5aec88eb filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From f75593c45ae048858c61c7be3101a1e8edae54fb Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:25 +0000 Subject: [PATCH 12/27] Bump gopretty --- projects/gopretty/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/gopretty/config b/projects/gopretty/config index e2baabd..d3dd5ec 100644 --- a/projects/gopretty/config +++ b/projects/gopretty/config @@ -1,6 +1,6 @@ -version: 0.2.0 +version: 0.2.1 git_url: https://github.com/kr/pretty.git -git_hash: 4e0886370c3a67530192c6a238cff68f56c141b0 +git_hash: ead452280cd055b2ae8a7f0db5eb37a878d902f7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From d164baa142d1c64730e9ac22ede2c1d8e17989a5 Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:31 +0000 Subject: [PATCH 13/27] Bump gosvcutils --- projects/gosvcutils/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/gosvcutils/config b/projects/gosvcutils/config index 34e09b2..50bf8ea 100644 --- a/projects/gosvcutils/config +++ b/projects/gosvcutils/config @@ -1,6 +1,6 @@ -version: 1.0.10 +version: 1.0.11 git_url: https://github.com/hlandau/svcutils.git -git_hash: c25dac49e50cbbcbef8c81b089f56156f4067729 +git_hash: 6e7e875ab1a2f881e8bc757c1b2c1a779bcd57ee filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 3d1a180b2c58a5fa6fdf65b90475d21516f119f7 Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:32 +0000 Subject: [PATCH 14/27] Bump gosystemd --- projects/gosystemd/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/gosystemd/config b/projects/gosystemd/config index 48d7d73..e1a0b6c 100644 --- a/projects/gosystemd/config +++ b/projects/gosystemd/config @@ -1,6 +1,6 @@ -version: 22.0.0 +version: 22.3.2 git_url: https://github.com/coreos/go-systemd.git -git_hash: 2d78030078ef61b3cae27f42ad6d0e46db51b339 +git_hash: 777e73a89cef78631ccaa97f53a9bae67e166186 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From e391e2f70e18704f686a076d2574f25943bc401b Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:35 +0000 Subject: [PATCH 15/27] Bump gotext --- projects/gotext/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/gotext/config b/projects/gotext/config index 5493329..2d5f5a2 100644 --- a/projects/gotext/config +++ b/projects/gotext/config @@ -1,6 +1,6 @@ -version: 0.1.0 +version: 0.2.0 git_url: https://github.com/kr/text.git -git_hash: e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f +git_hash: 702c74938df48b97370179f33ce2107bd7ff3b3e filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 7bef91a72e7c27d9770882ef88c61a04c02ddf4f Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:36 +0000 Subject: [PATCH 16/27] Bump gotlsrestrictnss --- projects/gotlsrestrictnss/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/gotlsrestrictnss/config b/projects/gotlsrestrictnss/config index 7747a24..246b32c 100644 --- a/projects/gotlsrestrictnss/config +++ b/projects/gotlsrestrictnss/config @@ -1,6 +1,6 @@ -version: '0.0.4' +version: '0.0.4.2' git_url: https://github.com/namecoin/tlsrestrictnss.git -git_hash: '47cee47a6fa9c12f19a360b0b67e20e721135ed6' +git_hash: '945a9f3d995fcb175fd0b19549e21a3e87ba8c13' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 4937870b94b393e27561e69dced723fda2b143fd Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:39 +0000 Subject: [PATCH 17/27] Bump gounits --- projects/gounits/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/gounits/config b/projects/gounits/config index 8cf7395..cb6a5b4 100644 --- a/projects/gounits/config +++ b/projects/gounits/config @@ -1,6 +1,6 @@ version: '[% c("abbrev") %]' git_url: https://github.com/alecthomas/units.git -git_hash: f65c72e2690dc4b403c8bd637baf4611cd4c069b +git_hash: ff826a37aa15cdf16e29024a782c790f19aab6c2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' From 35037bf54fe9b2c9510c975de2cc6311be1d96d0 Mon Sep 17 00:00:00 2001 From: NamecoinBot Date: Mon, 17 May 2021 23:58:43 +0000 Subject: [PATCH 18/27] Bump ncdns --- projects/ncdns/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/ncdns/config b/projects/ncdns/config index 39dd6ab..eba9c36 100644 --- a/projects/ncdns/config +++ b/projects/ncdns/config @@ -1,6 +1,6 @@ -version: '0.1' +version: '0.1.2' git_url: https://github.com/namecoin/ncdns.git -git_hash: '1fced9acbade9f4afd1908242b1020f762375241' +git_hash: '554079a95d4a483ec4d952268d58d1411d691268' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: From 3b22bf46868f29822bbbceec6e585a5ced3b8964 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 19 May 2021 04:35:19 +0000 Subject: [PATCH 19/27] Add gox509compressed project Required due to ncdns version bump. --- projects/gox509compressed/config | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 projects/gox509compressed/config diff --git a/projects/gox509compressed/config b/projects/gox509compressed/config new file mode 100644 index 0000000..91189ab --- /dev/null +++ b/projects/gox509compressed/config @@ -0,0 +1,21 @@ +version: '[% c("abbrev") %]' +git_url: https://github.com/namecoin/x509-compressed.git +git_hash: '11c148e3a82a374dc8cc7800729ae31d1de3514b' +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-compressed + go_lib_install: + - github.com/namecoin/x509-compressed/x509 + build_go_lib_pre: | + export CGO_ENABLED=0 + go generate github.com/namecoin/x509-compressed/x509 + +input_files: + - project: container-image + - name: go + project: go From 11c7a558959f9dfad2d70a7b8fc1173581a8ad00 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 19 May 2021 04:39:28 +0000 Subject: [PATCH 20/27] ncdns: Add gox509compressed dependency --- projects/ncdns/config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/ncdns/config b/projects/ncdns/config index eba9c36..e1985e8 100644 --- a/projects/ncdns/config +++ b/projects/ncdns/config @@ -36,6 +36,7 @@ var: optional_go_lib_deps: - gosplicesign - gotlsrestrictnss + - gox509compressed optional_go_lib_install: - github.com/namecoin/ncdns/certdehydrate - github.com/namecoin/ncdns/certinject @@ -113,6 +114,9 @@ input_files: project: gopretty - name: godegoutils project: godegoutils + - name: gox509compressed + project: gox509compressed + enable: '[% c("var/enable_namecoin_tlsa") %]' - name: goxnet project: goxnet - name: goxsys From 4a17661097bdd4ffc881fb51962d5d6fc7774b96 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 19 May 2021 04:44:48 +0000 Subject: [PATCH 21/27] encaya: Remove old commented code --- projects/encaya/build | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/projects/encaya/build b/projects/encaya/build index 2e7ecee..3e0a9fa 100644 --- a/projects/encaya/build +++ b/projects/encaya/build @@ -16,19 +16,6 @@ mv $GOPATH/src/github.com/namecoin/encaya-[% c('version') %] $GOPATH/src/github. # TODO: Remove static build ID after migrating to Go 1.13.3+ go install -ldflags '-s -buildid=' github.com/namecoin/encaya -#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 -%] From c5a5aa9c90251b67da524b8c677db38ed61e9795 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 19 May 2021 04:50:15 +0000 Subject: [PATCH 22/27] encaya: Add encayagen output --- projects/encaya/build | 10 +++++++--- projects/encaya/config | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/encaya/build b/projects/encaya/build index 3e0a9fa..f55b7db 100644 --- a/projects/encaya/build +++ b/projects/encaya/build @@ -13,8 +13,10 @@ 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/encaya-[% c('version') %] $GOPATH/src/github.com/namecoin/encaya -# TODO: Remove static build ID after migrating to Go 1.13.3+ -go install -ldflags '-s -buildid=' github.com/namecoin/encaya +[% FOREACH inst IN c("var/go_lib_install") %] + # TODO: Remove static build ID after migrating to Go 1.13.3+ + go install -ldflags '-s -buildid=' [% inst %] +[% END %] [% IF c("var/linux-x86_64") -%] GOPATHBIN="${GOPATH}/bin" @@ -24,7 +26,9 @@ go install -ldflags '-s -buildid=' github.com/namecoin/encaya ls $GOPATHBIN -cp -a $GOPATHBIN/encaya[% IF c("var/windows") %].exe[% END %] $distdir/ +for x in encaya encayagen; do + cp -a $GOPATHBIN/"$x"[% IF c("var/windows") %].exe[% END %] $distdir/ +done cd $distdir [% c('tar', { diff --git a/projects/encaya/config b/projects/encaya/config index cfef304..4a339db 100644 --- a/projects/encaya/config +++ b/projects/encaya/config @@ -12,6 +12,9 @@ var: - gosafetlsa - goeasyconfig - q + go_lib_install: + - github.com/namecoin/encaya + - github.com/namecoin/encaya/encayagen cgo: 0 build_go_lib_pre: | export CGO_ENABLED=[% c("var/cgo") %] From f655a1781a48dbcb76c2a2e20fc000c72fb399b6 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 19 May 2021 05:19:17 +0000 Subject: [PATCH 23/27] Add namecoin keyring --- keyring/namecoin.gpg | Bin 0 -> 668 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 keyring/namecoin.gpg diff --git a/keyring/namecoin.gpg b/keyring/namecoin.gpg new file mode 100644 index 0000000000000000000000000000000000000000..96a0f0cc64a46ab9593ab1e9bff2369207264efb GIT binary patch literal 668 zcmZQzU{GLWWMJ}kib!Jsf`lb=mxC~f4FOCwOpIVw9Rma7D+VS88FtMI&iaF@&oZLV zIs7dRIP|)KT@a{30i^2r+9Vs9_1|CampW)DHfQeTo~oW|ps)={4hR?-c!1<#AT|YY zfu^y5X*42X$vm)~GmKf{Whc0cacZ+MvM}Cq=VxSOcUaxG!EUR-)X3Obo&JZdS2vnC z-E1i6R7eac|M5mt$8*L8pcUx_=@3UVY%%ppElSO;R0vAUOHt5p&n!_0&P>nC%u84B zPOa2bu*m{T7Xf7*5;Kc(6Ek!4l9TPAhA=@K)-jDmSd4?gPE3&no99`XK(1txW@hDN zd}!Rj%FW5a&cr6l#mT|V#3IJT%*Z6i$Rystz{M#53$FlShW|m)YVG?q-Z|f2tdzCJ zWol-T(b>vrZ^}Lh_-%QAxM~qlMfu4G7mgHK)I47N-gvI(TgDAfcc(R+$=_;hljL`P zx(MqAHU?&(R~dF#fWt|M3mi_2eQGh`p|Ut?t0GP&)rMeO3>=kvSXF`G=0e7PZp zb^cQso5=VJ7sZ6Mof!Vg$bFt8X>M{bLcLu2Udf|*8CQiFrysht`_z|J7cKsuV21hN Z>I|2|4R1A%>8zdf(omQq#9&{3GXSXL*gpUO literal 0 HcmV?d00001 From 34f7041be9ebed821d5fb363003b1f302f4b2be3 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 19 May 2021 05:24:21 +0000 Subject: [PATCH 24/27] Add generate_nmc_cert project It's no longer a component of ncdns. --- projects/generate_nmc_cert/build | 37 +++++++++++++++++++++++++++++++ projects/generate_nmc_cert/config | 31 ++++++++++++++++++++++++++ projects/ncdns/build | 2 +- projects/ncdns/config | 1 - projects/plain-binaries/build | 1 + projects/plain-binaries/config | 2 ++ 6 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 projects/generate_nmc_cert/build create mode 100644 projects/generate_nmc_cert/config diff --git a/projects/generate_nmc_cert/build b/projects/generate_nmc_cert/build new file mode 100644 index 0000000..09a75a2 --- /dev/null +++ b/projects/generate_nmc_cert/build @@ -0,0 +1,37 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] +export CGO_ENABLED=0 +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/[% project %]-[% c('version') %] $GOPATH/src/github.com/namecoin/[% project %] + +[% FOREACH inst IN c("var/go_lib_install") %] + # TODO: Remove static build ID after migrating to Go 1.13.3+ + go install -ldflags '-s -buildid=' [% inst %] +[% END %] + +[% IF c("var/linux-x86_64") -%] + GOPATHBIN="${GOPATH}/bin" +[% ELSE -%] + GOPATHBIN="${GOPATH}/bin/${GOOS}_${GOARCH}" +[% END -%] + +ls $GOPATHBIN + +for x in [% project %]; do + cp -a $GOPATHBIN/"$x"[% IF c("var/windows") %].exe[% END %] $distdir/ +done + +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/generate_nmc_cert/config b/projects/generate_nmc_cert/config new file mode 100644 index 0000000..5f96e90 --- /dev/null +++ b/projects/generate_nmc_cert/config @@ -0,0 +1,31 @@ +version: '1.14' +git_url: https://github.com/namecoin/generate_nmc_cert.git +git_hash: 'v[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: namecoin.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + go_lib_deps: + - gox509compressed + - ncdns + go_lib_install: + - github.com/namecoin/generate_nmc_cert + cgo: 0 + build_go_lib_pre: | + export CGO_ENABLED=[% c("var/cgo") %] + +input_files: + - project: container-image + - name: go + project: go + - name: gox509compressed + project: gox509compressed + - 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 diff --git a/projects/ncdns/build b/projects/ncdns/build index 81a9709..f66fde3 100644 --- a/projects/ncdns/build +++ b/projects/ncdns/build @@ -88,7 +88,7 @@ cd /var/tmp/dist done [% IF c("var/enable_namecoin_tlsa") %] - for x in ncdumpzone generate_nmc_cert tlsrestrict_chromium_tool; do + for x in ncdumpzone tlsrestrict_chromium_tool; do cp -a $GOPATHBIN/"$x"[% IF c("var/windows") %].exe[% END %] $distdir/ done [% END %] diff --git a/projects/ncdns/config b/projects/ncdns/config index e1985e8..f586a23 100644 --- a/projects/ncdns/config +++ b/projects/ncdns/config @@ -40,7 +40,6 @@ var: optional_go_lib_install: - github.com/namecoin/ncdns/certdehydrate - github.com/namecoin/ncdns/certinject - - github.com/namecoin/ncdns/generate_nmc_cert - github.com/namecoin/ncdns/ncdumpzone - github.com/namecoin/ncdns/ncdumpzone/ncdumpzone - github.com/namecoin/ncdns/tlsoverridefirefox diff --git a/projects/plain-binaries/build b/projects/plain-binaries/build index e716a9d..c7c4461 100644 --- a/projects/plain-binaries/build +++ b/projects/plain-binaries/build @@ -8,6 +8,7 @@ mkdir -p $distdir tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/certinject') %] [% END %] tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/encaya') %] +tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/generate_nmc_cert') %] tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/ncdns') %] tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/ncp11') %] tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/ncprop279') %] diff --git a/projects/plain-binaries/config b/projects/plain-binaries/config index 3d0902b..4d62423 100644 --- a/projects/plain-binaries/config +++ b/projects/plain-binaries/config @@ -12,6 +12,8 @@ input_files: enable: '[% c("var/windows") %]' - name: encaya project: encaya + - name: generate_nmc_cert + project: generate_nmc_cert - name: ncdns project: ncdns - name: ncp11 From 78a47ee1accb5926d67e1ba268aab8d53d575312 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 19 May 2021 06:53:12 +0000 Subject: [PATCH 25/27] godexlogconfig: Add goxsyswinsvc dependency Required due to upstream version bump. --- projects/godexlogconfig/config | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/godexlogconfig/config b/projects/godexlogconfig/config index 57ae50b..2dd30a0 100644 --- a/projects/godexlogconfig/config +++ b/projects/godexlogconfig/config @@ -31,6 +31,7 @@ targets: - gobuildinfo - goeasyconfig - goxlog + - goxsyswinsvc input_files: - project: container-image @@ -42,12 +43,15 @@ input_files: - name: binutils project: binutils enable: '[% c("var/linux") %]' - - name: goxlog - project: goxlog + - name: gobuildinfo + project: gobuildinfo - name: goeasyconfig project: goeasyconfig - name: gosystemd project: gosystemd enable: '[% ! c("var/windows") %]' - - name: gobuildinfo - project: gobuildinfo + - name: goxlog + project: goxlog + - name: goxsyswinsvc + project: goxsyswinsvc + enable: '[% c("var/windows") %]' From 23b61230eaab53c371d638b0eecca15e257205de Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 19 May 2021 07:01:53 +0000 Subject: [PATCH 26/27] goisatty: Add goxsysunix dependency for osx Required due to upstream version bump. --- projects/goisatty/config | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/goisatty/config b/projects/goisatty/config index 25a3938..9e8f5af 100644 --- a/projects/goisatty/config +++ b/projects/goisatty/config @@ -15,6 +15,10 @@ targets: var: go_lib_deps: - goxsysunix + osx-x86_64: + var: + go_lib_deps: + - goxsysunix input_files: - project: container-image @@ -22,4 +26,4 @@ input_files: project: go - name: goxsysunix project: goxsysunix - enable: '[% c("var/linux") %]' + enable: '[% c("var/linux") || c("var/osx") %]' From 9bdeb8f029f8aaeb6f6da83473ee0fd36aa285b7 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 19 May 2021 07:16:04 +0000 Subject: [PATCH 27/27] gox509compressed: Add goxcrypto dependency --- projects/gox509compressed/config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/gox509compressed/config b/projects/gox509compressed/config index 91189ab..fa1ba25 100644 --- a/projects/gox509compressed/config +++ b/projects/gox509compressed/config @@ -9,6 +9,8 @@ var: container: use_container: 1 go_lib: github.com/namecoin/x509-compressed + go_lib_deps: + - goxcrypto go_lib_install: - github.com/namecoin/x509-compressed/x509 build_go_lib_pre: | @@ -19,3 +21,5 @@ input_files: - project: container-image - name: go project: go + - name: goxcrypto + project: goxcrypto