Latest debian work (JM-765)

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@8111 b35dd754-fafc-0310-a699-88a17e54d16e

build/debian/changelog

-wildfire (@version@) unstable; urgency=medium
+openfire (@version@) unstable; urgency=medium
 
   * For full changelog, see http://www.igniterealtime.org/builds/wildfire/docs/latest/changelog.html
 

build/debian/control

@@ -2,13 +2,13 @@ Source: openfire
 Section: net
 Priority: optional
 Maintainer: Jive Software <webmaster@jivesoftware.com>
-Build-Depends: debhelper (>= 5), sun-java5-jdk, ant
+Build-Depends: debhelper (>= 5), cdbs, patchutils, sun-java5-jdk, ant
 Standards-Version: 3.7.2
 
 Package: openfire
 Section: net
 Priority: optional
-Depends: sun-java5-jdk
+Depends: sun-java5-jre
 Architecture: all
 Description: A high performance XMPP (Jabber) server.
  Openfire is an instant messaging server that implements the XMPP

build/debian/openfire.conffiles

-/etc/openfire/wildfire.xml
+/etc/openfire/openfire.xml
 /etc/openfire/security/keystore
 /etc/openfire/security/truststore

build/debian/openfire.dirs

-/etc/
-/opt/
+/etc/openfire
+/usr/share/openfire/lib
+/usr/share/openfire/resources
 /var/log/openfire
+/var/lib/openfire/embedded-db

build/debian/openfire.init.d

-#! /bin/sh
+#!/bin/sh
 #
 #		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
 #		Modified for Debian 
@@ -7,11 +7,12 @@
 # Version:	@(#)skeleton  1.9  26-Feb-2001  miquels@cistron.nl
 #
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/java
+JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:$JAVA_HOME/bin
+DAEMON=$JAVA_HOME/bin/java
 NAME=openfire
 DESC=openfire
-DAEMON_DIR=/opt/openfire
+DAEMON_DIR=/usr/share/openfire
 DAEMON_LIB=${DAEMON_DIR}/lib
 
 test -x $DAEMON || exit 0
@@ -25,20 +26,29 @@ DAEMON_OPTS="-server -DopenfireHome=${DAEMON_DIR} \
  -Dopenfire.lib.dir=${DAEMON_LIB} -classpath ${DAEMON_LIB}/startup.jar\
  -jar ${DAEMON_LIB}/startup.jar $DAEMON_OPTS"
 
-set -e
+#set -e
+
+#Helper functions
+start() {
+        start-stop-daemon --start --quiet --background --make-pidfile \
+                --pidfile /var/run/$NAME.pid --chuid openfire:openfire \
+                --exec $DAEMON -- $DAEMON_OPTS
+}
+
+stop() {
+        start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
+		--exec $DAEMON --retry 4
+}
 
 case "$1" in
   start)
 	echo -n "Starting $DESC: "
-	start-stop-daemon --start --quiet --oknodo --background \
-		--pidfile /var/run/$NAME.pid --make-pidfile \
-		--exec $DAEMON -- $DAEMON_OPTS
+	start
 	echo "$NAME."
 	;;
   stop)
 	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
+	stop
 	echo "$NAME."
 	;;
   restart|force-reload)
@@ -48,11 +58,12 @@ case "$1" in
 	#	just the same as "restart".
 	#
 	echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON
-	sleep 1
-	start-stop-daemon --start --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+	#set +e
+	stop
+	#set -e
+	#sleep 1
+	start	
+	
 	echo "$NAME."
 	;;
   *)
@@ -64,3 +75,4 @@ case "$1" in
 esac
 
 exit 0
+

build/debian/openfire.links

+/etc/openfire /usr/share/openfire/conf
+/etc/openfire/security /usr/share/openfire/resources/security
+/var/lib/openfire/embedded-db /usr/share/openfire/embedded-db
+/var/lib/openfire/plugins /usr/share/openfire/plugins

build/debian/openfire.postinst

+#! /bin/sh
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+	configure)
+		if ! getent passwd openfire >/dev/null; then
+			adduser --disabled-password  --quiet --system \
+			--home /var/lib/openfire \
+			--gecos "Openfire XMPP server" --group openfire
+		fi
+ 
+		mkdir -p /var/log/openfire
+		mkdir -p /var/lib/openfire/embedded-db
+		chown -R openfire:openfire /var/lib/openfire
+		chown -R openfire:openfire /var/log/openfire
+		chown -R openfire:openfire /etc/openfire
+		chmod -R o-rwx /etc/openfire
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

build/debian/openfire.postrm

@@ -20,7 +20,9 @@ set -e
 
 case "$1" in
      purge)
-	rm -Rf /opt/openfire
+	rm -Rf /etc/openfire
+	rm -Rf /var/lib/openfire
+	rm -Rf /var/log/openfire
         ;; 
  
      remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

build/debian/patches/10-logdir.patch

+diff -Nur openfire-3.3.0/src/conf/openfire.xml openfire-3.3.0.new/src/conf/openfire.xml
+--- openfire-3.3.0/src/conf/openfire.xml	2007-04-12 11:00:10.000000000 +0200
++++ openfire-3.3.0.new/src/conf/openfire.xml	2007-04-12 12:34:04.000000000 +0200
+@@ -50,4 +50,9 @@
+         <interface></interface>
+     </network>
+     -->
+-</jive>
+\ Kein Zeilenumbruch am Dateiende.
++
++    <!-- Set the log directory to /var/log/openfire for the debian package. -->
++    <log> 
++        <directory>/var/log/openfire</directory> 
++    </log> 
++</jive>

build/debian/patches/11-unwritable-home.patch

+diff -Nur openfire-3.3.0/src/java/org/jivesoftware/util/JiveGlobals.java openfire-3.3.0.new/src/java/org/jivesoftware/util/JiveGlobals.java
+--- openfire-3.3.0/src/java/org/jivesoftware/util/JiveGlobals.java	2007-04-12 12:36:59.000000000 +0200
++++ openfire-3.3.0.new/src/java/org/jivesoftware/util/JiveGlobals.java	2007-04-12 12:38:40.000000000 +0200
+@@ -243,10 +243,10 @@
+         if (!mh.exists()) {
+             Log.error("Error - the specified home directory does not exist (" + pathname + ")");
+         }
+-        else if (!mh.canRead() || !mh.canWrite()) {
++        else if (!mh.canRead()) {
+                 Log.error("Error - the user running this application can not read " +
+-                        "and write to the specified home directory (" + pathname + "). " +
+-                        "Please grant the executing user read and write permissions.");
++                        "to the specified home directory (" + pathname + "). " +
++                        "Please grant the executing user read permissions.");
+         }
+         else {
+             home = pathname;

build/debian/rules

 #!/usr/bin/make -f
-# -*- makefile -*-
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DESTINATION=${CURDIR}/debian/openfire/
-
-build: build-stamp
-build-stamp: 
-	dh_testdir
-	dh_installdirs
-	
-	ant -f build/build.xml
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	
-	rm -f build-stamp configure-stamp install-stamp
-	
-	-ant -f build/build.xml clean
-	
-	dh_clean 
-
-install: install-stamp
-install-stamp:
-	mv $(CURDIR)/target/openfire $(DESTINATION)/opt/
-	
-	# Move the conf-dir to etc an create a symlink back.
-	mv ${DESTINATION}/opt/openfire/conf ${DESTINATION}/etc/openfire
-	ln -s /etc/openfire ${DESTINATION}/opt/openfire/conf
-	
-	# Move the resource dir to etc and symlink back.
-	mv ${DESTINATION}/opt/openfire/resources/security ${DESTINATION}/etc/openfire/security
-	ln -s /etc/openfire/security ${DESTINATION}/opt/openfire/resources/security
-	
-	# Move the logs dir to /var/log an symlink back.
-	mv ${DESTINATION}/opt/openfire/logs ${DESTINATION}/var/log/openfire
-	ln -s /var/log/openfire ${DESTINATION}/opt/openfire/logs
-	
-	touch $@
-	
-
-# Build architecture-dependent files here.
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installdebconf	
-	dh_installinit
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary install configure
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+DEST := $(CURDIR)/debian/openfire
+TARGET := $(CURDIR)/target/openfire
+OPENFIRE := $(DEST)/usr/share/openfire
+ETCDIR := $(DEST)/etc/openfire
+LOGDIR := $(DEST)/var/log/openfire
+VARDIR := $(DEST)/var/lib/openfire
+
+JAVA_HOME := /usr/lib/jvm/java-1.5.0-sun
+DEB_ANT_BUILDFILE := build/build.xml
+DEB_ANT_CLEAN_TARGET := clean
+	
+install/openfire::
+	cp $(TARGET)/lib/*.jar $(OPENFIRE)/lib/
+	cp -r $(TARGET)/resources/database $(OPENFIRE)/resources/database
+	cp $(TARGET)/conf/openfire.xml $(ETCDIR)
+	cp -r $(TARGET)/resources/security $(ETCDIR)/security
+	cp -r $(TARGET)/plugins $(VARDIR)/plugins