Automated signing fixes

devops/rpmbuild/Makefile

@@ -19,10 +19,13 @@ endif
 endif
 gpg_check := $(shell gpg -K | grep '/$(gpg_key) ' | sed 's,^.*/\($(gpg_key)\) .*$$,\1,')
 ifneq ($(gpg_check),$(gpg_key))
-$(error GPG key not found. Add key ID $(gpg_key) to gpg-agent)
+$(error GPG key $(gpg_key) not found.)
 else
 $(info GPG key $(gpg_key) found)
 endif
+ifndef GPG_PASSPHRASE
+$(error GPG_PASSPHRASE not set)
+endif
 endif
 
 ###
@@ -70,15 +73,18 @@ prepare-spec-%: $(GOPATH)/bin/%
 
 package-tendermint: prepare-spec-tendermint
 	$(info Packaging tendermint version $(tendermint_version))
-	rpmbuild -bb SPECS/tendermint.spec --sign
+	rpmbuild -bb SPECS/tendermint.spec
+	./sign RPMS/x86_64/tendermint-$(tendermint_version)-$$BUILD_NUMBER.x86_64.rpm
 
 package-basecoin: prepare-spec-basecoin
 	$(info Packaging basecoin version $(basecoin_version))
-	rpmbuild -bb SPECS/basecoin.spec --sign
+	rpmbuild -bb SPECS/basecoin.spec
+	./sign RPMS/x86_64/basecoin-$(basecoin_version)-$$BUILD_NUMBER.x86_64.rpm
 
 package-ethermint: prepare-spec-ethermint ;
 	$(info Packaging ethermint version $(ethermint_version))
-	rpmbuild -bb SPECS/ethermint.spec --sign
+	rpmbuild -bb SPECS/ethermint.spec
+	./sign RPMS/x86_64/ethermint-$(ethermint_version)-$$BUILD_NUMBER.x86_64.rpm
 
 install-%:
 #Make sure your host has the IAM role to read/write the S3 bucket OR that you set up ~/.boto
@@ -90,7 +96,8 @@ install-%:
 	cp ./tendermint-dev.repo tmp/s3/7/cr/x86_64/
 	createrepo tmp/s3/7/cr/x86_64/Packages -u http://tendermint-packages.s3-website-us-west-1.amazonaws.com/centos/7/cr/x86_64/Packages -o tmp/s3/7/cr/x86_64 --update -S --repo Tendermint --content tendermint --content basecoin --content ethermint
 	#Asks about overwrite
-	gpg --clearsign tmp/s3/7/cr/x86_64/repodata/repomd.xml
+#TODO: make this more secure
+	gpg --batch --passphrase "$(GPG_PASSPHRASE)" --clearsign tmp/s3/7/cr/x86_64/repodata/repomd.xml
 	aws s3 sync tmp/s3/ s3://tendermint-packages/centos/ --acl public-read
 
 mostlyclean:

devops/rpmbuild/sign

@@ -0,0 +1,23 @@
+#!/usr/bin/expect -f
+set timeout 3
+set PACKAGE [lindex $argv 0]
+set GPG_PASSPHRASE $env(GPG_PASSPHRASE)
+
+if {[llength $argv] == 0} {
+  send_user "Usage: ./sign <rpm_package>\n"
+  exit 1
+}
+
+send_user "\nSigning $PACKAGE\n"
+spawn rpmsign --resign $PACKAGE
+expect {
+  timeout { send_user "\nTimeout signing $PACKAGE\n"; exit 1 }
+  "Enter pass phrase:"
+}
+send "$GPG_PASSPHRASE\r"
+expect {
+  timeout { send_user "\nTimeout signing $PACKAGE\n"; exit 1 }
+  "Pass phrase is good."
+}
+interact
+

devops/rpmbuild/spectemplates/basecoin.spec

@@ -32,13 +32,13 @@ cd %{name}-%{version}
 
 %{__cp} $GOPATH/bin/%{name} $GOPATH/bin/basecli .%{_bindir}
 %{__cp} $GOPATH/src/github.com/tendermint/%{name}/LICENSE .%{_defaultlicensedir}/%{name}
-%{__cp} extrafiles/%{name}/genesis.json .%{_sysconfdir}/%{name}/genesis.json
-%{__cp} extrafiles/%{name}/tendermint-config.toml .%{_sysconfdir}/%{name}/tendermint/config.toml
-%{__cp} extrafiles/%{name}/%{name}.service .%{_sysconfdir}/systemd/system/%{name}.service
-%{__cp} extrafiles/%{name}/%{name}-server.service .%{_sysconfdir}/systemd/system/%{name}-server.service
-%{__cp} extrafiles/%{name}/50-%{name}.preset .%{_sysconfdir}/systemd/system-preset/50-%{name}.preset
-%{__cp} extrafiles/%{name}/key.json .%{_datadir}/%{name}/key.json
-%{__cp} extrafiles/%{name}/key2.json .%{_datadir}/%{name}/key2.json
+%{__cp} %{_topdir}/extrafiles/%{name}/genesis.json .%{_sysconfdir}/%{name}/genesis.json
+%{__cp} %{_topdir}/extrafiles/%{name}/tendermint-config.toml .%{_sysconfdir}/%{name}/tendermint/config.toml
+%{__cp} %{_topdir}/extrafiles/%{name}/%{name}.service .%{_sysconfdir}/systemd/system/%{name}.service
+%{__cp} %{_topdir}/extrafiles/%{name}/%{name}-server.service .%{_sysconfdir}/systemd/system/%{name}-server.service
+%{__cp} %{_topdir}/extrafiles/%{name}/50-%{name}.preset .%{_sysconfdir}/systemd/system-preset/50-%{name}.preset
+%{__cp} %{_topdir}/extrafiles/%{name}/key.json .%{_datadir}/%{name}/key.json
+%{__cp} %{_topdir}/extrafiles/%{name}/key2.json .%{_datadir}/%{name}/key2.json
 
 %{__chmod} -Rf a+rX,u+w,g-w,o-w .
 

devops/rpmbuild/spectemplates/ethermint.spec

@@ -26,16 +26,16 @@ test -d "$GOPATH"
 %{__mkdir_p} %{name}-%{version}
 cd %{name}-%{version}
 
-%{__mkdir_p} .%{_bindir} .%{_defaultlicensedir}/%{name} .%{_sysconfdir}/%{name}/tendermint .%{_datadir}/%{name} .%{_sysconfdir}/systemd/system .%{_sysconfdir}/systemd/system-preset
+%{__mkdir_p} .%{_bindir} .%{_defaultlicensedir}/%{name} .%{_sysconfdir}/%{name}/tendermint .%{_sysconfdir}/systemd/system .%{_sysconfdir}/systemd/system-preset
 
 %{__cp} $GOPATH/bin/%{name} .%{_bindir}
 %{__cp} $GOPATH/src/github.com/tendermint/%{name}/LICENSE .%{_defaultlicensedir}/%{name}
 %{__cp} $GOPATH/src/github.com/tendermint/%{name}/dev/genesis.json .%{_sysconfdir}/%{name}/genesis.json
 %{__cp} -r $GOPATH/src/github.com/tendermint/%{name}/dev/keystore .%{_sysconfdir}/%{name}
-%{__cp} extrafiles/%{name}/tendermint-config.toml .%{_sysconfdir}/%{name}/tendermint/config.toml
-%{__cp} extrafiles/%{name}/%{name}.service .%{_sysconfdir}/systemd/system/%{name}.service
-%{__cp} extrafiles/%{name}/%{name}-server.service .%{_sysconfdir}/systemd/system/%{name}-server.service
-%{__cp} extrafiles/%{name}/50-%{name}.preset .%{_sysconfdir}/systemd/system-preset/50-%{name}.preset
+%{__cp} %{_topdir}/extrafiles/%{name}/tendermint-config.toml .%{_sysconfdir}/%{name}/tendermint/config.toml
+%{__cp} %{_topdir}/extrafiles/%{name}/%{name}.service .%{_sysconfdir}/systemd/system/%{name}.service
+%{__cp} %{_topdir}/extrafiles/%{name}/%{name}-server.service .%{_sysconfdir}/systemd/system/%{name}-server.service
+%{__cp} %{_topdir}/extrafiles/%{name}/50-%{name}.preset .%{_sysconfdir}/systemd/system-preset/50-%{name}.preset
 
 %{__chmod} -Rf a+rX,u+w,g-w,o-w .
 
@@ -87,8 +87,6 @@ systemctl daemon-reload
 %{_bindir}/*
 %{_sysconfdir}/systemd/system/*
 %{_sysconfdir}/systemd/system-preset/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
 %dir %{_defaultlicensedir}/%{name}
 %doc %{_defaultlicensedir}/%{name}/LICENSE