Updated to 9.2.0

4 files changed, 27 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9eca8fdb2ade..a0b935f564e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = splunkforwarder
 	pkgdesc = Splunk Universal Forwarder
-	pkgver = 9.1.3.0
+	pkgver = 9.2.0.0
 	pkgrel = 1
 	epoch = 3
 	url = https://www.splunk.com/
@@ -12,12 +12,12 @@ pkgbase = splunkforwarder
 	source = splunkforwarder.service
 	source = splunkforwarder.sysusers
 	source = splunkforwarder.tmpfiles
-	sha256sums = 39bbd367e561fb2eac0be5bc23e32484d3728d0f5dde9cbcfd2295eff93ce8c3
+	sha256sums = a2e28b83efc9a390c490ae26f991eee99d7e122c6278b581b457c8b81757a9bc
 	sha256sums = 27d1d172add8c64a275ec3356f0fa0b9d56036a7e64b7b882e066a67f6173b5b
 	sha256sums = bca1b7720a827973f1c959cb78d788324f47dd6fcfc03bf4452c457f2d044db5
-	source_x86_64 = https://download.splunk.com/products/universalforwarder/releases/9.1.3/linux/splunkforwarder-9.1.3-d95b3299fa65-Linux-x86_64.tgz
-	sha256sums_x86_64 = c1127d75a697719dc6510204d4eb37cd2cc752c76f0f69561ab437d3d1434a40
-	source_aarch64 = https://download.splunk.com/products/universalforwarder/releases/9.1.3/linux/splunkforwarder-9.1.3-d95b3299fa65-Linux-armv8.tgz
-	sha256sums_aarch64 = 68172bf4592e3179491daffc6299201b1b658466401f85be303cd0e592dfcafa
+	source_x86_64 = https://download.splunk.com/products/universalforwarder/releases/9.2.0/linux/splunkforwarder-9.2.0-1fff88043d5f-Linux-x86_64.tgz
+	sha256sums_x86_64 = a39f1b33677dba5fe3ebc99e3a4b70658234ccd720e98e1fe0007e7f5559092e
+	source_aarch64 = https://download.splunk.com/products/universalforwarder/releases/9.2.0/linux/splunkforwarder-9.2.0-1fff88043d5f-Linux-armv8.tgz
+	sha256sums_aarch64 = 6f4f2cbbd9419977b6f4b90b0165aa3e6ed3017b1d89599cb047b47e805e690f
 
 pkgname = splunkforwarder
diff --git a/PKGBUILD b/PKGBUILD
index f57f31ca92f3..f99ebb7e79da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: L. Bradley LaBoon <me@bradleylaboon.com>
 pkgname=splunkforwarder
-basever=9.1.3
-splunkver=${basever}-d95b3299fa65
+basever=9.2.0
+splunkver=${basever}-1fff88043d5f
 # Splunk is inconsistent with the length of their version numbers
 if [ ${#basever} -gt 5 ]; then
 	pkgver=${basever}
@@ -19,11 +19,11 @@ install="$pkgname.install"
 source=("$pkgname.service" "$pkgname.sysusers" "$pkgname.tmpfiles")
 source_x86_64=("https://download.splunk.com/products/universalforwarder/releases/$basever/linux/$pkgname-$splunkver-Linux-x86_64.tgz")
 source_aarch64=("https://download.splunk.com/products/universalforwarder/releases/$basever/linux/$pkgname-$splunkver-Linux-armv8.tgz")
-sha256sums=('39bbd367e561fb2eac0be5bc23e32484d3728d0f5dde9cbcfd2295eff93ce8c3'
+sha256sums=('a2e28b83efc9a390c490ae26f991eee99d7e122c6278b581b457c8b81757a9bc'
             '27d1d172add8c64a275ec3356f0fa0b9d56036a7e64b7b882e066a67f6173b5b'
             'bca1b7720a827973f1c959cb78d788324f47dd6fcfc03bf4452c457f2d044db5')
-sha256sums_x86_64=('c1127d75a697719dc6510204d4eb37cd2cc752c76f0f69561ab437d3d1434a40')
-sha256sums_aarch64=('68172bf4592e3179491daffc6299201b1b658466401f85be303cd0e592dfcafa')
+sha256sums_x86_64=('a39f1b33677dba5fe3ebc99e3a4b70658234ccd720e98e1fe0007e7f5559092e')
+sha256sums_aarch64=('6f4f2cbbd9419977b6f4b90b0165aa3e6ed3017b1d89599cb047b47e805e690f')
 
 package() {
 	cd "$srcdir"
diff --git a/splunkforwarder.install b/splunkforwarder.install
index fedde081f4d6..d0c93c9c168a 100644
--- a/splunkforwarder.install
+++ b/splunkforwarder.install
@@ -28,7 +28,6 @@ post_install() {
 
 pre_upgrade() {
 	echo "Attempting to stop the installed Splunk Server..."
-	$SPLUNK_HOME/bin/splunk stop
 	systemctl stop splunkforwarder
 }
 
@@ -56,6 +55,5 @@ post_upgrade() {
 
 pre_remove() {
 	echo "Attempting to stop the installed Splunk Server..."
-	$SPLUNK_HOME/bin/splunk stop
 	systemctl stop splunkforwarder
 }
diff --git a/splunkforwarder.service b/splunkforwarder.service
index 47ecf4f846f0..05b086a5059c 100644
--- a/splunkforwarder.service
+++ b/splunkforwarder.service
@@ -1,17 +1,23 @@
 [Unit]
-Description=Splunk Forwarder
-Wants=network.target
-After=network.target
+Description=Splunk Universal Forwarder
+After=network-online.target
+Wants=network-online.target
 
 [Service]
-Type=forking
-RemainAfterExit=yes
+Type=simple
+Restart=always
+ExecStart=/opt/splunkforwarder/bin/splunk _internal_launch_under_systemd --answer-yes --no-prompt --accept-license
+KillMode=mixed
+KillSignal=SIGINT
+TimeoutStopSec=360
+LimitNOFILE=65536
+LimitRTPRIO=99
+SuccessExitStatus=51 52
+RestartPreventExitStatus=51
+RestartForceExitStatus=52
 User=splunk
-ExecStart=/opt/splunkforwarder/bin/splunk start --answer-yes --no-prompt --accept-license
-ExecStop=/opt/splunkforwarder/bin/splunk stop
-ExecReload=/opt/splunkforwarder/bin/splunk restart
-StandardOutput=syslog
-TimeoutSec=500
+Group=splunk
+NoNewPrivileges=yes
 
 [Install]
 WantedBy=multi-user.target