Merge #68: Bump ncdns to v0.1

058545a Fix 1-tuple, 2-tuple, and 4-tuple ncdns tags (Jeremy Rand)
138df1d Bump ncdns to v0.1 (Jeremy Rand)

Pull request description:

Top commit has no ACKs.

Tree-SHA512: 74505ccbf07a4d64ba1a1cf52f29f32fed40c1fd39cfb7b046bedd3387507d9ec859f01429ffc2e340ff3b275ab6312be8e5f586daa07f7947bdf1291fe63d89

.cirrus.yml

@@ -48,7 +48,7 @@ task:
     - cd ../../
   build_script:
     # TODO: check for NSIS warnings
-    - make NCDNS_64BIT=1 NCDNS_PRODVER=v0.0.10.3
+    - make NCDNS_64BIT=1 NCDNS_PRODVER=v0.1
     - mv build64/bin/ncdns-*-win64-install.exe ./ncdns--win64-install.exe
   upload_script:
     - curl -s -X POST --data-binary @ncdns--win64-install.exe http://$CIRRUS_HTTP_CACHE_HOST/cross_compile_bin_$DISTRO

Makefile

@@ -12,7 +12,24 @@ ifeq ($(NCDNS_PRODVER),)
 	NCDNS_PRODVER=0.0.0
 endif
 
-NCDNS_PRODVER_W=$(shell echo "$(NCDNS_PRODVER)" | sed 's/^v//' | sed 's/$$/.0/')
+# Remove leading v
+NCDNS_PRODVER_1TUP=$(shell echo "$(NCDNS_PRODVER)" | sed 's/^v//')
+# Append ".0" until the version is a 4-tuple
+ifneq ($(shell echo "$(NCDNS_PRODVER_1TUP)" | grep -E '^[0-9]+$$'),)
+	NCDNS_PRODVER_2TUP=$(shell echo "$(NCDNS_PRODVER_1TUP)" | sed 's/$$/.0/')
+else
+	NCDNS_PRODVER_2TUP=$(NCDNS_PRODVER_1TUP)
+endif
+ifneq ($(shell echo "$(NCDNS_PRODVER_2TUP)" | grep -E '^[0-9]+\.[0-9]+$$'),)
+	NCDNS_PRODVER_3TUP=$(shell echo "$(NCDNS_PRODVER_2TUP)" | sed 's/$$/.0/')
+else
+	NCDNS_PRODVER_3TUP=$(NCDNS_PRODVER_2TUP)
+endif
+ifneq ($(shell echo "$(NCDNS_PRODVER_3TUP)" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$$'),)
+	NCDNS_PRODVER_W=$(shell echo "$(NCDNS_PRODVER_3TUP)" | sed 's/$$/.0/')
+else
+	NCDNS_PRODVER_W=$(NCDNS_PRODVER_3TUP)
+endif
 
 _NO_NAMECOIN_CORE=
 ifeq ($(NO_NAMECOIN_CORE),1)
@@ -59,7 +76,7 @@ NCDNS_ARCFN=ncdns-$(NCDNS_PRODVER)-windows_$(GOARCH).tar.gz
 
 $(ARTIFACTS)/$(NCDNS_ARCFN):
 	mkdir -p "$(ARTIFACTS)"
-	wget -O "$@" "https://github.com/namecoin/ncdns/releases/download/$(NCDNS_PRODVER)/$(NCDNS_ARCFN)"
+	wget -O "$@" "https://api.cirrus-ci.com/v1/artifact/github/namecoin/ncdns/Cross-Compile Go latest/binaries/dist/$(NCDNS_ARCFN)?branch=$(NCDNS_PRODVER)"
 
 EXES=ncdns ncdumpzone generate_nmc_cert ncdt tlsrestrict_chromium_tool
 EXES_A=$(foreach k,$(EXES),$(ARTIFACTS)/$(k).exe)