[arch-commits] Commit in consul/repos/community-x86_64 (20 files)

Thore Bödecker foxxx0 at archlinux.org
Mon May 18 17:34:17 UTC 2020


    Date: Monday, May 18, 2020 @ 17:34:16
  Author: foxxx0
Revision: 629571

archrelease: copy trunk to community-x86_64

Added:
  consul/repos/community-x86_64/PKGBUILD
    (from rev 629570, consul/trunk/PKGBUILD)
  consul/repos/community-x86_64/consul-ldflags.patch
    (from rev 629570, consul/trunk/consul-ldflags.patch)
  consul/repos/community-x86_64/consul.default
    (from rev 629570, consul/trunk/consul.default)
  consul/repos/community-x86_64/consul.install
    (from rev 629570, consul/trunk/consul.install)
  consul/repos/community-x86_64/consul.service
    (from rev 629570, consul/trunk/consul.service)
  consul/repos/community-x86_64/consul.sysusers
    (from rev 629570, consul/trunk/consul.sysusers)
  consul/repos/community-x86_64/example.json
    (from rev 629570, consul/trunk/example.json)
  consul/repos/community-x86_64/fix-build-version-info.patch
    (from rev 629570, consul/trunk/fix-build-version-info.patch)
  consul/repos/community-x86_64/fix-test.patch
    (from rev 629570, consul/trunk/fix-test.patch)
  consul/repos/community-x86_64/unparallelize-or-disable-flaky-tests.patch
    (from rev 629570, consul/trunk/unparallelize-or-disable-flaky-tests.patch)
Deleted:
  consul/repos/community-x86_64/PKGBUILD
  consul/repos/community-x86_64/consul-ldflags.patch
  consul/repos/community-x86_64/consul.default
  consul/repos/community-x86_64/consul.install
  consul/repos/community-x86_64/consul.service
  consul/repos/community-x86_64/consul.sysusers
  consul/repos/community-x86_64/example.json
  consul/repos/community-x86_64/fix-build-version-info.patch
  consul/repos/community-x86_64/fix-test.patch
  consul/repos/community-x86_64/unparallelize-or-disable-flaky-tests.patch

--------------------------------------------+
 PKGBUILD                                   |  182 ++++++++++++---------------
 consul-ldflags.patch                       |   62 ++++-----
 consul.default                             |    2 
 consul.install                             |   18 +-
 consul.service                             |   32 ++--
 consul.sysusers                            |    2 
 example.json                               |   14 +-
 fix-build-version-info.patch               |  150 +++++++++++-----------
 fix-test.patch                             |   22 +--
 unparallelize-or-disable-flaky-tests.patch |  108 ++++++++--------
 10 files changed, 292 insertions(+), 300 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-18 17:34:07 UTC (rev 629570)
+++ PKGBUILD	2020-05-18 17:34:16 UTC (rev 629571)
@@ -1,95 +0,0 @@
-# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=consul
-pkgver=1.7.2
-pkgrel=1
-pkgdesc="A tool for service discovery, monitoring and configuration."
-arch=('x86_64')
-url="https://www.consul.io"
-license=('MPL2')
-depends=('glibc')
-makedepends=('git' 'go-pie' 'go-bindata-assetfs' 'go-bindata-hashicorp' 'procps-ng' 'zip' 'yarn' 'bower' 'nodejs-lts-dubnium' 'npm' 'zip' 'gox' 'go-tools')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/hashicorp/consul/archive/v${pkgver}.tar.gz"
-        'consul.service'
-        'consul.default'
-        'consul.sysusers'
-        'example.json'
-        'fix-build-version-info.patch'
-        'unparallelize-or-disable-flaky-tests.patch'
-        'fix-test.patch'
-        'consul-ldflags.patch'
-        )
-install=consul.install
-backup=('etc/default/consul')
-sha512sums=('d13d7750c745aeeb2577ed334bfef1ac8a4e0c6f671a6705c0b8978217d071ebcf32455c0bfc83a77fd03caef68a6e256d95b48d5406deaaaba263f1a97b23c2'
-            'c70b9d1556f6c7ecb2e915ab685f289cef0e31198bd2e50c74a0483bbfb387beec67334f539a90adbf68b61b07946e98b300ab8a8e26e53b35f4ab4894adeb04'
-            'ec5a800529a297c709fa383c094ecf106351cf0f8ac7b613b972d415d77fe001088902d7ab805e63e78a8e6360323fec1b795db5a4446df1e21b9b4ed31e7079'
-            'ef872aedb2bc022a29292b7972a792b22e684c1ccb904a2b2cfec6d8966c28fb19be1452ce060821c419f1b646b236ba2e783175595e4bb6926d164c27a15c87'
-            'c4292b8f56ee955ed7385a49843fd90d6434029891b3e1e724cb2fc841514c06e2554a26d3937c114371b18c2168c4e64319eb2cbd726ee8b35870df19089348'
-            'c6e06dbf5954277ba472ba5bbaf0da5b9a22a49b02ef59cc16057025cab65e9065855f191f2910a3051a6877e4a8a9c392a98b811b911cee8c6fa5c39853ce7a'
-            'b59b2733d598ae6648c198f26f23961d4c1ea8c693a1a5b1c16a0951400c3bb9a9d2d5efe4f0a5cca9ae3b1f225a8eb4133c9011c4125589e936c7dcdc4b2495'
-            'f03821a42857cb19479b5a8d2c5dbb46e355f0e459caf89d3be7a5527961dffe9ffaebc9cf8e98d801c84cc4b38ec6c62330abc97347f3b5ca30e188f26d6982'
-            '15eb20feaa281b5dda46445582ee7bf83f14e599b75ee2eb2b7c18aefa27df597dbcfed55b3bdc1b9917eca6bdbc3134390ffdb6e4924df2a46f4c442efc5b91')
-
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  local filename
-  for filename in "${source[@]}"; do
-    if [[ "$filename" =~ \.patch$ ]]; then
-      patch -p1 -N -l -i "$srcdir/${filename##*/}"
-    fi
-  done
-
-  cd "${srcdir}"
-  mkdir -p 'src/github.com/hashicorp'
-  mv "${pkgname}-${pkgver}" "src/github.com/hashicorp/${pkgname}"
-
-  export GOPATH="${srcdir}"
-}
-
-build() {
-  cd "${srcdir}/src/github.com/hashicorp/${pkgname}"
-
-  export GOOS='linux'
-  export GOARCH='amd64'
-  export XC_OSARCH='linux/amd64'
-
-  make linux
-}
-
-# The test suite is horribly broken and will show approx. 60-80% test failures.
-# Upstream hasn't been helpful in debugging this and just points to their binary releases.
-# From now this package will ship without tests as I'm sick and tired of this BS.
-
-#check() {
-#  cd "${srcdir}/src/github.com/hashicorp/${pkgname}"
-#
-#  # prevent e.g. syslog tests
-#  export TRAVIS='true'
-#  # weird race conditions when being run overparallelized
-#  export GOMAXPROCS="1"
-#  export GOTEST_FLAGS="-p 1 -parallel 1"
-#  export GOOS='linux'
-#  export GOARCH='amd64'
-#
-#  make -j1 test
-#}
-
-package() {
-  cd "${srcdir}/src/github.com/hashicorp/${pkgname}"
-
-  install -D -d -m750 -o 208 -g 208 "${pkgdir}/var/lib/consul"
-  install -D -d -m750 -o   0 -g 208 "${pkgdir}/etc/consul.d"
-
-  install -D -m644 "${srcdir}/consul.default" "${pkgdir}/etc/default/consul"
-  install -D -m644 -o 0 -g 0 "${srcdir}/example.json" "${pkgdir}/usr/share/doc/consul/config.example.json"
-  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"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: consul/repos/community-x86_64/PKGBUILD (from rev 629570, consul/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-18 17:34:16 UTC (rev 629571)
@@ -0,0 +1,87 @@
+# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=consul
+pkgver=1.7.3
+pkgrel=1
+pkgdesc="A tool for service discovery, monitoring and configuration."
+arch=('x86_64')
+url="https://www.consul.io"
+license=('MPL2')
+depends=('glibc')
+makedepends=('git' 'go' 'go-bindata-assetfs' 'go-bindata-hashicorp' 'procps-ng' 'zip' 'yarn' 'bower' 'nodejs-lts-dubnium' 'npm' 'zip' 'gox' 'go-tools')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/hashicorp/consul/archive/v${pkgver}.tar.gz"
+        'consul.service'
+        'consul.default'
+        'consul.sysusers'
+        'example.json'
+        'fix-build-version-info.patch'
+        'unparallelize-or-disable-flaky-tests.patch'
+        )
+install=consul.install
+backup=('etc/default/consul')
+sha512sums=('6cbc4f3fce613b3f8ac220038cd013ce14801ccc6c999b12e42f2149277f845531932243b063fbd83d92b84ed75000c47636f7883bd04079c0b82c642e021c01'
+            'c70b9d1556f6c7ecb2e915ab685f289cef0e31198bd2e50c74a0483bbfb387beec67334f539a90adbf68b61b07946e98b300ab8a8e26e53b35f4ab4894adeb04'
+            'ec5a800529a297c709fa383c094ecf106351cf0f8ac7b613b972d415d77fe001088902d7ab805e63e78a8e6360323fec1b795db5a4446df1e21b9b4ed31e7079'
+            'ef872aedb2bc022a29292b7972a792b22e684c1ccb904a2b2cfec6d8966c28fb19be1452ce060821c419f1b646b236ba2e783175595e4bb6926d164c27a15c87'
+            'c4292b8f56ee955ed7385a49843fd90d6434029891b3e1e724cb2fc841514c06e2554a26d3937c114371b18c2168c4e64319eb2cbd726ee8b35870df19089348'
+            'c6e06dbf5954277ba472ba5bbaf0da5b9a22a49b02ef59cc16057025cab65e9065855f191f2910a3051a6877e4a8a9c392a98b811b911cee8c6fa5c39853ce7a'
+            'b59b2733d598ae6648c198f26f23961d4c1ea8c693a1a5b1c16a0951400c3bb9a9d2d5efe4f0a5cca9ae3b1f225a8eb4133c9011c4125589e936c7dcdc4b2495')
+
+export CGO_LDFLAGS="${LDFLAGS}"
+export CGO_CFLAGS="${CFLAGS}"
+export CGO_CPPFLAGS="${CPPFLAGS}"
+export CGO_CXXFLAGS="${CXXFLAGS}"
+# consul is incompatible with -buildmode=pie
+export GOFLAGS="-trimpath -modcacherw"
+
+export GOOS='linux'
+export GOARCH='amd64'
+export XC_OSARCH='linux/amd64'
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  local filename
+  for filename in "${source[@]}"; do
+    if [[ "$filename" =~ \.patch$ ]]; then
+      patch -p1 -N -l -i "$srcdir/${filename##*/}"
+    fi
+  done
+
+  mkdir -p build
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  go build -o build './...'
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # prevent e.g. syslog tests
+  export TRAVIS='true'
+
+  # some tests need the built `consul` binary in $PATH
+  export PATH="${PWD}/build:${PATH}"
+
+  # weird race conditions when being run overparallelized
+  go test -v -p 2 -parallel 2 './...'
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -D -d -m750 -o 208 -g 208 "${pkgdir}/var/lib/consul"
+  install -D -d -m750 -o   0 -g 208 "${pkgdir}/etc/consul.d"
+
+  install -D -m644 "${srcdir}/consul.default" "${pkgdir}/etc/default/consul"
+  install -D -m644 -o 0 -g 0 "${srcdir}/example.json" "${pkgdir}/usr/share/doc/consul/config.example.json"
+  install -Dm755 "build/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"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: consul-ldflags.patch
===================================================================
--- consul-ldflags.patch	2020-05-18 17:34:07 UTC (rev 629570)
+++ consul-ldflags.patch	2020-05-18 17:34:16 UTC (rev 629571)
@@ -1,31 +0,0 @@
-diff -upr b/build-support/functions/20-build.sh c/build-support/functions/20-build.sh
---- b/build-support/functions/20-build.sh	2020-03-04 10:15:04.066148196 +0100
-+++ c/build-support/functions/20-build.sh	2020-03-04 10:13:54.354670580 +0100
-@@ -458,7 +458,7 @@ function build_consul_local {
-          if [ $os == "windows" ];then
-                binname="consul.exe"
-          fi
--         debug_run env CGO_ENABLED=0 GOOS=${os} GOARCH=${arch} go install -ldflags "${GOLDFLAGS}" -tags "${GOTAGS}" && cp "${MAIN_GOPATH}/bin/${GOBIN_EXTRA}${binname}" "${outdir}/${binname}"
-+         debug_run env CGO_ENABLED=0 GOOS=${os} GOARCH=${arch} go install -ldflags "-linkmode external -extldflags ${EXTLDFLAGS} -s -w ${GOLDFLAGS}" -tags "${GOTAGS}" && cp "${MAIN_GOPATH}/bin/${GOBIN_EXTRA}${binname}" "${outdir}/${binname}"
-          if test $? -ne 0
-          then
-             err "ERROR: Failed to build Consul for ${osarch}"
-diff -upr b/GNUmakefile c/GNUmakefile
---- b/GNUmakefile	2020-03-04 10:14:46.245770467 +0100
-+++ c/GNUmakefile	2020-03-04 10:15:32.286746368 +0100
-@@ -17,6 +17,7 @@ MAIN_GOPATH=$(shell go env GOPATH | cut
- 
- ASSETFS_PATH?=agent/bindata_assetfs.go
- GOLDFLAGS=
-+EXTLDFLAGS := ${LDFLAGS}
- 
- PROTOFILES?=$(shell find . -name '*.proto' | grep -v 'vendor/')
- PROTOGOFILES=$(PROTOFILES:.proto=.pb.go)
-@@ -120,6 +121,7 @@ export GIT_DIRTY
- export GIT_DESCRIBE
- export GOTAGS
- export GOLDFLAGS
-+export EXTLDFLAGS
- 
- # Allow skipping docker build during integration tests in CI since we already
- # have a built binary

Copied: consul/repos/community-x86_64/consul-ldflags.patch (from rev 629570, consul/trunk/consul-ldflags.patch)
===================================================================
--- consul-ldflags.patch	                        (rev 0)
+++ consul-ldflags.patch	2020-05-18 17:34:16 UTC (rev 629571)
@@ -0,0 +1,31 @@
+diff -upr b/build-support/functions/20-build.sh c/build-support/functions/20-build.sh
+--- b/build-support/functions/20-build.sh	2020-03-04 10:15:04.066148196 +0100
++++ c/build-support/functions/20-build.sh	2020-03-04 10:13:54.354670580 +0100
+@@ -458,7 +458,7 @@ function build_consul_local {
+          if [ $os == "windows" ];then
+                binname="consul.exe"
+          fi
+-         debug_run env CGO_ENABLED=0 GOOS=${os} GOARCH=${arch} go install -ldflags "${GOLDFLAGS}" -tags "${GOTAGS}" && cp "${MAIN_GOPATH}/bin/${GOBIN_EXTRA}${binname}" "${outdir}/${binname}"
++         debug_run env CGO_ENABLED=0 GOOS=${os} GOARCH=${arch} go install -ldflags "-linkmode external -extldflags ${EXTLDFLAGS} -s -w ${GOLDFLAGS}" -tags "${GOTAGS}" && cp "${MAIN_GOPATH}/bin/${GOBIN_EXTRA}${binname}" "${outdir}/${binname}"
+          if test $? -ne 0
+          then
+             err "ERROR: Failed to build Consul for ${osarch}"
+diff -upr b/GNUmakefile c/GNUmakefile
+--- b/GNUmakefile	2020-03-04 10:14:46.245770467 +0100
++++ c/GNUmakefile	2020-03-04 10:15:32.286746368 +0100
+@@ -17,6 +17,7 @@ MAIN_GOPATH=$(shell go env GOPATH | cut
+ 
+ ASSETFS_PATH?=agent/bindata_assetfs.go
+ GOLDFLAGS=
++EXTLDFLAGS := ${LDFLAGS}
+ 
+ PROTOFILES?=$(shell find . -name '*.proto' | grep -v 'vendor/')
+ PROTOGOFILES=$(PROTOFILES:.proto=.pb.go)
+@@ -120,6 +121,7 @@ export GIT_DIRTY
+ export GIT_DESCRIBE
+ export GOTAGS
+ export GOLDFLAGS
++export EXTLDFLAGS
+ 
+ # Allow skipping docker build during integration tests in CI since we already
+ # have a built binary

Deleted: consul.default
===================================================================
--- consul.default	2020-05-18 17:34:07 UTC (rev 629570)
+++ consul.default	2020-05-18 17:34:16 UTC (rev 629571)
@@ -1 +0,0 @@
-CONSUL_FLAGS=""

Copied: consul/repos/community-x86_64/consul.default (from rev 629570, consul/trunk/consul.default)
===================================================================
--- consul.default	                        (rev 0)
+++ consul.default	2020-05-18 17:34:16 UTC (rev 629571)
@@ -0,0 +1 @@
+CONSUL_FLAGS=""

Deleted: consul.install
===================================================================
--- consul.install	2020-05-18 17:34:07 UTC (rev 629570)
+++ consul.install	2020-05-18 17:34:16 UTC (rev 629571)
@@ -1,9 +0,0 @@
-post_upgrade() {
-	# improved permissions since 0.9.3-1
-	if  [ "$(vercmp "$2" "0.9.3")" -lt 0 ]; then
-		chown 0:208 /etc/consul.d
-		chmod 0750 /etc/consul.d
-		echo -en "----\nThe directory permissions for /etc/consul.d/ have been fixed.\n----\n"
-	fi
-	true
-}

Copied: consul/repos/community-x86_64/consul.install (from rev 629570, consul/trunk/consul.install)
===================================================================
--- consul.install	                        (rev 0)
+++ consul.install	2020-05-18 17:34:16 UTC (rev 629571)
@@ -0,0 +1,9 @@
+post_upgrade() {
+	# improved permissions since 0.9.3-1
+	if  [ "$(vercmp "$2" "0.9.3")" -lt 0 ]; then
+		chown 0:208 /etc/consul.d
+		chmod 0750 /etc/consul.d
+		echo -en "----\nThe directory permissions for /etc/consul.d/ have been fixed.\n----\n"
+	fi
+	true
+}

Deleted: consul.service
===================================================================
--- consul.service	2020-05-18 17:34:07 UTC (rev 629570)
+++ consul.service	2020-05-18 17:34:16 UTC (rev 629571)
@@ -1,16 +0,0 @@
-[Unit]
-Description=Consul Agent
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-User=consul
-Group=consul
-EnvironmentFile=-/etc/default/consul
-Restart=on-failure
-ExecStart=/usr/bin/consul agent $CONSUL_FLAGS -config-dir=/etc/consul.d
-ExecReload=/usr/bin/kill -HUP $MAINPID
-KillSignal=SIGINT
-
-[Install]
-WantedBy=multi-user.target

Copied: consul/repos/community-x86_64/consul.service (from rev 629570, consul/trunk/consul.service)
===================================================================
--- consul.service	                        (rev 0)
+++ consul.service	2020-05-18 17:34:16 UTC (rev 629571)
@@ -0,0 +1,16 @@
+[Unit]
+Description=Consul Agent
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=consul
+Group=consul
+EnvironmentFile=-/etc/default/consul
+Restart=on-failure
+ExecStart=/usr/bin/consul agent $CONSUL_FLAGS -config-dir=/etc/consul.d
+ExecReload=/usr/bin/kill -HUP $MAINPID
+KillSignal=SIGINT
+
+[Install]
+WantedBy=multi-user.target

Deleted: consul.sysusers
===================================================================
--- consul.sysusers	2020-05-18 17:34:07 UTC (rev 629570)
+++ consul.sysusers	2020-05-18 17:34:16 UTC (rev 629571)
@@ -1 +0,0 @@
-u consul 208 - /var/lib/consul

Copied: consul/repos/community-x86_64/consul.sysusers (from rev 629570, consul/trunk/consul.sysusers)
===================================================================
--- consul.sysusers	                        (rev 0)
+++ consul.sysusers	2020-05-18 17:34:16 UTC (rev 629571)
@@ -0,0 +1 @@
+u consul 208 - /var/lib/consul

Deleted: example.json
===================================================================
--- example.json	2020-05-18 17:34:07 UTC (rev 629570)
+++ example.json	2020-05-18 17:34:16 UTC (rev 629571)
@@ -1,7 +0,0 @@
-{
-  "data_dir": "/var/lib/consul",
-  "disable_update_check": true,
-  "log_level": "INFO",
-  "node_name": "example.localdomain",
-  "server": true
-}

Copied: consul/repos/community-x86_64/example.json (from rev 629570, consul/trunk/example.json)
===================================================================
--- example.json	                        (rev 0)
+++ example.json	2020-05-18 17:34:16 UTC (rev 629571)
@@ -0,0 +1,7 @@
+{
+  "data_dir": "/var/lib/consul",
+  "disable_update_check": true,
+  "log_level": "INFO",
+  "node_name": "example.localdomain",
+  "server": true
+}

Deleted: fix-build-version-info.patch
===================================================================
--- fix-build-version-info.patch	2020-05-18 17:34:07 UTC (rev 629570)
+++ fix-build-version-info.patch	2020-05-18 17:34:16 UTC (rev 629571)
@@ -1,75 +0,0 @@
---- 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
- 
- import (
--	"fmt"
- 	"strings"
- )
- 
-@@ -27,24 +26,6 @@ var (
- // for displaying to humans.
- func GetHumanVersion() string {
- 	version := Version
--	if GitDescribe != "" {
--		version = GitDescribe
--	}
--
--	release := VersionPrerelease
--	if GitDescribe == "" && release == "" {
--		release = "dev"
--	}
--
--	if 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)
---- a/GNUmakefile	2020-02-20 16:40:00.000000000 +0100
-+++ b/GNUmakefile	2020-03-04 09:48:52.279500949 +0100
-@@ -16,13 +16,7 @@ GOPATH=$(shell go env GOPATH)
- MAIN_GOPATH=$(shell go env GOPATH | cut -d: -f1)
- 
- ASSETFS_PATH?=agent/bindata_assetfs.go
--# Get the git commit
--GIT_COMMIT?=$(shell git rev-parse --short HEAD)
--GIT_COMMIT_YEAR?=$(shell git show -s --format=%cd --date=format:%Y HEAD)
--GIT_DIRTY?=$(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true)
--GIT_DESCRIBE?=$(shell git describe --tags --always --match "v*")
--GIT_IMPORT=github.com/hashicorp/consul/version
--GOLDFLAGS=-X $(GIT_IMPORT).GitCommit=$(GIT_COMMIT)$(GIT_DIRTY) -X $(GIT_IMPORT).GitDescribe=$(GIT_DESCRIBE)
-+GOLDFLAGS=
- 
- PROTOFILES?=$(shell find . -name '*.proto' | grep -v 'vendor/')
- PROTOGOFILES=$(PROTOFILES:.proto=.pb.go)
-@@ -348,16 +342,6 @@ tools:
- 	fi
- 	cd .gotools && go get -v $(GOTOOLS)
- 
--version:
--	@echo -n "Version:                    "
--	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh
--	@echo -n "Version + release:          "
--	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh -r
--	@echo -n "Version + git:              "
--	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh  -g
--	@echo -n "Version + release + git:    "
--	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh -r -g
--
- 
- docker-images: go-build-image ui-build-image
- 
-@@ -409,4 +393,4 @@ proto: $(PROTOGOFILES) $(PROTOGOBINFILES
- 
- .PHONY: all ci bin dev dist cov test test-ci test-internal cover format vet ui static-assets tools
- .PHONY: docker-images go-build-image ui-build-image static-assets-docker consul-docker ui-docker
--.PHONY: version proto proto-rebuild proto-delete test-envoy-integ
-+.PHONY: proto proto-rebuild proto-delete test-envoy-integ

Copied: consul/repos/community-x86_64/fix-build-version-info.patch (from rev 629570, consul/trunk/fix-build-version-info.patch)
===================================================================
--- fix-build-version-info.patch	                        (rev 0)
+++ fix-build-version-info.patch	2020-05-18 17:34:16 UTC (rev 629571)
@@ -0,0 +1,75 @@
+--- 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
+ 
+ import (
+-	"fmt"
+ 	"strings"
+ )
+ 
+@@ -27,24 +26,6 @@ var (
+ // for displaying to humans.
+ func GetHumanVersion() string {
+ 	version := Version
+-	if GitDescribe != "" {
+-		version = GitDescribe
+-	}
+-
+-	release := VersionPrerelease
+-	if GitDescribe == "" && release == "" {
+-		release = "dev"
+-	}
+-
+-	if 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)
+--- a/GNUmakefile	2020-02-20 16:40:00.000000000 +0100
++++ b/GNUmakefile	2020-03-04 09:48:52.279500949 +0100
+@@ -16,13 +16,7 @@ GOPATH=$(shell go env GOPATH)
+ MAIN_GOPATH=$(shell go env GOPATH | cut -d: -f1)
+ 
+ ASSETFS_PATH?=agent/bindata_assetfs.go
+-# Get the git commit
+-GIT_COMMIT?=$(shell git rev-parse --short HEAD)
+-GIT_COMMIT_YEAR?=$(shell git show -s --format=%cd --date=format:%Y HEAD)
+-GIT_DIRTY?=$(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true)
+-GIT_DESCRIBE?=$(shell git describe --tags --always --match "v*")
+-GIT_IMPORT=github.com/hashicorp/consul/version
+-GOLDFLAGS=-X $(GIT_IMPORT).GitCommit=$(GIT_COMMIT)$(GIT_DIRTY) -X $(GIT_IMPORT).GitDescribe=$(GIT_DESCRIBE)
++GOLDFLAGS=
+ 
+ PROTOFILES?=$(shell find . -name '*.proto' | grep -v 'vendor/')
+ PROTOGOFILES=$(PROTOFILES:.proto=.pb.go)
+@@ -348,16 +342,6 @@ tools:
+ 	fi
+ 	cd .gotools && go get -v $(GOTOOLS)
+ 
+-version:
+-	@echo -n "Version:                    "
+-	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh
+-	@echo -n "Version + release:          "
+-	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh -r
+-	@echo -n "Version + git:              "
+-	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh  -g
+-	@echo -n "Version + release + git:    "
+-	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh -r -g
+-
+ 
+ docker-images: go-build-image ui-build-image
+ 
+@@ -409,4 +393,4 @@ proto: $(PROTOGOFILES) $(PROTOGOBINFILES
+ 
+ .PHONY: all ci bin dev dist cov test test-ci test-internal cover format vet ui static-assets tools
+ .PHONY: docker-images go-build-image ui-build-image static-assets-docker consul-docker ui-docker
+-.PHONY: version proto proto-rebuild proto-delete test-envoy-integ
++.PHONY: proto proto-rebuild proto-delete test-envoy-integ

Deleted: fix-test.patch
===================================================================
--- fix-test.patch	2020-05-18 17:34:07 UTC (rev 629570)
+++ fix-test.patch	2020-05-18 17:34:16 UTC (rev 629571)
@@ -1,11 +0,0 @@
---- a/GNUmakefile	2020-02-20 16:40:00.000000000 +0100
-+++ b/GNUmakefile	2020-03-04 09:51:30.786193388 +0100
-@@ -212,7 +212,7 @@ cov: other-consul dev-build
- 	rm -f coverage.{sdk,api}.part
- 	go tool cover -html=coverage.out
- 
--test: other-consul dev-build vet test-internal
-+test: other-consul dev-build test-internal
- 
- go-mod-tidy:
- 	@echo "--> Running go mod tidy"

Copied: consul/repos/community-x86_64/fix-test.patch (from rev 629570, consul/trunk/fix-test.patch)
===================================================================
--- fix-test.patch	                        (rev 0)
+++ fix-test.patch	2020-05-18 17:34:16 UTC (rev 629571)
@@ -0,0 +1,11 @@
+--- a/GNUmakefile	2020-02-20 16:40:00.000000000 +0100
++++ b/GNUmakefile	2020-03-04 09:51:30.786193388 +0100
+@@ -212,7 +212,7 @@ cov: other-consul dev-build
+ 	rm -f coverage.{sdk,api}.part
+ 	go tool cover -html=coverage.out
+ 
+-test: other-consul dev-build vet test-internal
++test: other-consul dev-build test-internal
+ 
+ go-mod-tidy:
+ 	@echo "--> Running go mod tidy"

Deleted: unparallelize-or-disable-flaky-tests.patch
===================================================================
--- unparallelize-or-disable-flaky-tests.patch	2020-05-18 17:34:07 UTC (rev 629570)
+++ unparallelize-or-disable-flaky-tests.patch	2020-05-18 17:34:16 UTC (rev 629571)
@@ -1,54 +0,0 @@
-diff -upr a/agent/cache/cache_test.go b/agent/cache/cache_test.go
---- a/agent/cache/cache_test.go	2018-11-14 23:37:47.000000000 +0100
-+++ b/agent/cache/cache_test.go	2019-01-08 15:23:12.540631267 +0100
-@@ -213,7 +213,6 @@ func TestCacheGet_blockingInitSameKey(t
- // Test that Get with different cache keys both block on initial value
- // but that the fetches were both properly called.
- func TestCacheGet_blockingInitDiffKeys(t *testing.T) {
--	t.Parallel()
- 
- 	require := require.New(t)
- 
-@@ -299,7 +298,6 @@ func TestCacheGet_blockingIndex(t *testi
- // Test a get with an index set will timeout if the fetch doesn't return
- // anything.
- func TestCacheGet_blockingIndexTimeout(t *testing.T) {
--	t.Parallel()
- 
- 	typ := TestType(t)
- 	defer typ.AssertExpectations(t)
-@@ -438,7 +436,6 @@ func TestCacheGet_emptyFetchResult(t *te
- // Test that a type registered with a periodic refresh will perform
- // that refresh after the timer is up.
- func TestCacheGet_periodicRefresh(t *testing.T) {
--	t.Parallel()
- 
- 	typ := TestType(t)
- 	defer typ.AssertExpectations(t)
-@@ -525,7 +522,6 @@ func TestCacheGet_periodicRefreshMultipl
- 
- // Test that a refresh performs a backoff.
- func TestCacheGet_periodicRefreshErrorBackoff(t *testing.T) {
--	t.Parallel()
- 
- 	typ := TestType(t)
- 	defer typ.AssertExpectations(t)
-@@ -566,7 +562,6 @@ func TestCacheGet_periodicRefreshErrorBa
- 
- // Test that a badly behaved RPC that returns 0 index will perform a backoff.
- func TestCacheGet_periodicRefreshBadRPCZeroIndexErrorBackoff(t *testing.T) {
--	t.Parallel()
- 
- 	typ := TestType(t)
- 	defer typ.AssertExpectations(t)
-diff -upr a/agent/cache-types/connect_ca_leaf_test.go b/agent/cache-types/connect_ca_leaf_test.go
---- a/agent/cache-types/connect_ca_leaf_test.go	2018-11-14 23:37:47.000000000 +0100
-+++ b/agent/cache-types/connect_ca_leaf_test.go	2019-01-08 15:23:55.670339830 +0100
-@@ -870,7 +870,6 @@ func TestConnectCALeaf_changingRoots(t *
- // Test that after an initial signing, an expiringLeaf will trigger a
- // blocking query to resign.
- func TestConnectCALeaf_expiringLeaf(t *testing.T) {
--	t.Parallel()
- 
- 	require := require.New(t)
- 	rpc := TestRPC(t)

Copied: consul/repos/community-x86_64/unparallelize-or-disable-flaky-tests.patch (from rev 629570, consul/trunk/unparallelize-or-disable-flaky-tests.patch)
===================================================================
--- unparallelize-or-disable-flaky-tests.patch	                        (rev 0)
+++ unparallelize-or-disable-flaky-tests.patch	2020-05-18 17:34:16 UTC (rev 629571)
@@ -0,0 +1,54 @@
+diff -upr a/agent/cache/cache_test.go b/agent/cache/cache_test.go
+--- a/agent/cache/cache_test.go	2018-11-14 23:37:47.000000000 +0100
++++ b/agent/cache/cache_test.go	2019-01-08 15:23:12.540631267 +0100
+@@ -213,7 +213,6 @@ func TestCacheGet_blockingInitSameKey(t
+ // Test that Get with different cache keys both block on initial value
+ // but that the fetches were both properly called.
+ func TestCacheGet_blockingInitDiffKeys(t *testing.T) {
+-	t.Parallel()
+ 
+ 	require := require.New(t)
+ 
+@@ -299,7 +298,6 @@ func TestCacheGet_blockingIndex(t *testi
+ // Test a get with an index set will timeout if the fetch doesn't return
+ // anything.
+ func TestCacheGet_blockingIndexTimeout(t *testing.T) {
+-	t.Parallel()
+ 
+ 	typ := TestType(t)
+ 	defer typ.AssertExpectations(t)
+@@ -438,7 +436,6 @@ func TestCacheGet_emptyFetchResult(t *te
+ // Test that a type registered with a periodic refresh will perform
+ // that refresh after the timer is up.
+ func TestCacheGet_periodicRefresh(t *testing.T) {
+-	t.Parallel()
+ 
+ 	typ := TestType(t)
+ 	defer typ.AssertExpectations(t)
+@@ -525,7 +522,6 @@ func TestCacheGet_periodicRefreshMultipl
+ 
+ // Test that a refresh performs a backoff.
+ func TestCacheGet_periodicRefreshErrorBackoff(t *testing.T) {
+-	t.Parallel()
+ 
+ 	typ := TestType(t)
+ 	defer typ.AssertExpectations(t)
+@@ -566,7 +562,6 @@ func TestCacheGet_periodicRefreshErrorBa
+ 
+ // Test that a badly behaved RPC that returns 0 index will perform a backoff.
+ func TestCacheGet_periodicRefreshBadRPCZeroIndexErrorBackoff(t *testing.T) {
+-	t.Parallel()
+ 
+ 	typ := TestType(t)
+ 	defer typ.AssertExpectations(t)
+diff -upr a/agent/cache-types/connect_ca_leaf_test.go b/agent/cache-types/connect_ca_leaf_test.go
+--- a/agent/cache-types/connect_ca_leaf_test.go	2018-11-14 23:37:47.000000000 +0100
++++ b/agent/cache-types/connect_ca_leaf_test.go	2019-01-08 15:23:55.670339830 +0100
+@@ -870,7 +870,6 @@ func TestConnectCALeaf_changingRoots(t *
+ // Test that after an initial signing, an expiringLeaf will trigger a
+ // blocking query to resign.
+ func TestConnectCALeaf_expiringLeaf(t *testing.T) {
+-	t.Parallel()
+ 
+ 	require := require.New(t)
+ 	rpc := TestRPC(t)


More information about the arch-commits mailing list