[Pkg-freeipa-devel] freeipa: Changes to 'master-next'

[Timo Aaltonen]

 debian/freeipa-server.ipa_memcached.init |   70 -------------------------------
 debian/patches/add-debian-platform.diff  |    6 +-
 2 files changed, 4 insertions(+), 72 deletions(-)

New commits:
commit e61c528c7828f9cba26ae0981ee4d0d52ac1851a
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Mar 17 18:53:58 2016 +0200

    remove obsolete ipa_memcached initscript

diff --git a/debian/freeipa-server.ipa_memcached.init b/debian/freeipa-server.ipa_memcached.init
deleted file mode 100755
index 7d99ea9..0000000
--- a/debian/freeipa-server.ipa_memcached.init
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh
-
-# Standard LSB functions
-. /lib/lsb/init-functions
-
-DAEMON=/usr/bin/memcached
-SOCKET_PATH=/var/run/ipa_memcached/ipa_memcached
-USER=www-data
-PIDFILE=/var/run/ipa_memcached/ipa_memcached.pid
-MAXCONN=1024
-CACHESIZE=64
-OPTIONS=""
-
-if [ -f /etc/default/ipa_memcached ];then
-    . /etc/default/ipa_memcached
-fi
-
-prog="ipa_memcached"
-pidfile=${PIDFILE-/var/run/ipa_memcached/ipa_memcached.pid}
-lockfile=${LOCKFILE-/var/lock/subsys/ipa_memcached}
-
-do_start () {
-    # Ensure that $pidfile directory has proper permissions and exists
-    piddir=`dirname $pidfile`
-    if [ ! -d $piddir ]; then
-	mkdir $piddir
-    fi
-    if [ "`stat -c %U $piddir`" != "$USER" ]; then
-	chown $USER $piddir
-    fi
-
-    start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-        -d -s $SOCKET_PATH -u $USER -m $CACHESIZE -c $MAXCONN -P $PIDFILE $OPTIONS
-}
-
-do_stop () {
-    start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON
-}
-
-# See how we were called.
-case "$1" in
-    start)
-        log_daemon_msg "Starting ipa_memcached"
-        do_start
-        case "$?" in
-                0) log_end_msg 0 ;;
-                1) log_progress_msg "already started"
-                   log_end_msg 0 ;;
-                *) log_end_msg 1 ;;
-        esac
-        ;;
-    stop)
-        log_daemon_msg "Stopping ipa_memcached"
-        do_stop
-        case "$?" in
-                0) log_end_msg 0 ;;
-                1) log_progress_msg "already stopped"
-                   log_end_msg 0 ;;
-                *) log_end_msg 1 ;;
-        esac
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|force-reload}"
-        exit 2
-esac
-exit $?

commit ca955ed2f6868accf5006aaa0934a5e07ec9516f
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Mar 16 20:53:24 2016 +0200

    platform: Fix uninstall on Ubuntu; don't try to start dbus.

diff --git a/debian/patches/add-debian-platform.diff b/debian/patches/add-debian-platform.diff
index f5c7b87..cdb4de6 100644
--- a/debian/patches/add-debian-platform.diff
+++ b/debian/patches/add-debian-platform.diff
@@ -389,7 +389,7 @@ Date:   Fri Mar 1 12:21:00 2013 +0200
 +paths = DebianPathNamespace()
 --- /dev/null
 +++ b/ipaplatform/debian/services.py
-@@ -0,0 +1,194 @@
+@@ -0,0 +1,196 @@
 +# Authors:
 +#   Timo Aaltonen <tjaalton at ubuntu.com>
 +#
@@ -558,7 +558,9 @@ Date:   Fri Mar 1 12:21:00 2013 +0200
 +    if name == 'krb5kdc':
 +        return DebianSysvService("krb5-kdc")
 +    if name == 'messagebus':
-+        return DebianSysvService("dbus")
++        # no reason to try starting it, and it would return a failure on
++        # ubuntu
++        return True
 +    if name == 'ntpd':
 +        return DebianSysvService("ntp")
 +    if name == 'smb':