From 0f8202dffed29d77a0dbd9cafc1b4ef8d4985a53 Mon Sep 17 00:00:00 2001 From: "L. Bradley LaBoon" Date: Wed, 28 Sep 2016 17:48: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 19702a4b89123..cc4028c147b5d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Wed Sep 28 14:38:51 UTC 2016 +# Wed Sep 28 21:47:49 UTC 2016 pkgbase = splunkforwarder pkgdesc = Splunk Universal Forwarder pkgver = 6.5.0_59c8927def0f - pkgrel = 2 + pkgrel = 3 url = http://www.splunk.com/ install = splunkforwarder.install arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index e0123726e5333..ef15d2dff171f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=splunkforwarder basever=6.5.0 pkgver=${basever}_59c8927def0f -pkgrel=2 +pkgrel=3 pkgdesc="Splunk Universal Forwarder" url="http://www.splunk.com/" arch=('x86_64' 'i686') @@ -22,8 +22,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" }