[arch-commits] Commit in openfire/trunk (PKGBUILD openfire.service)

[Massimiliano Torromeo]

    Date: Monday, March 5, 2018 @ 09:07:31
  Author: mtorromeo
Revision: 302531

FIXED FS#57709

Modified:
  openfire/trunk/PKGBUILD
  openfire/trunk/openfire.service

------------------+
 PKGBUILD         |    9 ++++-----
 openfire.service |    3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-05 09:07:08 UTC (rev 302530)
+++ PKGBUILD	2018-03-05 09:07:31 UTC (rev 302531)
@@ -4,7 +4,7 @@
 
 pkgname=openfire
 pkgver=4.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="High performance XMPP (Jabber) server."
 arch=('any')
 url='http://www.igniterealtime.org/projects/openfire/'
@@ -11,9 +11,8 @@
 license=('APACHE')
 depends=('java-runtime-headless')
 makedepends=('apache-ant')
-backup=('etc/openfire/openfire.xml' 'etc/openfire/openfire.xml' 'etc/openfire/openfire.xml' \
-        'etc/conf.d/openfire' 'etc/openfire/security/keystore' 'etc/openfire/security/truststore' \
-        'etc/openfire/security/client.truststore')
+backup=('etc/openfire/openfire.xml' 'etc/conf.d/openfire' 'etc/openfire/security/keystore' \
+        'etc/openfire/security/truststore' 'etc/openfire/security/client.truststore')
 source=("http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_src_${pkgver//./_}.tar.gz" \
         'openfire.conf'
         'openfire.service'
@@ -21,7 +20,7 @@
         'tmpfile.conf')
 sha256sums=('a9fa56332cec9437c751644bf23dbbf65a332605493d4780b97b0da4a5febe7d'
             'c8a612abee90bdc9a2869e562a4bbbf596159c60adcd23368833a0e2ca27c1d4'
-            '772332b66a90935ddb8075eb10eab9b95a84caa45908bb3fa5861d7fa148399c'
+            'cc04a614686d3f9ce3b83b5fcfb7c5f4cd5ddb8c4c06830c04f26869f2e8fa5b'
             '743d07158d40f3690684a078d5f35c53c819e45d4ff0c2016b0f33662363614f'
             '020333e30c121dc1ec1e4aac669fdb3bcff9b2fdca94f8a114bf33abdac91992')
 

Modified: openfire.service
===================================================================
--- openfire.service	2018-03-05 09:07:08 UTC (rev 302530)
+++ openfire.service	2018-03-05 09:07:31 UTC (rev 302531)
@@ -7,7 +7,8 @@
 User=openfire
 Group=openfire
 PrivateTmp=true
-ExecStart=/usr/bin/java -server -DopenfireHome=/usr/share/openfire -Dopenfire.lib.dir=/usr/lib/openfire -classpath /usr/lib/openfire/startup.jar -jar /usr/lib/openfire/startup.jar
+EnvironmentFile=/etc/conf.d/openfire
+ExecStart=/usr/bin/java -server $OPENFIRE_OPTS -DopenfireHome=/usr/share/openfire -Dopenfire.lib.dir=/usr/lib/openfire -classpath /usr/lib/openfire/startup.jar -jar /usr/lib/openfire/startup.jar
 SuccessExitStatus=143 SIGKILL
 
 [Install]