diff --git a/.secret-files.tar.enc b/.secret-files.tar.enc index e48ab156..1248256d 100644 Binary files a/.secret-files.tar.enc and b/.secret-files.tar.enc differ diff --git a/.travis.yml b/.travis.yml index 8e2c5c79..219a73c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ script: # Test built docker image. - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" # Build everything - - SIGNING_KEY=616A79D1ADA2F0FD6F5E2A9166AB29F0EC5718FF rvm 2.0.0 do make release + - rvm 2.0.0 do make release after_success: # Display Release Folder - ls -l release/ diff --git a/Makefile b/Makefile index 79cf7a28..be41b761 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ rpm: $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm: package_build_linux check_fpm @echo "Building 'rpm' package for $(BINARY) version '$(RPMVERSION)-$(ITERATION)'." fpm -s dir -t rpm $(PACKAGE_ARGS) -a x86_64 -v $(RPMVERSION) -C $< - [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; expect -exact \"Enter pass phrase: \"; send \"\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; expect -exact \"Enter pass phrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" deb: $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb: package_build_linux check_fpm @@ -144,7 +144,7 @@ rpm386: $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm: package_build_linux_386 check_fpm @echo "Building 32-bit 'rpm' package for $(BINARY) version '$(RPMVERSION)-$(ITERATION)'." fpm -s dir -t rpm $(PACKAGE_ARGS) -a i386 -v $(RPMVERSION) -C $< - [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm; expect -exact \"Enter pass phrase: \"; send \"\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm; expect -exact \"Enter pass phrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" deb386: $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb: package_build_linux_386 check_fpm @@ -156,7 +156,7 @@ rpmarm: $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm: package_build_linux_arm64 check_fpm @echo "Building 64-bit ARM8 'rpm' package for $(BINARY) version '$(RPMVERSION)-$(ITERATION)'." fpm -s dir -t rpm $(PACKAGE_ARGS) -a arm64 -v $(RPMVERSION) -C $< - [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm; expect -exact \"Enter pass phrase: \"; send \"\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm; expect -exact \"Enter pass phrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" debarm: $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb: package_build_linux_arm64 check_fpm @@ -168,7 +168,7 @@ rpmarmhf: $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm: package_build_linux_armhf check_fpm @echo "Building 32-bit ARM6/7 HF 'rpm' package for $(BINARY) version '$(RPMVERSION)-$(ITERATION)'." fpm -s dir -t rpm $(PACKAGE_ARGS) -a armhf -v $(RPMVERSION) -C $< - [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm; expect -exact \"Enter pass phrase: \"; send \"\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm; expect -exact \"Enter pass phrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" debarmhf: $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb: package_build_linux_armhf check_fpm diff --git a/gpg.public.key b/gpg.public.key index 488a17a6..3fce86e6 100644 --- a/gpg.public.key +++ b/gpg.public.key @@ -47,6 +47,52 @@ hXPWldrC41PKF5KMJrjcuaRJyOM7ahTVlia9VLTsIpibsnizaBIVCSVUadV5K4Ta Xt3GDQ+1sXkaBZhPjBHrzilSJSwh/174n+2a/UH1TzZT2ho86XAViU72OsZ68Hxg 3dL3JgQhnQVgTCIxUAmNeNcwZ6zXV+4d9hEZFdtm4xUM1Ctbo6+mSN5QNaOtlIGp aWWwIZ6rgvHh+gTSXU8bGiTip88de6liRlUqv7kshiCnux4OHtEWGy/G4DrRESXK -Lb2/9Fdos1Y= -=urYT +Lb2/9Fdos1aZAg0EXejMmwEQAMo7PzsfT+cGCiJj8JcLY8ooUK/HFQSa65v5eOzY +iO8yYWMBcb93gk/xlR+4gvaydhltpDwjCxsegSUYTBNd5l5jAkpmmY65rW933EBJ +/U0XMac2UKSR2CLkJKI1A2mEdFRgVUlYP5f4aMx+/ZoSm3QVdLHZr3lhLZGqrh9I +R+NPrE6BVdAlSW6wBnhvbaiv2AshjMVzRUK1JC2GmB2UwgCK03u3ar7ru/dMXK3R +Tcs7WM2dYZIUEzzeCoIVPlkhOAfyOZWr2afSh2/9HY5NPlAQcGKQ/5ZaNsoeqsWK +wU5BjNryqugafzpJQCoZTQRC8w2TrZg+cwP4BYS4NpnHnewlpKDO4QYbSVlhitJ3 +PQOT4cges90ixWfqz8EQdEW5lMuDSH3RpIkHhMIr8cq7HqEpw8pjJJlxEM7E8mNC +pQ7fuI9TZqRsOQ6K5StbQdy5Xn9LDqfmTysMq5veXXCSDZZ+yCvw8eXTLka18DyQ +UGmYBCcFfACat9PPoIt/ZbNgd/PFW+o4LLxWjvIH0ukUurbtnx55jbCxF1CZSpEY +srtC9kR6lAVBbclR+x5Jbx2qkw845/TM3s/VQT9+nfADsEO9N274ikwpXZJm/CS+ +G0KaiIjZ1ahC+aBopvFYvU2AupzvElae3G9PAq/gItu7kOocCfo0w6Y7SUe7DTxA +1iXfABEBAAG0GEdvIExpZnQgPGNvZGVAZ29saWZ0LmlvPokCTgQTAQgAOBYhBLk9 +1m75jlTi6uAlugFmrTSrxaV8BQJd6MybAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4B +AheAAAoJEAFmrTSrxaV838IP/1FvdbNArloUGYhhXF87GwF7Iwp/XNNFOfAzVjtG +qxPSbg2eVxOMCIT3cfr6mJtblP26OwvfAIYZ/r2xejfiW/XXYMnmEOBHVNpg7kBB +alQoaqrlc1C35Hw7nReujfgJOqvGt8KPlgP7OtloO+voXr0klLNS07UwLHmPVSOf +lgXshqaZKeidu58cqm/iMZ4pIK260+k4+t1H0ld1UbtSjdciIOfXPZG/ky0LS7CI +8JsBaG7hdsGy7znxMFyKfmOBYliOJpvshfsw1xlSArpoJH/WpQb+uFeqMLPdWbtc +n6Fvlp8ABJEAmry+qxyYaDPQrgK310jU4bQGEazyYFRxEFWosoC1zTrVKQzyh6K9 +70mkJxVLKKPpf5hUERKgVbEQ7cAI1D+ZYYEg45NPbsNpuhvkg64EtIsll1UHm1P0 +/L3UkR3TxeL87Xb7OkFyrpdRL9xQ6J98NWZ8HIDcXxiamBJy+B0vEdzf191rPhi1 +HsVuBIwkO7EFd1P4ZpIVdtjNBXSNTGR56wmv39kk8xWb5DeYP3WZNnrIn+YluuwG +FNPLH6DJ3s5G6yoBhKJNONF0bpnM+K3wEahfuzxMir90jFvnGeReBVpow5EeOukL +YuX13iiWwqzPJpdxJhn4eiE8jck1T8yvptGccMA6Tvzj2tqc6hZf54cb4nIRPiSj +rCU5uQINBF3ozJsBEADVAnWifMaVeHUceAxrfDLtbEruMnhqc+dP423a3gu9MVSr +josvaGDOa8rMnm0UOsxQELLJuTWz/6EmjD5tEFgjBAOQq64FerUstKTaCF4wM1pA +nGvnkQZ4xUt2te4dCDqYWbZvomCQTO7ayucij2pokyyPeLk7dl8+AZVR1rfev/ro +jNvc/2Q3rE3Ba8u2351w9hXFtfxfx3fen0pHDzJhifR0SaPmuleubTSiJIS5iP1j +9o8ofBuGuSPXJF0r1JrBAFpNvy6ZpxykAri26G7PHks4rOU7oPRnJ1sICRFsqyGU +7tthUCRKRIiV0MgxBjSYbg/gDSz+oGNO0WV56DWugmRYOpyGG6roP4zXHhkzdbiT +WTJA9fpv1zru/qf7ZY9a2o4hqG9EtvvNeSicfpM6/c6inOiPXqW5Jq5fBdCF9wn/ +wH6um4R2x0mYKyv1TJQc0Lr8O35KvzZOSqDvhWQKS/TTNdvzkRhO5fHsAl6IKs2M +QbgPxRBQYLu/JjAA8UCC+E0z/MDzKK1+WPjlukZyCtegnbQ2YtAuAkoli5U4OYnO +fbKVxdCWE18/UPAN/NQh4hfTgmD+pucOx4auan+NerSipDwu6Mf6/wplsEyaKeWY +sgomY7ZNaIxZ8qI0UIPmRBaWq3FnGXG6KxFOqn0KtXEZ5rLFDW7Nf02ExCMD4QAR +AQABiQI2BBgBCAAgFiEEuT3WbvmOVOLq4CW6AWatNKvFpXwFAl3ozJsCGwwACgkQ +AWatNKvFpXxOzA//fikFCbK/IznPGXuVGkd2m1T5mn0eySN4UZOAlmKFGlG78LN0 +VNKrYxeloFZEuWRUSI6Hy3FflucDcMAV9PIonboJztY4g9e4aKhfutXm2pYchDcU +7RB4anA42WJUZj1wZYxF97kp8jFxQljlyQjhz2V4CceNy4zR//RbjFaDimh8rjMP +qO+d5QHwgDUo8ci7M7QQoIVqh50qRblLfBpVzxJp5hOT1HQOXa01sr1Dukg8G3Rs +ft3CdO3ucKu0mBLt2kqNGjrGlJ83WPY/QTtt/mhP3jAozxlMxJaom3I2Bh8OUCzl +FQySsCKN1dtOQAMfBa4XmOS7Q/S0+QZxs66zRS0ZH2fFvSBM/M5ZDOS/I9zNjsk1 +NPkk/Ux3dVZhg83bEj+TNrF5wxePcB9uXLTzYfu5odTclIUN5v30Ac4LmmgRmq9X +XaAdiZYN+UwuxoJIqWZ9xKHM2bdHRWebbzfNoErargqq+Y2wDrn6gz8qg3iOqWW0 +fnMY8ecezS3J7zVE45RH/ogm9u1dAGhOHAUtptdfk3C7UUTV7R+I+64cJ3AA3/zq +f0aex2fjowxm/EFXF0OSvbi3EpO4rInK0iJ5DeDK9WdBm99Lh8jS93sixXjhhDxD +wD2mbCltbnpHUYpdfgxdue48mflt9uxM7EaUyChP70yJ7hiFbjfBz8yRYxY= +=qJFS -----END PGP PUBLIC KEY BLOCK-----