From 2584d9d56b2136c5016764c404f26fc55b91be54 Mon Sep 17 00:00:00 2001 From: "L. Bradley LaBoon" Date: Wed, 28 Sep 2016 17:47:10 -0400 Subject: [PATCH] Reverted back to keeping users.ini. Users will have to remediate on their own --- .SRCINFO | 4 ++-- PKGBUILD | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 41aae38d417e8..112dd0807b71c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Wed Sep 28 14:36:45 UTC 2016 +# Wed Sep 28 21:46:35 UTC 2016 pkgbase = splunk pkgdesc = Statistical analysis and search tool for logs and machine data pkgver = 6.5.0_59c8927def0f - pkgrel = 2 + pkgrel = 3 url = http://www.splunk.com/ install = splunk.install arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index f7876b9dda42f..365fb799fe202 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=splunk basever=6.5.0 pkgver=${basever}_59c8927def0f -pkgrel=2 +pkgrel=3 pkgdesc="Statistical analysis and search tool for logs and machine data" url="http://www.splunk.com/" arch=('x86_64' 'i686') @@ -21,8 +21,4 @@ package() { install -Dm644 "$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service" mkdir "$pkgdir/opt" cp -r "$pkgname" "$pkgdir/opt/" - - # This file causes conflicts with existing installs - # and ships empty anyway, so just remove it - rm "$pkgdir/opt/$pkgname/etc/users/users.ini" }