Merge #122: Bump to encaya 0.1, etc

9bdeb8f gox509compressed: Add goxcrypto dependency (Jeremy Rand)
23b6123 goisatty: Add goxsysunix dependency for osx (Jeremy Rand)
78a47ee godexlogconfig: Add goxsyswinsvc dependency (Jeremy Rand)
34f7041 Add generate_nmc_cert project (Jeremy Rand)
f655a17 Add namecoin keyring (Jeremy Rand)
c5a5aa9 encaya: Add encayagen output (Jeremy Rand)
4a17661 encaya: Remove old commented code (Jeremy Rand)
11c7a55 ncdns: Add gox509compressed dependency (Jeremy Rand)
3b22bf4 Add gox509compressed project (Jeremy Rand)
35037bf Bump ncdns (NamecoinBot)
4937870 Bump gounits (NamecoinBot)
7bef91a Bump gotlsrestrictnss (NamecoinBot)
e391e2f Bump gotext (NamecoinBot)
3d1a180 Bump gosystemd (NamecoinBot)
d164baa Bump gosvcutils (NamecoinBot)
f75593c Bump gopretty (NamecoinBot)
7587fec Bump gopflag (NamecoinBot)
44d81ab Bump gomadns (NamecoinBot)
7346cbb Bump goisatty (NamecoinBot)
3c2b505 Bump gogroupcache (NamecoinBot)
045ab8d Bump godns (NamecoinBot)
e023d1c Bump godexlogconfig (NamecoinBot)
2eb2283 Bump goconfigurable (NamecoinBot)
0cb3375 Bump gobtcutil (NamecoinBot)
6e8e097 Bump gobtcd (NamecoinBot)
cc34ff4 Bump goansicolor (NamecoinBot)
ab7a903 Bump encaya (NamecoinBot)

Pull request description:
This commit is contained in:
Jeremy Rand 2021-05-19 08:55:19 +00:00
commit 6ffa994d6e
No known key found for this signature in database
GPG Key ID: FD7550C2EB800711
26 changed files with 154 additions and 53 deletions

BIN
keyring/namecoin.gpg Normal file

Binary file not shown.

View File

@ -13,21 +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
#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
[% 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"
@ -37,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', {

View File

@ -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:
@ -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") %]

View File

@ -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'),
}) %]

View File

@ -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

View File

@ -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") %]'

View File

@ -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") %]'

View File

@ -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") %]'

View File

@ -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") %]'

View File

@ -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") %]'
@ -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") %]'

View File

@ -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") %]'

View File

@ -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") %]'

View File

@ -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") %]'
@ -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") %]'

View File

@ -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") %]'

View File

@ -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") %]'

View File

@ -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") %]'

View File

@ -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") %]'

View File

@ -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") %]'

View File

@ -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") %]'

View File

@ -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") %]'

View File

@ -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") %]'

View File

@ -0,0 +1,25 @@
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_deps:
- goxcrypto
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
- name: goxcrypto
project: goxcrypto

View File

@ -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 %]

View File

@ -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:
@ -36,10 +36,10 @@ var:
optional_go_lib_deps:
- gosplicesign
- gotlsrestrictnss
- gox509compressed
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
@ -113,6 +113,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

View File

@ -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') %]

View File

@ -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