Sync with nongit influxdb; update to 0.12.2

5 files changed, 67 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ecbdd820c62..d8ff4641604b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,29 @@
 pkgbase = influxdb-git
 	pkgdesc = Scalable datastore for metrics, events, and real-time analytics
-	pkgver = v0.9.1.rc1.r447.gbe792b9
+	pkgver = 0.12.2.r1035.gf2bb9db
 	pkgrel = 1
 	url = http://influxdb.org/
 	install = influxdb.install
 	arch = i686
 	arch = x86_64
+	arch = armv6h
+	arch = armv7h
 	license = MIT
 	makedepends = autoconf
 	makedepends = protobuf
 	makedepends = bison
 	makedepends = flex
 	makedepends = go
+	makedepends = godep
 	makedepends = gawk
 	makedepends = mercurial
 	makedepends = git
+	makedepends = collectd
 	provides = influxdb
 	conflicts = influxdb
-	backup = etc/influxdb.conf
-	source = git+https://github.com/influxdb/influxdb.git
-	source = influxdb.service
+	backup = etc/influxdb/influxdb.conf
 	source = influxdb.install
 	md5sums = SKIP
-	md5sums = a73293aa5489a70bdfa01f8a5dfee359
-	md5sums = 37772f833acd9f5f8ac9c2bd3f1c3be8
 
 pkgname = influxdb-git
 
diff --git a/.gitignore b/.gitignore
index 4741610f131c..67d748065652 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,4 @@
-*
-!PKGBUILD
-!.SRCINFO
-!*.patch
-!*.desktop
-!*.install
-!*.service
-!*.sh
-!*.conf
-!.gitignore
-influxdb
+*.gz
+*.xz
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index 858bc716ece0..e45927e35e2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,68 +1,75 @@
-# Maintainer: Justin Dray <justin@dray.be>
+# Maintainer: Janusz Lewandowski <lew21@xtreeme.org>
 # Contributor: Nicolas Leclercq <nicolas.private@gmail.com>
 # Contributor: Charles B. Johnson <mail@cbjohnson.info>
 # Contributor: Daichi Shinozaki <dsdseg@gmail.com>
 # Contributor: Ben Alex <ben.alex@acegi.com.au>
 
-_pkgname='influxdb'
-pkgname="$_pkgname-git"
-pkgver=v0.9.1.rc1.r447.gbe792b9
+pkgname='influxdb-git'
+_gitname='influxdb'
+pkgver=0.12.2.r1035.gf2bb9db
 pkgrel=1
 epoch=
 pkgdesc='Scalable datastore for metrics, events, and real-time analytics'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url='http://influxdb.org/'
 license=('MIT')
 groups=()
-makedepends=('autoconf' 'protobuf' 'bison' 'flex' 'go' 'gawk' 'mercurial' 'git')
+depends=()
+makedepends=('autoconf' 'protobuf' 'bison' 'flex' 'go' 'godep' 'gawk' 'mercurial' 'git' 'collectd')
 checkdepends=()
+optdepends=()
 provides=('influxdb')
 conflicts=('influxdb')
-backup=('etc/influxdb.conf')
+replaces=()
+backup=('etc/influxdb/influxdb.conf')
 options=()
-install="$_pkgname.install"
+install="influxdb.install"
+source=("influxdb.install")
 changelog=
-source=("git+https://github.com/influxdb/influxdb.git"
-        "$_pkgname.service"
-	"$_pkgname.install")
-noextract=()
-md5sums=('SKIP'
-         'a73293aa5489a70bdfa01f8a5dfee359'
-         '37772f833acd9f5f8ac9c2bd3f1c3be8')
+noextract=("$pkgtar")
+md5sums=('SKIP')
 
-pkgver() {
-	cd "$_pkgname"
-	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-build() {
-	export GOPATH="$srcdir"
-	mkdir -p "$srcdir/src/github.com/influxdb"
-	mv "$srcdir/influxdb" "$srcdir/src/github.com/influxdb/"
-	cd "$srcdir/src/github.com/influxdb/influxdb"
-	go get -u -f ./...
-	go build ./...
-	go install ./...
+prepare()
+{
+  export GOPATH="${srcdir}"
+  export GOBIN="$GOPATH/bin"
+  export INFLUXDBPATH="$GOPATH/src/github.com/influxdata/influxdb"
+  if [ -d $GOBIN ]; then
+    rm -rf $GOBIN;
+  fi;
 
-	sed -i 's|/var/opt|/var/lib|g' etc/config.sample.toml
+  go get github.com/influxdata/influxdb
+  cd $INFLUXDBPATH
+  go get github.com/sparrc/gdm
+  $GOBIN/gdm restore
 }
-
-check() {
-  cd "$srcdir/src/github.com/influxdb/influxdb"
-  # Required for testing
-  go get github.com/davecgh/go-spew/spew
-  go test -v ./...
+pkgver() {
+  cd $INFLUXDBPATH
+  # cutting off 'v' prefix that presents in the git tag
+  git describe --long --tags | sed 's/^v0.10.0/0.12.2/;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
-
-package() {
+build()
+{
+  cd $INFLUXDBPATH
+  commit=`git rev-parse HEAD`
+  echo "Building $pkgname version=${pkgver} commit=$commit"
+  go install -ldflags="-X main.version=${pkgver} -X main.commit=$commit" ./...
+}
+package()
+{
   # systemctl service file
-  install -D -m644  "$srcdir/influxdb.service" "$pkgdir/usr/lib/systemd/system/influxdb.service"
+  install -D -m644  "$INFLUXDBPATH/scripts/influxdb.service" "$pkgdir/usr/lib/systemd/system/influxdb.service"
 
-  # influxdb binary
-  install -D -m755 "$srcdir/bin/influx" "$pkgdir/usr/bin/influx"
-  install -D -m755 "$srcdir/bin/influxd" "$pkgdir/usr/bin/influxd"
-  install -D -m755 "$srcdir/bin/urlgen" "$pkgdir/usr/bin/urlgen"
+  # binaries
+  install -D -m755 "$GOBIN/influxd" "$pkgdir/usr/bin/influxd"
+  install -D -m755 "$GOBIN/influx" "$pkgdir/usr/bin/influx"
+
+  # migration tool from 0.9 to 0.10
+  install -D -m755 "$GOBIN/influx_tsm" "$pkgdir/usr/bin/influx_tsm"
 
   # configuration file
-  install -D -m644 "$srcdir/src/github.com/influxdb/influxdb/etc/config.sample.toml" "$pkgdir/etc/influxdb.conf"
+  install -D -m644 "$INFLUXDBPATH/etc/config.sample.toml" "${pkgdir}/etc/influxdb/influxdb.conf"
+
+  # license
+  install -Dm644 "$INFLUXDBPATH/LICENSE" "${pkgdir}/usr/share/licenses/influxdb/LICENSE"
 }
diff --git a/influxdb.install b/influxdb.install
index 8d0db568fc83..826bc624169c 100644
--- a/influxdb.install
+++ b/influxdb.install
@@ -1,12 +1,16 @@
 post_install() {
   post_upgrade
+  passwd -l influxdb &>/dev/null
 }
 
 post_upgrade() {
   # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files
-  getent group influxdb >/dev/null || groupadd -r influxdb
-  getent passwd influxdb >/dev/null || useradd -c 'InfluxDB' -r -g influxdb -d '/var/lib/influxdb' -m -s /bin/bash influxdb
-  mkdir -p /var/lib/influxdb/{db,raft,hh}
+  getent group influxdb >/dev/null || groupadd influxdb
+  getent passwd influxdb >/dev/null || useradd -c 'InfluxDB' -g influxdb -d '/var/lib/influxdb' -m -s /bin/false influxdb
+  mkdir -p /var/lib/influxdb/data
+  mkdir -p /var/lib/influxdb/wal
+  mkdir -p /var/lib/influxdb/meta
+  mkdir -p /var/lib/influxdb/hh
   chown influxdb:influxdb -R /var/lib/influxdb
 
   mkdir -p /var/log/influxdb
diff --git a/influxdb.service b/influxdb.service
deleted file mode 100644
index 67d6bc68b13e..000000000000
--- a/influxdb.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=InfluxDB
-
-[Service]
-User=influxdb
-Group=influxdb
-Type=simple
-LimitNOFILE=4096
-ExecStart=/usr/bin/influxd -config /etc/influxdb.conf
-RuntimeDirectory=influxdb
-RuntimeDirectoryMode=0755
-
-[Install]
-WantedBy=multi-user.target