drop fix-kdcproxy-paths.diff, refresh others

debian/changelog

@@ -14,7 +14,8 @@ freeipa (4.6.0-1) UNRELEASED; urgency=medium
       fix-pkcs11-helper.diff,
       fix-dnssec-services.diff
     - Remove obsolete patches: fix-memcached.diff,
-      fix-oddjobs.diff
+      fix-oddjobs.diff,
+      fix-kdcproxy-paths.diff
     - Refresh rest of the patches
   * control et al: Memcached is not used anymore.
   * control, server.install: Depend on gssproxy.

debian/patches/create-sysconfig-ods.diff

@@ -1,6 +1,6 @@
 --- a/ipaserver/install/opendnssecinstance.py
 +++ b/ipaserver/install/opendnssecinstance.py
-@@ -195,6 +195,9 @@ class OpenDNSSECInstance(service.Service
+@@ -197,6 +197,9 @@ class OpenDNSSECInstance(service.Service
          if not self.fstore.has_file(paths.SYSCONFIG_ODS):
              self.fstore.backup_file(paths.SYSCONFIG_ODS)
  

debian/patches/enable-mod-nss-during-setup.diff

@@ -1,6 +1,6 @@
 --- a/ipaserver/install/httpinstance.py
 +++ b/ipaserver/install/httpinstance.py
-@@ -183,6 +183,7 @@ class HTTPInstance(service.Service):
+@@ -179,6 +179,7 @@ class HTTPInstance(service.Service):
          if not self.is_kdcproxy_configured():
              self.step("create KDC proxy config", self.create_kdcproxy_conf)
              self.step("enable KDC proxy", self.enable_kdcproxy)
@@ -8,7 +8,7 @@
          self.step("starting httpd", self.start)
          self.step("configuring httpd to start on boot", self.__enable)
          self.step("enabling oddjobd", self.enable_and_start_oddjobd)
-@@ -529,6 +530,8 @@ class HTTPInstance(service.Service):
+@@ -525,6 +526,8 @@ class HTTPInstance(service.Service):
              except Exception:
                  pass
  

debian/patches/fix-kdcproxy-paths.diff

@@ -1,33 +0,0 @@
---- a/install/conf/ipa-kdc-proxy.conf.template
-+++ b/install/conf/ipa-kdc-proxy.conf.template
-@@ -1,24 +1,24 @@
- # Kerberos over HTTP / MS-KKDCP support (Kerberos KDC Proxy)
- #
--# The symlink from /etc/ipa/kdcproxy/ to /etc/httpd/conf.d/ is maintained
--# by the ExecStartPre script /usr/libexec/ipa/ipa-httpd-kdcproxy in
-+# The symlink from /etc/ipa/kdcproxy/ to /etc/apache2/conf.enabled/ is maintained
-+# by the ExecStartPre script /usr/lib/ipa/ipa-httpd-kdcproxy in
- # httpd.service. The service also sets the environment variable
- # KDCPROXY_CONFIG to $KDCPROXY_CONFIG.
- #
- # Disable KDC Proxy on the current host:
- #   # ipa-ldap-updater /usr/share/ipa/kdcproxy-disable.uldif
--#   # systemctl restart httpd.service
-+#   # systemctl restart apache2.service
- #
- # Enable KDC Proxy on the current host:
- #   # ipa-ldap-updater /usr/share/ipa/kdcproxy-enable.uldif
--#   # systemctl restart httpd.service
-+#   # systemctl restart apache2.service
- #
- 
- WSGIDaemonProcess kdcproxy processes=2 threads=15 maximum-requests=5000 \
-   user=kdcproxy group=kdcproxy display-name=%{GROUP}
--WSGIImportScript /usr/lib/python2.7/site-packages/kdcproxy/__init__.py \
-+WSGIImportScript /usr/lib/python2.7/dist-packages/kdcproxy/__init__.py \
-   process-group=kdcproxy application-group=kdcproxy
--WSGIScriptAlias /KdcProxy /usr/lib/python2.7/site-packages/kdcproxy/__init__.py
-+WSGIScriptAlias /KdcProxy /usr/lib/python2.7/dist-packages/kdcproxy/__init__.py
- WSGIScriptReloading Off
- 
- <Location "/KdcProxy">

debian/patches/fix-opendnssec-setup.diff

@@ -11,7 +11,7 @@ Description: Fix ODS setup with 2.0.x
  	</RepositoryList>
 --- a/ipaserver/install/opendnssecinstance.py
 +++ b/ipaserver/install/opendnssecinstance.py
-@@ -293,7 +293,7 @@ class OpenDNSSECInstance(service.Service
+@@ -295,7 +295,7 @@ class OpenDNSSECInstance(service.Service
          else:
              # initialize new kasp.db
              command = [
@@ -22,7 +22,7 @@ Description: Fix ODS setup with 2.0.x
  
 --- a/ipaplatform/base/paths.py
 +++ b/ipaplatform/base/paths.py
-@@ -168,7 +168,7 @@ class BasePathNamespace(object):
+@@ -167,7 +167,7 @@ class BasePathNamespace(object):
      NET = "/usr/bin/net"
      BIN_NISDOMAINNAME = "/usr/bin/nisdomainname"
      NSUPDATE = "/usr/bin/nsupdate"
@@ -33,7 +33,7 @@ Description: Fix ODS setup with 2.0.x
      PK12UTIL = "/usr/bin/pk12util"
 --- a/ipaserver/dnssec/odsmgr.py
 +++ b/ipaserver/dnssec/odsmgr.py
-@@ -133,7 +133,7 @@ class ODSMgr(object):
+@@ -135,7 +135,7 @@ class ODSMgr(object):
  
          Raises CalledProcessError if returncode != 0.
          """

debian/patches/fix-replicainstall.diff

@@ -1,6 +1,6 @@
 --- a/ipaserver/install/server/replicainstall.py
 +++ b/ipaserver/install/server/replicainstall.py
-@@ -760,7 +760,7 @@ def install_check(installer):
+@@ -758,7 +758,7 @@ def install_check(installer):
          finally:
              shutil.rmtree(tmp_db_dir)
  

debian/patches/hack-libarch.diff

@@ -1,6 +1,6 @@
 --- a/ipaserver/install/ldapupdate.py
 +++ b/ipaserver/install/ldapupdate.py
-@@ -329,9 +329,9 @@ class LDAPUpdate(object):
+@@ -330,9 +330,9 @@ class LDAPUpdate(object):
          bits = platform.architecture()[0]
  
          if bits == "64bit":

debian/patches/series

@@ -6,7 +6,6 @@ enable-mod-nss-during-setup.diff
 
 # send upstream
 fix-ipa-conf.diff
-fix-kdcproxy-paths.diff
 fix-replicainstall.diff
 create-sysconfig-ods.diff
 fix-named-conf-template.diff