Merge namecoin/ncdns-repro#191: Bump dependencies

5df88e878c ncdns-nsis: Pull in example configs from StemNS (Jeremy Rand)
66dc909db8 stemns: Preserve sample config files (Jeremy Rand)
be94a980e0 ncdns-nsis: Use GPG to verify Electrum-NMC (Jeremy Rand)
9ae9a06d11 Bump script: remove BIND (Jeremy Rand)
257745658a ncdns-nsis: Remove BIND dependency (Jeremy Rand)
cbd2c0b609 Bump Electrum-NMC to 4.0.0b1 (NamecoinBot)
68e98f68fe Bump stemns to v0.3 (NamecoinBot)
f4447a637b Bump ncdns to v0.3.1 (NamecoinBot)

Pull request description:

Top commit has no ACKs.

projects/ncdns-nsis/build

@@ -24,10 +24,6 @@ mkdir -p /var/tmp/dist/plain-binaries
 tar -C /var/tmp/dist/plain-binaries -xf $rootdir/[% c('input_files_by_name/plain-binaries') %]
 cp /var/tmp/dist/plain-binaries/*.exe /var/tmp/dist/plain-binaries/*.dll  ${ARTIFACTS}
 
-mkdir /var/tmp/dist/bind
-unzip -d /var/tmp/dist/bind $rootdir/[% c('input_files_by_name/bind') %]
-cp /var/tmp/dist/bind/*.exe /var/tmp/dist/bind/*.dll ${ARTIFACTS}
-
 cp $rootdir/[% c('input_files_by_name/dnssec-trigger') %] ${ARTIFACTS}
 
 [% IF c("var/windows-x86_64") %]
@@ -44,7 +40,7 @@ tar -C /var/tmp/dist/ -xf $rootdir/[% c('input_files_by_name/stem') %]
 cp -a /var/tmp/dist/stem-*/stem "${NEUTRAL_ARTIFACTS}/stem"
 
 tar -C /var/tmp/dist/ -xf $rootdir/[% c('input_files_by_name/stemns') %]
-cp /var/tmp/dist/StemNS/stemns.py "${NEUTRAL_ARTIFACTS}/stemns/"
+cp -a /var/tmp/dist/StemNS/stemns.py /var/tmp/dist/StemNS/config "${NEUTRAL_ARTIFACTS}/stemns/"
 
 # Windows PE metadata requires that the version be a dot-delimited 4-tuple of
 # numbers (no leading v)

projects/ncdns-nsis/config

@@ -7,11 +7,10 @@ gpg_keyring: namecoin.gpg
 filename: 'ncdns-[% c("version") %]-[% c("arch") %]-install-[% c("var/build_id") %].exe'
 
 var:
-  bind_version: '9.16.28'
   consensusj_namecoin_version: '0.3.2.1'
   dnssec_trigger_version: '0.17'
   namecoin_core_version: '0.21.0.1'
-  electrum_nmc_version: '4.0.0b0'
+  electrum_nmc_version: '4.0.0b1'
   stem_version: '1.8.0'
   container:
     use_container: 1
@@ -24,20 +23,14 @@ targets:
   windows-x86_64:
     var:
       arch_nsis_args: '-DNCDNS_64BIT=1'
-      bind_arch: 'x64'
   windows-i686:
     var:
       arch_nsis_args: '-DNO_NAMECOIN_CORE'
-      bind_arch: 'x86'
 
 input_files:
   - project: container-image
   - project: plain-binaries
     name: plain-binaries
-  - name: bind
-    URL: 'https://ftp.isc.org/isc/bind/[% c("var/bind_version") %]/BIND[% c("var/bind_version") %].[% c("var/bind_arch") %].zip'
-    file_gpg_id: 1
-    gpg_keyring: isc.gpg
   - name: dnssec-trigger
     URL: 'https://www.nlnetlabs.nl/downloads/dnssec-trigger/dnssec_trigger_setup_[% c("var/dnssec_trigger_version") %].exe'
     file_gpg_id: 1
@@ -48,9 +41,8 @@ input_files:
     enable: '[% c("var/windows-x86_64") %]'
   - name: electrum-nmc
     URL: 'https://www.namecoin.org/files/electrum-nmc/electrum-nmc-[% c("var/electrum_nmc_version") %]/electrum-nmc-nc[% c("var/electrum_nmc_version") %]-setup.exe'
-    # TODO: RBM doesn't support clearsigned SHA256SUMS files.  We should
-    # convert this to Signify or something later.
-    sha256sum: eeb8eb5759382e488bb3c63e94f5455ada1bc7b8ddcba143cdadeb9290d9d859
+    file_gpg_id: 1
+    gpg_keyring: namecoin.gpg
   - name: consensusj-namecoin
     URL: 'https://www.namecoin.org/files/ConsensusJ-Namecoin/[% c("var/consensusj_namecoin_version") %]/namecoinj-daemon-0.3.2-SNAPSHOT.jar'
     sha256sum: 6b35d5a31eb74b4870c8a6c37dd53563aa63b64810fdedb5192f2a77396e190f

projects/ncdns/config

@@ -1,4 +1,4 @@
-version: '0.3'
+version: '0.3.1'
 git_url: https://github.com/namecoin/ncdns.git
 git_hash: 'v[% c("version") %]'
 tag_gpg_id: 1

projects/stemns/build

@@ -6,7 +6,6 @@ mkdir /var/tmp/dist
 
 # Extract StemNS
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
-rm /var/tmp/build/[% project %]-[% c('version') %]/settings_*.py
 
 cp -a /var/tmp/build/[% project %]-[% c('version') %] ${distdir}
 

projects/stemns/config

@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: '0.2.0'
+version: '0.3'
 git_url: https://github.com/namecoin/StemNS.git
 git_hash: 'v[% c("version") %]'
 tag_gpg_id: 1

tools/namecoin-bump-versions.sh

@@ -120,23 +120,6 @@ done
 
 # ncdns-nsis dependencies
 
-BIND_VERSION=$(./rbm/rbm showconf ncdns-nsis var/bind_version)
-# As per https://www.isc.org/download/#BIND , "9.16.x is the last branch of
-# BIND with native Windows support."
-LATEST_BIND_VERSION=$(curl https://ftp.isc.org/isc/bind/ | grep --only-matching '"[0-9]*\.[0-9]*\.[0-9]*/"' | grep '9\.16' | tail --lines=1 | grep --only-matching '[0-9]*\.[0-9]*\.[0-9]*')
-
-if [ "${BIND_VERSION}" != "${LATEST_BIND_VERSION}" ]
-then
-    UPDATE_NEEDED=1
-    echo "BIND: ncdns-nsis uses ${BIND_VERSION}, latest tag is ${LATEST_BIND_VERSION}"
-
-    sed --in-place "s/${BIND_VERSION}/${LATEST_BIND_VERSION}/g" "./projects/ncdns-nsis/config"
-    git add "./projects/ncdns-nsis/config"
-    git commit --message="Bump BIND to ${LATEST_BIND_VERSION}"
-else
-    echo "BIND: up to date"
-fi
-
 CONSENSUSJ_VERSION=$(./rbm/rbm showconf ncdns-nsis var/consensusj_namecoin_version)
 LATEST_CONSENSUSJ_VERSION=$(curl https://www.namecoin.org/download/betas/ | grep --only-matching 'consensusj-namecoin-[0-9\.]*' | tail --lines=1 | grep --only-matching '[0-9\.]*')