upgpkg: newrelic-php5 10.9.0.324-1

5 files changed, 18 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e3c25c8c488d..b625edbd9db4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,15 @@
 pkgbase = newrelic-php5
 	pkgdesc = PHP Monitoring Agent
-	pkgver = 10.3.0.315
+	pkgver = 10.9.0.324
 	pkgrel = 1
 	url = https://newrelic.com/php
 	install = newrelic-php5.install
 	arch = x86_64
-	arch = i686
 	license = Apache
 	depends = php
-	noextract = newrelic-php5-10.3.0.315.tar.gz
+	noextract = newrelic-php5-10.9.0.324.tar.gz
 	backup = etc/php/conf.d/newrelic.ini
-	source = newrelic-php5-10.3.0.315.tar.gz::https://download.newrelic.com/php_agent/archive/10.3.0.315/newrelic-php5-10.3.0.315-linux.tar.gz
-	source = newrelic-daemon.service
-	b2sums = dec058af592704078f1cc3cb95312127fb786fb8fde9bfa31c98bbbb12b7f9ebf98639e31952b7aec0c2671d084d51e97d2bce9b957a6772df8f4f3e75de5f43
-	b2sums = 02b3199ad7edf6ab14207b01f971c7fada8e69c351b04e74fd2d1847900b5ff48591c5f21e862afdf1cbfe3a10256238092a5535addbc554f4f26dd7cb19f5da
+	source = newrelic-php5-10.9.0.324.tar.gz::https://download.newrelic.com/php_agent/archive/10.9.0.324/newrelic-php5-10.9.0.324-linux.tar.gz
+	b2sums = aff4c634414cd8acd6588d92bea998b7d6b556fa4d6d208df0118180630e04387ca3da0b0af071b7099f15c282a64e04693c7831369d41da7462bd3f75ae49e2
 
 pkgname = newrelic-php5
diff --git a/.gitignore b/.gitignore
index 26c36dd03649..457f736675e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *
 !.gitignore
 !.SRCINFO
-!newrelic-daemon.service
 !newrelic-php5.install
 !PKGBUILD
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 1b872dffb0fa..30fdac33e585 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,22 @@
-# Maintainer: Ivan Gabaldon <ivan [d0t] gab [at] inetol [d0t] net>
+# Maintainer: Ivan Gabaldon <aur[at]inetol[dot]net>
 # Contributor: Kim Brandt <myrveln@gmail.com>
 # Contributor: Vinh Nguyen <kurei [at] axcoto.com>
 # Contributor: Felix Yan <felixonmars@archlinux.org>
 
 pkgname=newrelic-php5
-pkgver=10.3.0.315
+pkgver=10.9.0.324
 _libver=20210902
 pkgrel=1
 pkgdesc='PHP Monitoring Agent'
-arch=('x86_64' 'i686')
+arch=('x86_64')
 url='https://newrelic.com/php'
 license=('Apache')
 depends=('php')
 backup=('etc/php/conf.d/newrelic.ini')
 install="$pkgname.install"
-source=("$pkgname-$pkgver.tar.gz::https://download.newrelic.com/php_agent/archive/$pkgver/$pkgname-$pkgver-linux.tar.gz"
-        'newrelic-daemon.service')
+source=("$pkgname-$pkgver.tar.gz::https://download.newrelic.com/php_agent/archive/$pkgver/$pkgname-$pkgver-linux.tar.gz")
 noextract=("$pkgname-$pkgver.tar.gz")
-b2sums=('dec058af592704078f1cc3cb95312127fb786fb8fde9bfa31c98bbbb12b7f9ebf98639e31952b7aec0c2671d084d51e97d2bce9b957a6772df8f4f3e75de5f43'
-        '02b3199ad7edf6ab14207b01f971c7fada8e69c351b04e74fd2d1847900b5ff48591c5f21e862afdf1cbfe3a10256238092a5535addbc554f4f26dd7cb19f5da')
+b2sums=('aff4c634414cd8acd6588d92bea998b7d6b556fa4d6d208df0118180630e04387ca3da0b0af071b7099f15c282a64e04693c7831369d41da7462bd3f75ae49e2')
 
 prepare() {
     mkdir -p "$pkgname-$pkgver"
@@ -26,22 +24,14 @@ prepare() {
 }
 
 package() {
-    if [ "$CARCH" == 'x86_64' ]; then
-        install -Dm755 "$srcdir/$pkgname-$pkgver/daemon/newrelic-daemon.x64" "$pkgdir/usr/bin/newrelic-daemon"
+    install -Dm755 "$srcdir/$pkgname-$pkgver/daemon/newrelic-daemon.x64" "$pkgdir/usr/bin/newrelic-daemon"
 
-        install -Dm755 "$srcdir/$pkgname-$pkgver/agent/x64/newrelic-$_libver-zts.so" "$pkgdir/usr/lib/php/modules/newrelic-zts.so"
-        install -Dm755 "$srcdir/$pkgname-$pkgver/agent/x64/newrelic-$_libver.so" "$pkgdir/usr/lib/php/modules/newrelic.so"
-    elif [ "$CARCH" == 'i686' ]; then
-        install -Dm755 "$srcdir/$pkgname-$pkgver/daemon/newrelic-daemon.x86" "$pkgdir/usr/bin/newrelic-daemon"
-
-        install -Dm755 "$srcdir/$pkgname-$pkgver/agent/x86/newrelic-$_libver-zts.so" "$pkgdir/usr/lib/php/modules/newrelic-zts.so"
-        install -Dm755 "$srcdir/$pkgname-$pkgver/agent/x86/newrelic-$_libver.so" "$pkgdir/usr/lib/php/modules/newrelic.so"
-    fi
+    install -Dm755 "$srcdir/$pkgname-$pkgver/agent/x64/newrelic-$_libver-zts.so" "$pkgdir/usr/lib/php/modules/newrelic-zts.so"
+    install -Dm755 "$srcdir/$pkgname-$pkgver/agent/x64/newrelic-$_libver.so" "$pkgdir/usr/lib/php/modules/newrelic.so"
 
     install -Dm644 "$srcdir/$pkgname-$pkgver/scripts/newrelic.ini.template" "$pkgdir/etc/php/conf.d/newrelic.ini.template"
     install -Dm644 "$srcdir/$pkgname-$pkgver/scripts/newrelic.ini.template" "$pkgdir/etc/php/conf.d/newrelic.ini"
-
-    install -Dm644 "$srcdir/newrelic-daemon.service" "$pkgdir/usr/lib/systemd/system/newrelic-daemon.service"
+    install -Dm644 "$srcdir/$pkgname-$pkgver/scripts/newrelic-daemon.service" "$pkgdir/usr/lib/systemd/system/newrelic-daemon.service"
 
     install -Dm644 "$srcdir/$pkgname-$pkgver/README.txt" "$pkgdir/usr/share/doc/$pkgname/README"
     install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/newrelic-daemon.service b/newrelic-daemon.service
deleted file mode 100644
index 783c2c4e3b0e..000000000000
--- a/newrelic-daemon.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=NewRelic PHP Proxy Daemon
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/newrelic-php5.pid
-ExecStart=/usr/bin/newrelic-daemon -c /etc/newrelic/newrelic.cfg -p /run/newrelic-php5.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/newrelic-php5.install b/newrelic-php5.install
index 6298ff8973ec..c3b67aff3ce3 100755
--- a/newrelic-php5.install
+++ b/newrelic-php5.install
@@ -6,13 +6,16 @@ post_install() {
     mkdir -p /var/log/newrelic
     chmod 755 /var/log/newrelic
 
+    # Enable the service
+    systemctl enable newrelic-daemon.service
+
     # When first installing the package, the license key will not be set.
     # Instead of throwing an error, we want to whine to the user and then exit cleanly.
     if sed -e '/^[        ]*#/d' "${inifile}" 2> /dev/null | grep -q 'REPLACE_WITH_REAL_KEY' 2> /dev/null; then
         if [ -z "${NR_SILENT}" -a -z "${SILENT}" ]; then
             echo \
 "
-:: The service cannot be enabled/started until a valid licence is inserted in the following file:
+:: The service cannot be started until a valid licence is inserted in the following file:
 
    /etc/php/conf.d/newrelic.ini
 
@@ -25,7 +28,7 @@ post_install() {
    Get your license key in \"Settings\" of the \"Support\" menu in your NewRelic account.
    (accessible at https://rpm.newrelic.com)
 
-:: Once the license key is configured, enable/start the NewRelic daemon, PHP and the web server.
+:: Once the license key is configured, start the NewRelic daemon, PHP and the web server.
 "
         fi
         return 0