Update Jira to 7.2.1 and cleanup PKGBUILD to match atlassian-confluence package

5 files changed, 97 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ebcb0025acc..65fd1862c761 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,23 @@
+# Generated by mksrcinfo v8
+# Fri Sep 16 21:56:58 UTC 2016
 pkgbase = atlassian-jira
 	pkgdesc = Bug tracking, issue tracking and project management software
-	pkgver = 7.1.8
+	pkgver = 7.2.1
 	pkgrel = 1
 	url = https://www.atlassian.com/software/jira
 	install = jira.install
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = custom
-	depends = java-runtime>=7
+	depends = java-environment=8
 	optdepends = mysql-connector-java: connect to MySQL
-	optdepends = libcups: used by bin/config.sh
-	optdepends = fontconfig: used by bin/config.sh
 	backup = etc/conf.d/jira
-	backup = opt/atlassian-jira/conf/server.xml
-	backup = opt/atlassian-jira/atlassian-jira/WEB-INF/classes/jira-application.properties
-	source = https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-7.1.8-jira-7.1.8.tar.gz
+	backup = etc/webapps/atlassian-jira/server.xml
+	source = https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-core-7.2.1.tar.gz
 	source = jira.conf.d
 	source = jira.service
-	sha256sums = 75c97a8ec9a7f206bcb6337ecb95decf905a22b148cdbe8e890a8da5d3764a0c
-	sha256sums = d1ca27e15edb0032a37b1b0df302209e78d11671d44b6a239a017be9881708d0
-	sha256sums = cff80b2a8f930ba3d1c11df809afa11ffe29b78d946689cb588b1ce2f4c01e5d
+	sha256sums = 5ee23a97049080e1379a038635d719f0c694de6fa35aa945d87783f683ba9a6d
+	sha256sums = a6304ba13a8ab1e27761bd3be71d05d2c2e3d61ea308316f4a04723ea4b30fc1
+	sha256sums = 8537696c3b24a3ff6e91a39796f04d505dbbe5723e7985592ff7bb0196761c80
 
 pkgname = atlassian-jira
 
diff --git a/PKGBUILD b/PKGBUILD
index 169eb25f9bb1..bbb632ae4d42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,55 @@
-# Maintainer: rob2uk <rob22uk at gmail dot com>
+# Maintainer: Dennis Stengele <dennis@stengele.me>
+# Contributor: rob2uk <rob22uk at gmail dot com>
 # Contributor: Vlad <vlad@archlinux.net>
 # Contributor: Sebastien Bariteau <numkem@gmail.com>
 
 pkgname=atlassian-jira
-pkgver=7.1.8
+pkgver=7.2.1
 pkgrel=1
 pkgdesc="Bug tracking, issue tracking and project management software"
 url="https://www.atlassian.com/software/jira"
 license=('custom')
-arch=('i686' 'x86_64')
-depends=('java-runtime>=7')
-optdepends=('mysql-connector-java: connect to MySQL'
-'libcups: used by bin/config.sh'
-'fontconfig: used by bin/config.sh')
+arch=('any')
+depends=('java-environment=8')
+optdepends=('mysql-connector-java: connect to MySQL')
 backup=('etc/conf.d/jira'
-'opt/atlassian-jira/conf/server.xml'
-'opt/atlassian-jira/atlassian-jira/WEB-INF/classes/jira-application.properties')
+        'etc/webapps/atlassian-jira/server.xml')
 install='jira.install'
-source=("https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${pkgver}-jira-${pkgver}.tar.gz"
+source=("https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-core-${pkgver}.tar.gz"
         'jira.conf.d'
         'jira.service')
-sha256sums=('75c97a8ec9a7f206bcb6337ecb95decf905a22b148cdbe8e890a8da5d3764a0c'
-            'd1ca27e15edb0032a37b1b0df302209e78d11671d44b6a239a017be9881708d0'
-            'cff80b2a8f930ba3d1c11df809afa11ffe29b78d946689cb588b1ce2f4c01e5d')
+sha256sums=('5ee23a97049080e1379a038635d719f0c694de6fa35aa945d87783f683ba9a6d'
+            'a6304ba13a8ab1e27761bd3be71d05d2c2e3d61ea308316f4a04723ea4b30fc1'
+            '8537696c3b24a3ff6e91a39796f04d505dbbe5723e7985592ff7bb0196761c80')
 
 package() {
-mkdir -p "${pkgdir}/opt/atlassian-jira/"
-cp -r ${srcdir}/atlassian-jira-software-${pkgver}-standalone/* ${pkgdir}/opt/atlassian-jira/
-# remove unneeded *.bat files
-find "${pkgdir}/opt/atlassian-jira/bin" -name '*.bat' -type f -exec rm "{}" \;
-
-# Setup systemd service
-install -dm755 "${pkgdir}/usr/lib/systemd/system"
-install -Dm644 "${srcdir}/jira.service" "${pkgdir}/usr/lib/systemd/system"
-install -Dm644 "${srcdir}/jira.conf.d" "${pkgdir}/etc/conf.d/jira"
+    mkdir -p "$pkgdir/opt/atlassian-jira/"
+    cp -r "$srcdir/atlassian-jira-core-$pkgver-standalone/"* "$pkgdir/opt/atlassian-jira/"
+
+    # Copy License
+    mkdir -p "${pkgdir}/usr/share/licenses/atlassian-jira"
+    cp "${pkgdir}/opt/atlassian-jira/licenses/com.atlassian.ip--atlassian-ip--3.0.txt" "${pkgdir}/usr/share/licenses/atlassian-jira/LICENSE"
+
+    # remove unneeded files
+    find "$pkgdir/opt/atlassian-jira/bin" -name '*.bat' -type f -exec rm "{}" \;
+    find "$pkgdir/opt/atlassian-jira/bin" -name '*.exe' -type f -exec rm "{}" \;
+    find "$pkgdir/opt/atlassian-jira/bin" -name '*.dll' -type f -exec rm "{}" \;
+    find "$pkgdir/opt/atlassian-jira/bin" -name '*.x64' -type f -exec rm "{}" \;
+    find "$pkgdir/opt/atlassian-jira/bin" -name '*.sh' -type f -exec rm "{}" \;
+    find "$pkgdir/opt/atlassian-jira/bin" -name '*.command' -type f -exec rm "{}" \;
+
+    # Set home dir
+    echo "jira.home=/var/opt/atlassian-jira" > "$pkgdir/opt/atlassian-jira/atlassian-jira/WEB-INF/classes/jira-application.properties"
+
+    # Move server.xml to /etc and create symlink
+    mkdir -p "${pkgdir}/etc/webapps/atlassian-jira"
+    mv "${pkgdir}/opt/atlassian-jira/conf/server.xml" "${pkgdir}/etc/webapps/atlassian-jira/server.xml"
+    ln -s "/etc/webapps/atlassian-jira/server.xml" "${pkgdir}/opt/atlassian-jira/conf/server.xml"
+
+    # Create home directory
+    install -dm755 "$pkgdir/var/opt/atlassian-jira"
+
+    # Install systemd unit
+    install -Dm644 "$srcdir/jira.service" "$pkgdir/usr/lib/systemd/system/jira.service"
+    install -Dm644 "$srcdir/jira.conf.d" "$pkgdir/etc/conf.d/jira"
 }
diff --git a/jira.conf.d b/jira.conf.d
index ceb6441de5e3..46b80a39a840 100644
--- a/jira.conf.d
+++ b/jira.conf.d
@@ -1 +1 @@
-CATALINA_HOME=/opt/atlassian-jira
+JAVA_OPTS="-Xms1024M -Xmx1024M"
diff --git a/jira.install b/jira.install
index e693334239dd..fa201c2ebb67 100644
--- a/jira.install
+++ b/jira.install
@@ -1,10 +1,16 @@
 post_install() {
-  if ! getent passwd jira > /dev/null; then
-    useradd -r jira
-  fi
-  chown -R jira:jira '/opt/atlassian-jira'
+    if ! getent passwd jira > /dev/null; then
+        useradd -r jira
+    fi
+
+    chown -R jira:jira /opt/atlassian-jira/{logs,temp,webapps,work,conf} /var/opt/atlassian-jira
 }
 
-post_upgrade() {
-  chown -R jira:jira '/opt/atlassian-jira'
+pre_upgrade() {
+    systemctl stop jira.service
 }
+
+post_upgrade() {
+    chown -R jira:jira /opt/atlassian-jira/{logs,temp,webapps,work,conf} /var/opt/atlassian-jira
+    systemctl start jira.service
+    }
diff --git a/jira.service b/jira.service
index dc604f170077..6573e4ac1fe3 100644
--- a/jira.service
+++ b/jira.service
@@ -1,13 +1,42 @@
 [Unit]
-Description=JIRA
-After=network.target
+Description=Atlassian Jira Service
+After=syslog.target network.target
 
 [Service]
-Type=forking
 User=jira
+Type=simple
+SyslogIdentifier=jira
+Environment="CATALINA_HOME=/opt/atlassian-jira"
+Environment="CATALINA_BASE=/opt/atlassian-jira"
+Environment="CATALINA_TMPDIR=/opt/atlassian-jira/temp"
+Environment="JAVA_HOME=/usr/lib/jvm/default"
+Environment="CLASSPATH=/opt/atlassian-jira/bin/bootstrap.jar:/opt/atlassian-jira/bin/tomcat-juli.jar"
 EnvironmentFile=-/etc/conf.d/jira
-ExecStart=/opt/atlassian-jira/bin/startup.sh
-ExecStop=/opt/atlassian-jira/bin/shutdown.sh
+SuccessExitStatus=143
+
+ExecStart=/usr/bin/env ${JAVA_HOME}/bin/java \
+$JAVA_OPTS $CATALINA_OPTS \
+-classpath ${CLASSPATH} \
+-Dcatalina.base=${CATALINA_BASE} \
+-Dcatalina.home=${CATALINA_HOME} \
+-Djava.endorsed.dirs=${JAVA_ENDORSED_DIRS} \
+-Djava.io.tmpdir=${CATALINA_TMPDIR} \
+-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties \
+-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
+org.apache.catalina.startup.Bootstrap \
+start
+
+ExecStop=/usr/bin/env ${JAVA_HOME}/bin/java \
+$JAVA_OPTS \
+-classpath ${CLASSPATH} \
+-Dcatalina.base=${CATALINA_BASE} \
+-Dcatalina.home=${CATALINA_HOME} \
+-Djava.endorsed.dirs=${JAVA_ENDORSED_DIRS} \
+-Djava.io.tmpdir=${CATALINA_TMPDIR} \
+-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties \
+-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
+org.apache.catalina.startup.Bootstrap \
+stop
 
 [Install]
 WantedBy=multi-user.target