[Pkg-xmpp-commits] [SCM] Jabberd2 XMPP server branch, master, updated. upstream/2.2.17-20-g03771f3

[W. van den Akker]

The following commit has been merged in the master branch:
commit 955e3c721e6fcfc02bb5dbb9c8d8637218221178
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Wed Jan 16 11:58:35 2013 +0100

    Remove resolver service. Not needed anymore, refs 689539.

diff --git a/debian/changelog b/debian/changelog
index 5482139..8aa3225 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,17 @@
 jabberd2 (2.2.17-1) UNRELEASED; urgency=low
 
   * New upstream version (Closes: #637112, #547767).
+  * New version patches user security hole (Closes: #685666).
   * Removed CVE-2011-1755.dpatch. Is now included in upstream source.
   * Removed implicit-pointer-conversion.dpatch. Is now included in 
     upstream source.
   * debian/control: changed debhelper dependency to >= 9.0.0.
   * debian/init: added Should-Start/Should-Stop dependency for MySQL
     (Closes: #673243).
+  * debian/init, debian/default: removed resolver entries.
+  * debian/component.d: removed 20resolver. Not included anymore
+    (Closes: #689539).
+  * debian/preinst, debian/postrm: removed resolver entries.
   * Bumped up Standards Version to 3.9.4.
   * Bumped up debhelper to 9.
 
diff --git a/debian/component.d/20resolver b/debian/component.d/20resolver
deleted file mode 100644
index fee06b9..0000000
--- a/debian/component.d/20resolver
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-set -e
-
-test -f /etc/default/jabberd2 && . /etc/default/jabberd2
-
-NAME=resolver
-COMMAND=/usr/sbin/jabberd2-${NAME}
-PIDFILE=/var/run/jabberd2/${NAME}.pid
-CONFFILE=/etc/jabberd2/${NAME}.xml
-
-# exit now if we are not ment to run
-test "${RESOLVER_RUN}" != 0 || exit 0
-
-# check for executable
-test -f ${COMMAND} || exit 0
-
-case "$1" in
-   start)
-	   echo -n " ${NAME}"
-      if [ ! `pidof ${COMMAND}` ]; then
-   	   start-stop-daemon -b -c ${USER}:${GROUP} \
-            --start --pidfile ${PIDFILE} --quiet \
-            --exec ${COMMAND} -- -c ${CONFFILE} || echo -n "<Failed>"
-      fi
-	;;
-   stop)
-	   echo -n " ${NAME}"
-      start-stop-daemon -o -u ${USER} --stop --quiet \
-         --signal 15 --retry 3 --pidfile ${PIDFILE} \
-         --exec ${COMMAND} || echo -n "<Failed>"
-	;;
-   restart)
-      $0 stop
-      sleep 1
-      $0 start
-   ;;
-   *)
-      echo "`basename $0` called with unknown option {$1}"
-      exit 1
-   ;;
-esac
-
-exit 0
diff --git a/debian/default b/debian/default
index 333a0cc..0734a74 100644
--- a/debian/default
+++ b/debian/default
@@ -7,9 +7,6 @@ GROUP=jabber
 # run router
 ROUTER_RUN=1
 
-# run resolver
-RESOLVER_RUN=1
-
 # run sm
 SM_RUN=1
 
diff --git a/debian/init b/debian/init
index 1b7a1b0..76fa0cb 100644
--- a/debian/init
+++ b/debian/init
@@ -53,7 +53,7 @@ case "$1" in
       # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
       echo "Usage: $0 {action} [component]" >&2
       echo "   action = start|stop|restart|force-reload" >&2
-      echo "   component = router|resolver|sm|s2s|c2s" >&2
+      echo "   component = router|sm|s2s|c2s" >&2
       exit 1
    ;;
 esac
diff --git a/debian/postrm b/debian/postrm
index 5ea4fc8..796f268 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -7,7 +7,7 @@ case "$1" in
         # remove the user database
         rm -f /var/lib/jabberd2/db/*
         rm -f /var/lib/jabberd2/*.db
-        for SUB in c2s s2s sm router resolver; do
+        for SUB in c2s s2s sm router; do
            # the application should remove these on exit
            rm -f /var/run/jabberd2/${SUB}.pid
            # need better way of detecting whether these exist or not
diff --git a/debian/preinst b/debian/preinst
index 699a078..abc46e1 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -24,8 +24,6 @@ rm_conffile() {
 
 case "$1" in
     install|upgrade)
-        rm_conffile jabberd2 "/etc/jabberd2/resolver.xml"
-        rm_conffile jabberd2 "/etc/jabberd2/component.d/20resolver"
     ;;
 
     abort-upgrade)

-- 
Jabberd2 XMPP server