From cdb3b7b46b432925207641705ed1b93d6cc148d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C5=A0afr=C3=A1nek?= <jsafrane@fedoraproject.org>
Date: Thu, 24 May 2007 09:32:33 +0000
Subject: [PATCH]  sort the hosts by adders, preventing duplicities in
 migrate*nis*.pl Resolves: #201540

---
 MigrationTools-46-unique-hosts.patch | 23 +++++++++++++++++++++++
 openldap.spec                        |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 MigrationTools-46-unique-hosts.patch

diff --git a/MigrationTools-46-unique-hosts.patch b/MigrationTools-46-unique-hosts.patch
new file mode 100644
index 0000000..f0db7ba
--- /dev/null
+++ b/MigrationTools-46-unique-hosts.patch
@@ -0,0 +1,23 @@
+Prevent duplicities in hosts, which are read from NIS.
+--- MigrationTools-46/migrate_all_nis_online.sh.orig	2007-05-24 11:21:54.000000000 +0200
++++ MigrationTools-46/migrate_all_nis_online.sh	2007-05-24 11:26:30.000000000 +0200
+@@ -67,7 +67,7 @@
+ ypcat $DOMFLAG protocols > $ETC_PROTOCOLS
+ touch $ETC_FSTAB
+ ypcat $DOMFLAG rpc.byname > $ETC_RPC
+-ypcat $DOMFLAG hosts > $ETC_HOSTS
++ypcat $DOMFLAG hosts.byaddr > $ETC_HOSTS
+ ypcat $DOMFLAG networks > $ETC_NETWORKS
+ #ypcat $DOMFLAG -k aliases > $ETC_ALIASES
+ 
+--- MigrationTools-46/migrate_all_nis_offline.sh.orig	2007-05-24 11:21:54.000000000 +0200
++++ MigrationTools-46/migrate_all_nis_offline.sh	2007-05-24 11:26:13.000000000 +0200
+@@ -67,7 +67,7 @@
+ ypcat $DOMFLAG protocols > $ETC_PROTOCOLS
+ touch $ETC_FSTAB
+ ypcat $DOMFLAG rpc.byname > $ETC_RPC
+-ypcat $DOMFLAG hosts > $ETC_HOSTS
++ypcat $DOMFLAG hosts.byaddr > $ETC_HOSTS
+ ypcat $DOMFLAG networks > $ETC_NETWORKS
+ #ypcat $DOMFLAG -k aliases > $ETC_ALIASES
+ 
diff --git a/openldap.spec b/openldap.spec
index cdbb469..3ffd320 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -60,6 +60,7 @@ Patch303: MigrationTools-26-suffix.patch
 Patch304: MigrationTools-46-schema.patch
 Patch305: MigrationTools-45-noaliases.patch
 Patch306: MigrationTools-46-ddp.patch
+Patch307: MigrationTools-46-unique-hosts.patch
 
 Patch400: db-4.4.20-1.patch
 Patch401: db-4.4.20-2.patch
@@ -202,6 +203,7 @@ pushd MigrationTools-%{migtools_version}
 %patch304 -p1 -b .schema
 %patch305 -p1 -b .noaliases
 %patch306 -p1 -b .ddp
+%patch307 -p1 -b .unique-hosts
 popd
 
 autodir=`pwd`/auto-instroot
@@ -732,6 +734,8 @@ fi
 - add compat-slapcat to openldap-compat (bz#179378)
 - do not import ddp services with migrate_services.pl
   (bz#201183)
+- sort the hosts by adders, preventing duplicities
+  in migrate*nis*.pl (bz#201540)
 
 * Mon Apr 23 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-2%{?dist}
 - slapadd during package update is now quiet (bz#224581)