summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMassimiliano Torromeo2019-03-21 09:22:35 +0100
committerMassimiliano Torromeo2019-03-21 09:22:35 +0100
commitf4acdf75bd694c4f617c303e1d3cd79eba8ebc7a (patch)
tree07725e29ade0753b1b22496fe941616f1d11a63b
parentd62ee6aa21c93919f7b98882916402a526e93aa9 (diff)
downloadaur-f4acdf75bd694c4f617c303e1d3cd79eba8ebc7a.tar.gz
Added patch for go 1.12
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
-rw-r--r--container.patch11
3 files changed, 24 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fb74d8bc711..cd46634a183 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Jan 26 11:10:36 UTC 2019
+# Thu Mar 21 08:22:20 UTC 2019
pkgbase = nomad
pkgdesc = A Distributed, Highly Available, Datacenter-Aware Scheduler
pkgver = 0.8.7
- pkgrel = 1
+ pkgrel = 2
url = https://www.nomadproject.io/
arch = i686
arch = x86_64
@@ -24,6 +24,7 @@ pkgbase = nomad
source = nomad-client.conf
source = lxc-version-check.patch
source = golang-crypto.patch
+ source = container.patch
sha256sums = f74eac627de69190e586358b1956573a0ae1a40d0755ecdee163016949f9c7fe
sha256sums = 52b0a22c3c0c72c642a8728cb48bd8797f4f6a12990e11bbb2342edcc2a9a206
sha256sums = da475bc4aa3b1493eb62f09e7f99dcc171e8ce6d74df3da30514cfdfe72a5714
@@ -31,6 +32,7 @@ pkgbase = nomad
sha256sums = ba80943ac42e617627c7e14be402078199ddba8d7e4276d67f0c9f6e6842d4a8
sha256sums = 740cf838f4489b00fab8329c81ba21b1fae02e584d8fac2b5f88eeec76e4e62f
sha256sums = 75583a195b43d7345449bbac60359bf54661ccbd699386a6e59bb483c6054338
+ sha256sums = d7f483250456cb7b92a437661999786b7295628fc09e1a3b0769606902d82ef0
pkgname = nomad
diff --git a/PKGBUILD b/PKGBUILD
index 1ef58daad5e..a1119b296d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=nomad
pkgver=0.8.7
-pkgrel=1
+pkgrel=2
pkgdesc="A Distributed, Highly Available, Datacenter-Aware Scheduler"
arch=('i686' 'x86_64')
url="https://www.nomadproject.io/"
@@ -18,14 +18,16 @@ backup=(etc/nomad/{server,client}.conf)
source=(https://github.com/hashicorp/nomad/archive/v$pkgver/$pkgname-$pkgver.tar.gz
nomad-{server,client}.{service,conf}
lxc-version-check.patch
- golang-crypto.patch)
+ golang-crypto.patch
+ container.patch)
sha256sums=('f74eac627de69190e586358b1956573a0ae1a40d0755ecdee163016949f9c7fe'
'52b0a22c3c0c72c642a8728cb48bd8797f4f6a12990e11bbb2342edcc2a9a206'
'da475bc4aa3b1493eb62f09e7f99dcc171e8ce6d74df3da30514cfdfe72a5714'
'4c8fb7c18c67ca20e3ee07f25cf2f0c82b66c4c173275ae8d643c91cce3c0ceb'
'ba80943ac42e617627c7e14be402078199ddba8d7e4276d67f0c9f6e6842d4a8'
'740cf838f4489b00fab8329c81ba21b1fae02e584d8fac2b5f88eeec76e4e62f'
- '75583a195b43d7345449bbac60359bf54661ccbd699386a6e59bb483c6054338')
+ '75583a195b43d7345449bbac60359bf54661ccbd699386a6e59bb483c6054338'
+ 'd7f483250456cb7b92a437661999786b7295628fc09e1a3b0769606902d82ef0')
prepare() {
mkdir -p src/github.com/hashicorp
@@ -54,6 +56,10 @@ prepare() {
pushd vendor/golang.org/x/crypto
patch -p1 -i "$srcdir"/golang-crypto.patch
+ popd
+
+ pushd vendor/gopkg.in/lxc/go-lxc.v2
+ patch -p0 -i "$srcdir"/container.patch
}
build() {
diff --git a/container.patch b/container.patch
new file mode 100644
index 00000000000..228f3d1af3e
--- /dev/null
+++ b/container.patch
@@ -0,0 +1,11 @@
+--- ../../../../../nomad-0.8.7.orig/vendor/gopkg.in/lxc/go-lxc.v2/container.go 2019-03-15 09:59:16.230241650 +0000
++++ container.go 2019-03-15 10:00:22.343574744 +0000
+@@ -767,7 +767,7 @@
+ c.mu.RLock()
+ defer c.mu.RUnlock()
+
+- var keys *_Ctype_char
++ var keys *C.char
+
+ if key != nil && len(key) == 1 {
+ ckey := C.CString(key[0])