Merge remote-tracking branch 'benma/update'

benma · benma · commit 8e6037b33281 · 2018-11-25T16:59:24.000+01:00
diff --git a/backend/devices/bitbox/assets.go b/backend/devices/bitbox/assets.go
diff --git a/backend/devices/bitbox/assets/firmware.deterministic.4.0.0.signed.bin b/backend/devices/bitbox/assets/firmware.deterministic.4.0.0.signed.bin
diff --git a/backend/devices/bitbox/assets/firmware.deterministic.4.0.1.signed.bin b/backend/devices/bitbox/assets/firmware.deterministic.4.0.1.signed.bin
diff --git a/backend/devices/bitbox/device.go b/backend/devices/bitbox/device.go
@@ -46,7 +46,7 @@ import (
 )
 
 var (
-	lowestSupportedFirmwareVersion    = semver.NewSemVer(4, 0, 0)
+	lowestSupportedFirmwareVersion    = semver.NewSemVer(4, 0, 1)
 	lowestNonSupportedFirmwareVersion = semver.NewSemVer(5, 0, 0)
 
 	pinPolicyProd              = NewPasswordPolicy("^[[:print:]]{4,}$")
diff --git a/backend/devices/bitbox/device_test.go b/backend/devices/bitbox/device_test.go
@@ -37,7 +37,7 @@ import (
 )
 
 var (
-	firmVer400 = semver.NewSemVer(4, 0, 0)
+	firmVer400 = semver.NewSemVer(4, 0, 1)
 )
 
 const (
diff --git a/backend/devices/bitbox/firmware.go b/backend/devices/bitbox/firmware.go
@@ -22,7 +22,7 @@ import (
 
 //go:generate go-bindata -pkg $GOPACKAGE -o assets.go assets
 
-var bundledFirmwareVersion = semver.NewSemVer(4, 0, 0)
+var bundledFirmwareVersion = semver.NewSemVer(4, 0, 1)
 
 // BundledFirmwareVersion returns the version of the bundled firmware.
 func BundledFirmwareVersion() *semver.SemVer {
diff --git a/backend/update.go b/backend/update.go
@@ -27,7 +27,7 @@ const updateFileURL = "https://shiftcrypto.ch/updates/desktop.json"
 
 var (
 	// Version of the backend as displayed to the user.
-	Version = semver.NewSemVer(4, 1, 0)
+	Version = semver.NewSemVer(4, 2, 0)
 )
 
 // UpdateFile is retrieved from the server.
diff --git a/frontends/qt/Makefile b/frontends/qt/Makefile
@@ -19,8 +19,8 @@ linux:
 	cp -aR resources/linux build/tmp-deb
 	mkdir build/tmp-deb/opt/
 	cp -aR build/linux-tmp build/tmp-deb/opt/bitbox
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.1.0 -C ../tmp-deb/
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.1.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.2.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.2.0 -C ../tmp-deb/
 	# create AppImage
 	sed 's+/usr/share/pixmaps/bitbox.svg+default+' resources/linux/usr/share/applications/bitbox.desktop > build/linux-tmp/bitbox.desktop
 	cd build/linux-tmp && /opt/linuxdeployqt-5-x86_64.AppImage BitBox -appimage
diff --git a/frontends/qt/server/Makefile.macosx b/frontends/qt/server/Makefile.macosx
@@ -9,7 +9,7 @@ darwin:
 	CGO_CFLAGS="-g ${GODARWINSECFLAGS} ${CFLAGS}" \
 	CGO_LDFLAGS="${GODARWINLDFLAGS} ${LFLAGS}" \
 	GOARCH=${GOARCH} CGO_ENABLED=${CGO} GOOS=${GOOS} \
-	go build -x \
+	go build -ldflags='-s' -x \
 	-buildmode="c-shared" -o ${LIBNAME}.so
 
 clean:

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ import (`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`var (`
`49`		`- lowestSupportedFirmwareVersion = semver.NewSemVer(4, 0, 0)`
	`49`	`+ lowestSupportedFirmwareVersion = semver.NewSemVer(4, 0, 1)`
`50`	`50`	`lowestNonSupportedFirmwareVersion = semver.NewSemVer(5, 0, 0)`
`51`	`51`
`52`	`52`	`pinPolicyProd = NewPasswordPolicy("^[[:print:]]{4,}$")`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ import (`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`var (`
`40`		`- firmVer400 = semver.NewSemVer(4, 0, 0)`
	`40`	`+ firmVer400 = semver.NewSemVer(4, 0, 1)`
`41`	`41`	`)`
`42`	`42`
`43`	`43`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ const updateFileURL = "https://shiftcrypto.ch/updates/desktop.json"`
`27`	`27`
`28`	`28`	`var (`
`29`	`29`	`// Version of the backend as displayed to the user.`
`30`		`- Version = semver.NewSemVer(4, 1, 0)`
	`30`	`+ Version = semver.NewSemVer(4, 2, 0)`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`// UpdateFile is retrieved from the server.`