From 72d83858fe3b2a9bf4a0e930d3e5567dc7a6430d Mon Sep 17 00:00:00 2001
From: Timo Aaltonen <tjaalton@debian.org>
Date: Mon, 8 Oct 2018 11:07:29 +0300
Subject: [PATCH] refresh patches, drop fix-replicainstall.diff

---
 debian/changelog                                   |  2 ++
 debian/patches/fix-replicainstall.diff             | 11 -----------
 debian/patches/hack-tomcat-race.diff               |  2 +-
 debian/patches/ipa-httpd-pwdreader-force-fqdn.diff |  4 ++--
 debian/patches/series                              |  1 -
 5 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 debian/patches/fix-replicainstall.diff

diff --git a/debian/changelog b/debian/changelog
index a19161af6..029d839c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 freeipa (4.7.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    - fix-replicainstall.diff dropped, not applicable anymore
+    - refresh patches
   * dont-migrate-to-authselect.diff We don't have authselect, so just
     return true when trying to migrate to it. (LP: #1793994)
   * control: Move client dependency on chrony to recommends. (Closes:
diff --git a/debian/patches/fix-replicainstall.diff b/debian/patches/fix-replicainstall.diff
deleted file mode 100644
index 9a1bec0f5..000000000
--- a/debian/patches/fix-replicainstall.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ipaserver/install/server/replicainstall.py
-+++ b/ipaserver/install/server/replicainstall.py
-@@ -769,7 +769,7 @@ def install_check(installer):
-         finally:
-             shutil.rmtree(tmp_db_dir)
- 
--    ldapuri = 'ldaps://%s' % ipautil.format_netloc(config.master_host_name)
-+    ldapuri = 'ldap://%s' % ipautil.format_netloc(config.master_host_name)
-     remote_api = create_api(mode=None)
-     remote_api.bootstrap(in_server=True,
-                          context='installer',
diff --git a/debian/patches/hack-tomcat-race.diff b/debian/patches/hack-tomcat-race.diff
index ccce5876c..8cc3a4a8d 100644
--- a/debian/patches/hack-tomcat-race.diff
+++ b/debian/patches/hack-tomcat-race.diff
@@ -1,6 +1,6 @@
 --- a/ipaserver/install/cainstance.py
 +++ b/ipaserver/install/cainstance.py
-@@ -1754,6 +1754,8 @@ def migrate_profiles_to_ldap():
+@@ -1755,6 +1755,8 @@ def migrate_profiles_to_ldap():
      match = re.search(r'^profile\.list=(\S*)', cs_cfg, re.MULTILINE)
      profile_ids = match.group(1).split(',')
  
diff --git a/debian/patches/ipa-httpd-pwdreader-force-fqdn.diff b/debian/patches/ipa-httpd-pwdreader-force-fqdn.diff
index 97e12296b..029df705c 100644
--- a/debian/patches/ipa-httpd-pwdreader-force-fqdn.diff
+++ b/debian/patches/ipa-httpd-pwdreader-force-fqdn.diff
@@ -6,5 +6,5 @@
  
 +HOSTNAME=`hostname -f`
  USAGE="./ipa-pwdreader host:port RSA|DSA|ECC|number"
- ERR_UNKNOWN_KEY="\
- ERROR: You seem to be running a non-standard IPA installation.
+ 
+ if [ "$#" -ne 2 ]; then
diff --git a/debian/patches/series b/debian/patches/series
index 92e79c53b..628c7a683 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 # upstreamed
 
 # not upstreamable
-fix-replicainstall.diff
 create-sysconfig-ods.diff
 hack-tomcat-race.diff