refresh patches, drop revert-pykerberos-api-change.diff which is obsolete

debian/patches/add-debian-platform.diff

@@ -383,7 +383,7 @@ Date:   Fri Mar 1 12:21:00 2013 +0200
          srv_vals.append("0.%s.pool.ntp.org" % os)
 --- a/ipaserver/install/ldapupdate.py
 +++ b/ipaserver/install/ldapupdate.py
-@@ -328,9 +328,9 @@ class LDAPUpdate:
+@@ -332,9 +332,9 @@ class LDAPUpdate:
          bits = platform.architecture()[0]
  
          if bits == "64bit":
@@ -397,17 +397,17 @@ Date:   Fri Mar 1 12:21:00 2013 +0200
          try:
 --- a/ipaserver/install/httpinstance.py
 +++ b/ipaserver/install/httpinstance.py
-@@ -159,6 +159,7 @@ class HTTPInstance(service.Service):
+@@ -168,6 +168,7 @@ class HTTPInstance(service.Service):
              self.step("create KDC proxy user", create_kdcproxy_user)
              self.step("create KDC proxy config", self.create_kdcproxy_conf)
              self.step("enable KDC proxy", self.enable_kdcproxy)
 +        ipautil.run(["/usr/sbin/a2enmod", "nss"], capture_output=True)
          self.step("restarting httpd", self.__start)
          self.step("configuring httpd to start on boot", self.__enable)
- 
-@@ -470,6 +471,8 @@ class HTTPInstance(service.Service):
-         enabled = self.restore_state("enabled")
- 
+         self.step("enabling oddjobd", self.enable_and_start_oddjobd)
+@@ -483,6 +484,8 @@ class HTTPInstance(service.Service):
+             except Exception:
+                 pass
  
 +        ipautil.run(["/usr/sbin/a2dismod", "nss"], capture_output=True)
 +

debian/patches/fix-ipa-conf.diff

@@ -21,9 +21,9 @@ Description: Fix paths
 +  GssapiCredStore client_keytab:/etc/apache2/ipa.keytab
 +  GssapiDelegCcacheDir /var/run/apache2/ipa/clientcaches
    GssapiUseS4U2Proxy on
+   GssapiAllowedMech krb5
    Require valid-user
-   ErrorDocument 401 /ipa/errors/unauthorized.html
-@@ -132,8 +132,8 @@ Alias /ipa/crl "$CRL_PUBLISH_PATH"
+@@ -141,8 +141,8 @@ Alias /ipa/crl "$CRL_PUBLISH_PATH"
  
  
  #  List explicitly only the fonts we want to serve

debian/patches/no-test-lang.diff

@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -117,7 +117,7 @@ client-dirs:
+@@ -125,7 +125,7 @@ client-dirs:
  
  lint: bootstrap-autogen
  	./make-lint $(LINT_OPTIONS)

debian/patches/prefix.patch

@@ -5,7 +5,7 @@ use the debian layout when installing python modules
 
 --- a/Makefile
 +++ b/Makefile
-@@ -99,11 +99,11 @@ client-install: client client-dirs
+@@ -107,11 +107,11 @@ client-install: client client-dirs
  	done
  	cd install/po && $(MAKE) install || exit 1;
  	if [ "$(DESTDIR)" = "" ]; then \
@@ -21,7 +21,7 @@ use the debian layout when installing python modules
  	fi
  
  client-dirs:
-@@ -177,11 +177,11 @@ server: version-update
+@@ -187,11 +187,11 @@ server: version-update
  
  server-install: server
  	if [ "$(DESTDIR)" = "" ]; then \
@@ -37,7 +37,7 @@ use the debian layout when installing python modules
  	fi
  
  tests: version-update tests-man-autogen
-@@ -192,7 +192,7 @@ tests-install: tests
+@@ -202,7 +202,7 @@ tests-install: tests
  	if [ "$(DESTDIR)" = "" ]; then \
  		cd ipatests; $(PYTHON) setup.py install; \
  	else \
@@ -50,35 +50,32 @@ use the debian layout when installing python modules
 +++ b/ipapython/Makefile
 @@ -15,7 +15,7 @@ install:
  	if [ "$(DESTDIR)" = "" ]; then \
- 		python2 setup.py install; \
+ 		$(PYTHON) setup.py install; \
  	else \
--		python2 setup.py install --root $(DESTDIR); \
-+		python2 setup.py install --root $(DESTDIR) --install-layout=deb; \
+-		$(PYTHON) setup.py install --root $(DESTDIR); \
++		$(PYTHON) setup.py install --root $(DESTDIR) --install-layout=deb; \
  	fi
  	@for subdir in $(SUBDIRS); do \
  		(cd $$subdir && $(MAKE) $@) || exit 1; \
 --- a/ipapython/py_default_encoding/Makefile
 +++ b/ipapython/py_default_encoding/Makefile
-@@ -9,7 +9,7 @@ install:
- 	if [ "$(DESTDIR)" = "" ]; then \
- 		python2 setup.py install; \
- 	else \
--		python2 setup.py install --root $(DESTDIR); \
-+		python2 setup.py install --root $(DESTDIR) --install-layout=deb; \
+@@ -13,7 +13,7 @@ install:
+ 		if [ "$(DESTDIR)" = "" ]; then \
+ 			python2 setup.py install; \
+ 		else \
+-			python2 setup.py install --root $(DESTDIR); \
++			python2 setup.py install --root $(DESTDIR) --install-layout=deb; \
+ 		fi; \
  	fi
  
- clean:
 --- a/ipapython/ipap11helper/Makefile
 +++ b/ipapython/ipap11helper/Makefile
-@@ -7,9 +7,9 @@ all:
- 
- install:
+@@ -8,7 +8,7 @@ install:
  	if [ "$(DESTDIR)" = "" ]; then \
--		python2 setup.py install; \
-+		python2 setup.py install --install-layout=deb; \
+ 		$(PYTHON) setup.py install; \
  	else \
--		python2 setup.py install --root $(DESTDIR); \
-+		python2 setup.py install --root $(DESTDIR) --install-layout=deb; \
+-		$(PYTHON) setup.py install --root $(DESTDIR); \
++		$(PYTHON) setup.py install --root $(DESTDIR) --install-layout=deb; \
  	fi
  
  clean:

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

@@ -1,24 +0,0 @@
-Description: so we don't need to patch pykerberos
---- a/ipalib/util.py
-+++ b/ipalib/util.py
-@@ -63,15 +63,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

@@ -8,7 +8,6 @@ no-test-lang.diff
 # send upstream
 add-debian-platform.diff
 fix-ipa-conf.diff
-revert-pykerberos-api-change.diff
 
 disable-dnssec-support.patch
 revert-revert-removal-of-cn-attribute.diff

debian/patches/work-around-apache-fail.diff

@@ -1,7 +1,7 @@
 Description: service apache2 restart fails on sid, so don't do that
 --- a/ipaserver/install/httpinstance.py
 +++ b/ipaserver/install/httpinstance.py
-@@ -164,7 +164,8 @@ class HTTPInstance(service.Service):
+@@ -176,7 +176,8 @@ class HTTPInstance(service.Service):
  
      def __start(self):
          self.backup_state("running", self.is_running())
@@ -13,7 +13,7 @@ Description: service apache2 restart fails on sid, so don't do that
          self.backup_state("enabled", self.is_enabled())
 --- a/install/tools/ipa-dns-install
 +++ b/install/tools/ipa-dns-install
-@@ -130,7 +130,8 @@ def main():
+@@ -142,7 +142,8 @@ def main():
      fstore = sysrestore.FileStore(paths.SYSRESTORE)
      http = httpinstance.HTTPInstance(fstore)
      service.print_msg("Restarting the web server")
@@ -25,7 +25,7 @@ Description: service apache2 restart fails on sid, so don't do that
  
 --- a/ipaserver/install/server/install.py
 +++ b/ipaserver/install/server/install.py
-@@ -860,7 +860,8 @@ def install(installer):
+@@ -967,7 +967,8 @@ def install(installer):
  
      # Restart httpd to pick up the new IPA configuration
      service.print_msg("Restarting the web server")
@@ -37,7 +37,7 @@ Description: service apache2 restart fails on sid, so don't do that
          kra.install(api, None, options)
 --- a/ipaserver/install/server/replicainstall.py
 +++ b/ipaserver/install/server/replicainstall.py
-@@ -621,7 +621,8 @@ def install(installer):
+@@ -777,7 +777,8 @@ def install(installer):
  
      # Restart httpd to pick up the new IPA configuration
      service.print_msg("Restarting the web server")
@@ -46,4 +46,4 @@ Description: service apache2 restart fails on sid, so don't do that
 +    http.start()
  
      # Call client install script
-     try:
+     service.print_msg("Configuring client side components")