Date: Tuesday, May 22, 2018 @ 12:27:24
Author: foxxx0
Revision: 327575
upgpkg: consul 1.1.0-2
fix version info (strip '-dev' suffix)
Added:
consul/trunk/fix-build-version-info.patch
consul/trunk/force-pie-build.patch
Modified:
consul/trunk/PKGBUILD
------------------------------+
PKGBUILD | 41 +++++++++++++++++++++++++++++++----------
fix-build-version-info.patch | 32 ++++++++++++++++++++++++++++++++
force-pie-build.patch | 11 +++++++++++
3 files changed, 74 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-22 12:22:35 UTC (rev 327574)
+++ PKGBUILD 2018-05-22 12:27:24 UTC (rev 327575)
@@ -4,7 +4,7 @@
pkgname=consul
pkgver=1.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="A tool for service discovery, monitoring and configuration."
arch=('x86_64')
_gocli_commit='65fcae5817c8600da98ada9d7edf26dd1a84837b' # HEAD
@@ -11,14 +11,16 @@
url="https://www.consul.io";
license=('MPL2')
depends=('glibc')
-makedepends=('git' 'go-pie' 'procps-ng' 'syslog-ng')
+makedepends=('git' 'go-pie' 'procps-ng' 'syslog-ng' 'zip')
source=("$pkgname-$pkgver.tar.gz::https://github.com/hashicorp/consul/archive/v$pkgver.tar.gz";
"git+https://github.com/mitchellh/cli#commit=${_gocli_commit}";
- consul.service
- consul.default
- consul.sysusers
- example.json
- disable-broken-api-test.patch)
+ 'consul.service'
+ 'consul.default'
+ 'consul.sysusers'
+ 'example.json'
+ 'disable-broken-api-test.patch'
+ 'force-pie-build.patch'
+ 'fix-build-version-info.patch')
install=consul.install
sha512sums=('80c16a42fc58930234cb277bfdd21c3f1d9f7fe1cf2fea6284056a47f602a40a15ddd447779e83fc5b42502ca8a507a819f5ad7d11689c0bcbb0da739b217721'
'SKIP'
@@ -26,7 +28,9 @@
'ec5a800529a297c709fa383c094ecf106351cf0f8ac7b613b972d415d77fe001088902d7ab805e63e78a8e6360323fec1b795db5a4446df1e21b9b4ed31e7079'
'ef872aedb2bc022a29292b7972a792b22e684c1ccb904a2b2cfec6d8966c28fb19be1452ce060821c419f1b646b236ba2e783175595e4bb6926d164c27a15c87'
'c4292b8f56ee955ed7385a49843fd90d6434029891b3e1e724cb2fc841514c06e2554a26d3937c114371b18c2168c4e64319eb2cbd726ee8b35870df19089348'
-
'ad5b5ea1fd4ec443c98a89da9fb581d32894c4583dec3707ce9096ed45706bc800f8eb20e5a0c68f6de437d228e09a97bad5815b5bba9b18ae339bcf9a42f8f7')
+
'ad5b5ea1fd4ec443c98a89da9fb581d32894c4583dec3707ce9096ed45706bc800f8eb20e5a0c68f6de437d228e09a97bad5815b5bba9b18ae339bcf9a42f8f7'
+
'2c7323b889e9a040f8e2732aa192fbef87bb5eb81072a06a48f536cbdd93d7d219ea17b61e89dfebf915e85861cbb60dd889cb03a14e0a8197b081595e2a2783'
+
'e2fa5674343cd26e17bf08d0a4f2bd923870617511aed49fdc98aaa88a7590916b67e886301385988fdea93747f380f6a7322d1eac3ba14cf81b4baff452cb12')
prepare() {
export GOPATH="${srcdir}"
@@ -39,6 +43,15 @@
cd "src/github.com/hashicorp/${pkgname}"
+ # force pie build
+ patch -p1 -N -l -i "${srcdir}/force-pie-build.patch"
+
+ # use proper release build version string (w/o '-dev' suffix)
+ patch -p1 -N -l -i "${srcdir}/fix-build-version-info.patch"
+}
+
+check() {
+ cd "src/github.com/hashicorp/${pkgname}"
# TODO: debug failing tests
# + TestTombstoneGC
#rm ./agent/consul/state/tombstone_gc_test.go
@@ -52,7 +65,15 @@
build() {
cd "src/github.com/hashicorp/${pkgname}"
# build local arch only, from:
https://github.com/hashicorp/consul/#developing-consul
- CONSUL_DEV=1 make
+ # note! this will result in a development build! do not use for production
+ # CONSUL_DEV=1 make
+
+ # this will limit the build targets but still result in official "zip"
release
+ # XC_OS='linux' XC_ARCH='amd64' make
+
+ # this will build only for linux/amd64
+ export CGO_ENABLED=0
+ make linux
}
package() {
@@ -63,7 +84,7 @@
install -D -m644 "${srcdir}/consul.default" "${pkgdir}/etc/default/consul"
install -D -m640 -o 0 -g 208 "${srcdir}/example.json"
"${pkgdir}/etc/consul.d/example.json"
- install -Dm755 bin/consul "${pkgdir}/usr/bin/consul"
+ install -Dm755 pkg/linux_amd64/consul "${pkgdir}/usr/bin/consul"
install -Dm644 "${srcdir}/consul.service"
"${pkgdir}/usr/lib/systemd/system/consul.service"
install -Dm644 "${srcdir}/consul.sysusers"
"${pkgdir}/usr/lib/sysusers.d/consul.conf"
Added: fix-build-version-info.patch
===================================================================
--- fix-build-version-info.patch (rev 0)
+++ fix-build-version-info.patch 2018-05-22 12:27:24 UTC (rev 327575)
@@ -0,0 +1,32 @@
+--- a/version/version.go 2018-05-11 20:57:42.000000000 +0200
++++ b/version/version.go 2018-05-22 14:05:53.639672108 +0200
+@@ -1,7 +1,6 @@
+ package version
+
+ import (
+- "fmt"
+ "strings"
+ )
+
+@@ -27,21 +26,6 @@
+ // for displaying to humans.
+ func GetHumanVersion() string {
+ version := Version
+- if GitDescribe != "" {
+- version = GitDescribe
+- }
+-
+- release := VersionPrerelease
+- if GitDescribe == "" && release == "" {
+- release = "dev"
+- }
+- if release != "" {
+- version += fmt.Sprintf("-%s", release)
+- if GitCommit != "" {
+- version += fmt.Sprintf(" (%s)", GitCommit)
+- }
+- }
+-
+ // Strip off any single quotes added by the git information.
+ return strings.Replace(version, "'", "", -1)
+ }
Added: force-pie-build.patch
===================================================================
--- force-pie-build.patch (rev 0)
+++ force-pie-build.patch 2018-05-22 12:27:24 UTC (rev 327575)
@@ -0,0 +1,11 @@
+--- a/GNUmakefile 2018-05-22 13:25:37.236071564 +0200
++++ b/GNUmakefile 2018-05-22 13:26:44.852192711 +0200
+@@ -58,7 +58,7 @@
+ # linux builds a linux package independent of the source platform
+ linux:
+ mkdir -p pkg/linux_amd64/
+- GOOS=linux GOARCH=amd64 go build -ldflags '$(GOLDFLAGS)' -tags
'$(GOTAGS)' -o pkg/linux_amd64/consul
++ GOOS=linux GOARCH=amd64 go build -buildmode=pie -ldflags '$(GOLDFLAGS)'
-tags '$(GOTAGS)' -o pkg/linux_amd64/consul
+
+ # dist builds binaries for all platforms and packages them for distribution
+ dist:
