add missing dirsrv entries to paths.py

debian/patches/add-debian-platform.diff

@@ -31,7 +31,7 @@ Date:   Fri Mar 1 12:21:00 2013 +0200
 +"""
 --- /dev/null
 +++ b/ipaplatform/debian/paths.py
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,69 @@
 +# Authors:
 +#   Timo Aaltonen <tjaalton@ubuntu.com>
 +#
@@ -79,6 +79,9 @@ Date:   Fri Mar 1 12:21:00 2013 +0200
 +    SYSCONFIG_PKI = "/etc/dogtag/"
 +    SYSCONFIG_PKI_TOMCAT = "/etc/default/pki-tomcat"
 +    SYSCONFIG_PKI_TOMCAT_PKI_TOMCAT_DIR = "/etc/dogtag/tomcat/pki-tomcat"
++    SYSCONFIG_DIRSRV = "/etc/default/dirsrv"
++    SYSCONFIG_DIRSRV_INSTANCE = "/etc/default/dirsrv-%s"
++    SYSCONFIG_DIRSRV_SYSTEMD = "/etc/default/dirsrv.systemd"
 +    HTTPD = "/usr/sbin/apache2ctl"
 +    BIND_LDAP_SO = "/usr/share/doc/bind9-dyndb-ldap/copyright"
 +    NAMED_CONF = "/etc/bind/named.conf.local"

debian/patches/revert-pykerberos-api-change.diff

@@ -0,0 +1,24 @@
+Description: so we don't need to patch pykerberos
+--- a/ipalib/util.py
++++ b/ipalib/util.py
+@@ -59,15 +59,12 @@ def json_serialize(obj):
+ 
+ def get_current_principal():
+     try:
+-        import kerberos
+-        rc, vc = kerberos.authGSSClientInit("notempty")
+-        rc = kerberos.authGSSClientInquireCred(vc)
+-        username = kerberos.authGSSClientUserName(vc)
+-        kerberos.authGSSClientClean(vc)
+-        return unicode(username)
++        # krbV isn't necessarily available on client machines, fail gracefully
++        import krbV
++        return unicode(krbV.default_context().default_ccache().principal().name)
+     except ImportError:
+-        raise RuntimeError('python-kerberos is not available.')
+-    except kerberos.GSSError, e:
++        raise RuntimeError('python-krbV is not available.')
++    except krbV.Krb5Error:
+         #TODO: do a kinit?
+         raise errors.CCacheError()
+ 

debian/patches/series

@@ -13,3 +13,4 @@ fix-manpage-has-errors-from-man.patch
 fix-typo.patch
 fix-ipa-conf.diff
 fix-pykerberos-api.diff
+revert-pykerberos-api-change.diff