Date: Tuesday, February 12, 2013 @ 12:23:56 Author: mtorromeo Revision: 84157
upgpkg: openfire 3.8.0-1 Updated to version 3.8.0 Modified: openfire/trunk/PKGBUILD Deleted: openfire/trunk/jdk7.patch openfire/trunk/openfire ------------+ PKGBUILD | 12 ++++-------- jdk7.patch | 12 ------------ openfire | 57 --------------------------------------------------------- 3 files changed, 4 insertions(+), 77 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-02-12 11:21:16 UTC (rev 84156) +++ PKGBUILD 2013-02-12 11:23:56 UTC (rev 84157) @@ -3,8 +3,8 @@ # Contributor: Pierre Schmitz <[email protected]> pkgname=openfire -pkgver=3.7.1 -pkgrel=8 +pkgver=3.8.0 +pkgrel=1 pkgdesc="High performance XMPP (Jabber) server." arch=('any') url='http://www.igniterealtime.org/projects/openfire/' @@ -17,11 +17,10 @@ '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' 'openfire.conf' 'jdk7.patch' 'openfire.service') + 'openfire.conf' 'openfire.service') build() { cd "$srcdir/openfire_src/build" - patch -p1 -i "$srcdir/jdk7.patch" rm -rf ../src/resources/nativeAuth/ ant openfire # ant plugins @@ -34,7 +33,6 @@ install -dm750 "$pkgdir/etc/openfire" "$pkgdir/var/log/openfire" install -Dm644 "$srcdir/openfire.conf" "$pkgdir/etc/conf.d/openfire" - install -Dm775 "$srcdir/openfire" "$pkgdir/etc/rc.d/openfire" install -Dm644 "$srcdir/openfire.service" "$pkgdir/usr/lib/systemd/system/openfire.service" rm -rf bin logs @@ -50,8 +48,6 @@ cp -R lib "$pkgdir/usr/lib/openfire" } -sha256sums=('d2f3da24af2bb5c173b181cbf5219b7f042c884b5f0e881d044d72093e4837d2' - '8d217e86957dd0a7ab9f858100559eaa0c56ba225eb6d0a091f09a77b1e75bf4' +sha256sums=('d8d19221e258d8ec810a6e497a646ff109789ecd645b178976858165212bf930' 'c8a612abee90bdc9a2869e562a4bbbf596159c60adcd23368833a0e2ca27c1d4' - 'b5db0bf4ea3eff7a91e54344b47a4fa2fc75a4bb1c1f5be2fa5d038622452886' '772332b66a90935ddb8075eb10eab9b95a84caa45908bb3fa5861d7fa148399c') Deleted: jdk7.patch =================================================================== --- jdk7.patch 2013-02-12 11:21:16 UTC (rev 84156) +++ jdk7.patch 2013-02-12 11:23:56 UTC (rev 84157) @@ -1,12 +0,0 @@ ---- build/build.xml 2011-10-01 23:50:12.000000000 +0200 -+++ build/build.xml 2011-10-22 08:38:53.434596847 +0200 -@@ -233,7 +233,8 @@ - <not> - <or> - <contains string="${ant.java.version}" substring="1.5"/> -- <contains string="${ant.java.version}" substring="1.6"/> -+ <contains string="${ant.java.version}" substring="1.6"/> -+ <contains string="${ant.java.version}" substring="1.7"/> - </or> - </not> - </condition> Deleted: openfire =================================================================== --- openfire 2013-02-12 11:21:16 UTC (rev 84156) +++ openfire 2013-02-12 11:23:56 UTC (rev 84157) @@ -1,57 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/profile.d/jre.sh - -[ -f "/etc/conf.d/openfire" ] && . /etc/conf.d/openfire - -OPENFIRE_HOME="/usr/share/openfire" -OPENFIRE_LOGDIR="/var/log/openfire" -OPENFIRE_LIB="/usr/lib/openfire" - -OPENFIRE_RUN_CMD="java -server ${OPENFIRE_OPTS} -DopenfireHome=${OPENFIRE_HOME} -Dopenfire.lib.dir=${OPENFIRE_LIB} -classpath ${OPENFIRE_LIB}/startup.jar -jar ${OPENFIRE_LIB}/startup.jar" - - -case "$1" in - start) - stat_busy "Starting Openfire Daemon" - - rm -f $OPENFIRE_LOGDIR/nohup.out - su -s /bin/sh -c "nohup $OPENFIRE_RUN_CMD > $OPENFIRE_LOGDIR/nohup.out 2>&1 &" openfire - sleep 2 - - RETVAL=$? - PID=`ps ax --width=1000 | grep openfire | grep startup.jar | awk '{print $1}'` - - if [ $RETVAL -eq 0 -a ! -z "$PID" ]; then - echo $PID > /var/run/openfire.pid - - add_daemon openfire - sleep 2 - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping Openfire Daemon" - - kill `cat /var/run/openfire.pid` - - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/openfire.pid - rm_daemon openfire - stat_done - fi - ;; - restart) - $0 stop - sleep 10 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac
