[arch-commits] Commit in consul/trunk (3 files)

[Thore Bödecker]

    Date: Tuesday, June 26, 2018 @ 08:16:47
  Author: foxxx0
Revision: 346140

upgpkg: consul 1.2.0-1

update to 1.2.0

Modified:
  consul/trunk/PKGBUILD
  consul/trunk/fix-build-version-info.patch
Deleted:
  consul/trunk/force-pie-build.patch

------------------------------+
 PKGBUILD                     |   15 +++++----------
 fix-build-version-info.patch |   15 +++++++++------
 force-pie-build.patch        |   11 -----------
 3 files changed, 14 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-26 07:02:01 UTC (rev 346139)
+++ PKGBUILD	2018-06-26 08:16:47 UTC (rev 346140)
@@ -3,8 +3,8 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=consul
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="A tool for service discovery, monitoring and configuration."
 arch=('x86_64')
 _gocli_commit='65fcae5817c8600da98ada9d7edf26dd1a84837b' # HEAD
@@ -19,10 +19,9 @@
         'consul.sysusers'
         'example.json'
         'disable-broken-api-test.patch'
-        'force-pie-build.patch'
         'fix-build-version-info.patch')
 install=consul.install
-sha512sums=('80c16a42fc58930234cb277bfdd21c3f1d9f7fe1cf2fea6284056a47f602a40a15ddd447779e83fc5b42502ca8a507a819f5ad7d11689c0bcbb0da739b217721'
+sha512sums=('1c018a5f35164a899a086ccdae94cb5e6e2a490e4c788d65b0026dbf448950d0c1038b2d61cb10f5e8c9ad22a1affad64dd4a7086b59dffd115d40aa7b3d0cce'
             'SKIP'
             'c70b9d1556f6c7ecb2e915ab685f289cef0e31198bd2e50c74a0483bbfb387beec67334f539a90adbf68b61b07946e98b300ab8a8e26e53b35f4ab4894adeb04'
             'ec5a800529a297c709fa383c094ecf106351cf0f8ac7b613b972d415d77fe001088902d7ab805e63e78a8e6360323fec1b795db5a4446df1e21b9b4ed31e7079'
@@ -29,8 +28,7 @@
             'ef872aedb2bc022a29292b7972a792b22e684c1ccb904a2b2cfec6d8966c28fb19be1452ce060821c419f1b646b236ba2e783175595e4bb6926d164c27a15c87'
             'c4292b8f56ee955ed7385a49843fd90d6434029891b3e1e724cb2fc841514c06e2554a26d3937c114371b18c2168c4e64319eb2cbd726ee8b35870df19089348'
             'ad5b5ea1fd4ec443c98a89da9fb581d32894c4583dec3707ce9096ed45706bc800f8eb20e5a0c68f6de437d228e09a97bad5815b5bba9b18ae339bcf9a42f8f7'
-            '2c7323b889e9a040f8e2732aa192fbef87bb5eb81072a06a48f536cbdd93d7d219ea17b61e89dfebf915e85861cbb60dd889cb03a14e0a8197b081595e2a2783'
-            'e2fa5674343cd26e17bf08d0a4f2bd923870617511aed49fdc98aaa88a7590916b67e886301385988fdea93747f380f6a7322d1eac3ba14cf81b4baff452cb12')
+            '6709e51ff57fbe8118e7c9b38c99ef096a62d0c88ac2694e8c86065052cd2600f65dd9ac7f4a7e60712c26d15355f938cd9d98684955f4a02b2d5adfe1c2c04e')
 
 prepare() {
   export  GOPATH="${srcdir}"
@@ -43,9 +41,6 @@
 
   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"
 }
@@ -84,7 +79,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 pkg/linux_amd64/consul "${pkgdir}/usr/bin/consul"
+  install -Dm755 "bin/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"

Modified: fix-build-version-info.patch
===================================================================
--- fix-build-version-info.patch	2018-06-26 07:02:01 UTC (rev 346139)
+++ fix-build-version-info.patch	2018-06-26 08:16:47 UTC (rev 346140)
@@ -1,5 +1,5 @@
---- a/version/version.go	2018-05-11 20:57:42.000000000 +0200
-+++ b/version/version.go	2018-05-22 14:05:53.639672108 +0200
+--- a/version/version.go	2018-06-26 09:57:33.703932696 +0200
++++ b/version/version.go	2018-06-26 09:59:05.986536238 +0200
 @@ -1,7 +1,6 @@
  package version
  
@@ -8,7 +8,7 @@
  	"strings"
  )
  
-@@ -27,21 +26,6 @@
+@@ -27,24 +26,6 @@ var (
  // for displaying to humans.
  func GetHumanVersion() string {
  	version := Version
@@ -20,13 +20,16 @@
 -	if GitDescribe == "" && release == "" {
 -		release = "dev"
 -	}
+-
 -	if release != "" {
--		version += fmt.Sprintf("-%s", release)
+-		if !strings.HasSuffix(version, "-"+release) {
+-			// if we tagged a prerelease version then the release is in the version already
+-			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)
- }

Deleted: force-pie-build.patch
===================================================================
--- force-pie-build.patch	2018-06-26 07:02:01 UTC (rev 346139)
+++ force-pie-build.patch	2018-06-26 08:16:47 UTC (rev 346140)
@@ -1,11 +0,0 @@
---- 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: