rpms/migrationtools/devel .cvsignore, 1.2, 1.3 MigrationTools-26-suffix.patch, 1.1, 1.2 MigrationTools-27-simple.patch, 1.1, 1.2 MigrationTools-36-mktemp.patch, 1.1, 1.2 MigrationTools-38-instdir.patch, 1.1, 1.2 MigrationTools-45-noaliases.patch, 1.1, 1.2 MigrationTools-46-ddp.patch, 1.1, 1.2 MigrationTools-46-schema.patch, 1.1, 1.2 MigrationTools-46-unique-hosts.patch, 1.1, 1.2 migrationtools.spec, 1.1, 1.2 sources, 1.2, 1.3
Jan Šafránek
jsafrane at fedoraproject.org
Fri Aug 29 07:15:32 UTC 2008
Author: jsafrane
Update of /cvs/pkgs/rpms/migrationtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6632
Modified Files:
.cvsignore MigrationTools-26-suffix.patch
MigrationTools-27-simple.patch MigrationTools-36-mktemp.patch
MigrationTools-38-instdir.patch
MigrationTools-45-noaliases.patch MigrationTools-46-ddp.patch
MigrationTools-46-schema.patch
MigrationTools-46-unique-hosts.patch migrationtools.spec
sources
Log Message:
- added support for Fedora DS (when it provides ldif2ldbm)
- rediffed all patches to get rid of patch fuzz
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/migrationtools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 29 Feb 2008 08:26:25 -0000 1.2
+++ .cvsignore 29 Aug 2008 07:15:01 -0000 1.3
@@ -1 +1,2 @@
MigrationTools-47.tar.gz
+migration-tools.txt
MigrationTools-26-suffix.patch:
Index: MigrationTools-26-suffix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/migrationtools/devel/MigrationTools-26-suffix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MigrationTools-26-suffix.patch 29 Feb 2008 08:26:25 -0000 1.1
+++ MigrationTools-26-suffix.patch 29 Aug 2008 07:15:01 -0000 1.2
@@ -1,8 +1,9 @@
Try adding the top-level object, which may be missing, but don't worry if
the add operation fails.
---- MigrationTools-26/migrate_all_online.sh Wed Oct 25 16:27:02 2000
-+++ MigrationTools-26/migrate_all_online.sh Wed Oct 25 16:30:11 2000
-@@ -179,5 +179,31 @@
+diff -up MigrationTools-47/migrate_all_online.sh.patch4 MigrationTools-47/migrate_all_online.sh
+--- MigrationTools-47/migrate_all_online.sh.patch4 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_online.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -192,6 +192,32 @@ $PERL -I${INSTDIR} ${INSTDIR}migrate_net
echo "Migrating netgroups (by host)..."
$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
@@ -34,3 +35,4 @@
+
echo "Importing into LDAP..."
+ if [ `basename $LDAPADD` = "slapadd" ]; then
MigrationTools-27-simple.patch:
Index: MigrationTools-27-simple.patch
===================================================================
RCS file: /cvs/pkgs/rpms/migrationtools/devel/MigrationTools-27-simple.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MigrationTools-27-simple.patch 29 Feb 2008 08:26:25 -0000 1.1
+++ MigrationTools-27-simple.patch 29 Aug 2008 07:15:01 -0000 1.2
@@ -1,54 +1,33 @@
Allow the calling user to pass in arguments to ldapadd/ldapmodify.
---- MigrationTools-27/migrate_all_online.sh Tue Oct 31 17:01:24 2000
-+++ MigrationTools-27/migrate_all_online.sh Tue Oct 31 17:03:19 2000
-@@ -181,13 +181,11 @@
-
- echo "Importing into LDAP..."
+diff -up MigrationTools-47/migrate_all_netinfo_offline.sh.patch3 MigrationTools-47/migrate_all_netinfo_offline.sh
+--- MigrationTools-47/migrate_all_netinfo_offline.sh.patch3 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_netinfo_offline.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -69,7 +69,7 @@ nidump hosts $DOM > $ETC_HOSTS
+ nidump networks $DOM > $ETC_NETWORKS
+ nidump aliases $DOM > $ETC_ALIASES
-- if [ -x /usr/sbin/slapadd ]; then
-- $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB
-- elif [ -x /usr/local/sbin/slapadd ]; then
-- $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB
-- else
-- $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB
-- fi
-+if [ `basename $LDAPADD` = "slapadd" ]; then
-+ $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" "$@" -f $DB
-+else
-+ $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" "$@" -f $DB
-+fi
+-. ${INSTDIR}migrate_all_offline.sh
++. ${INSTDIR}migrate_all_offline.sh "$@"
- if [ $? -ne 0 ]; then
- echo "$LDAPADD: returned non-zero exit status"
---- MigrationTools-27/migrate_all_nis_online.sh Tue Oct 31 17:01:24 2000
-+++ MigrationTools-27/migrate_all_nis_online.sh Tue Oct 31 17:02:51 2000
-@@ -71,7 +71,7 @@
- ypcat $DOMFLAG networks > $ETC_NETWORKS
- #ypcat $DOMFLAG -k aliases > $ETC_ALIASES
+ rm -f $ETC_PASSWD
+ rm -f $ETC_GROUP
+diff -up MigrationTools-47/migrate_all_netinfo_online.sh.patch3 MigrationTools-47/migrate_all_netinfo_online.sh
+--- MigrationTools-47/migrate_all_netinfo_online.sh.patch3 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_netinfo_online.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -69,7 +69,7 @@ nidump hosts $DOM > $ETC_HOSTS
+ nidump networks $DOM > $ETC_NETWORKS
+ nidump aliases $DOM > $ETC_ALIASES
-. ${INSTDIR}migrate_all_online.sh
+. ${INSTDIR}migrate_all_online.sh "$@"
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
---- MigrationTools-27/migrate_all_offline.sh Tue Oct 31 17:02:00 2000
-+++ MigrationTools-27/migrate_all_offline.sh Tue Oct 31 17:03:12 2000
-@@ -137,9 +137,9 @@
- $PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
- echo "Preparing LDAP database..."
- if [ "X$SLAPADD" = "X" ]; then
-- $LDIF2LDBM -i $DB
-+ $LDIF2LDBM -i $DB "$@"
- else
-- $SLAPADD -l $DB
-+ $SLAPADD -l $DB "$@"
- fi
- EXITCODE=$?
-
---- MigrationTools-27/migrate_all_nis_offline.sh Tue Oct 31 17:02:05 2000
-+++ MigrationTools-27/migrate_all_nis_offline.sh Tue Oct 31 17:02:49 2000
-@@ -71,7 +71,7 @@
+diff -up MigrationTools-47/migrate_all_nis_offline.sh.patch3 MigrationTools-47/migrate_all_nis_offline.sh
+--- MigrationTools-47/migrate_all_nis_offline.sh.patch3 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_nis_offline.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -71,7 +71,7 @@ ypcat $DOMFLAG hosts > $ETC_HOSTS
ypcat $DOMFLAG networks > $ETC_NETWORKS
#ypcat $DOMFLAG -k aliases > $ETC_ALIASES
@@ -57,47 +36,76 @@
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
---- MigrationTools-27/migrate_all_nisplus_online.sh Tue Oct 31 17:02:11 2000
-+++ MigrationTools-27/migrate_all_nisplus_online.sh Tue Oct 31 17:02:59 2000
-@@ -62,7 +62,7 @@
- niscat networks.org_dir > $ETC_NETWORKS
- niscat mail_aliases.org_dir > $ETC_ALIASES
-
--. ${INSTDIR}migrate_all_online.sh
-+. ${INSTDIR}migrate_all_online.sh "$@"
-
- rm -f $ETC_PASSWD
- rm -f $ETC_GROUP
---- MigrationTools-27/migrate_all_netinfo_online.sh Tue Oct 31 17:02:17 2000
-+++ MigrationTools-27/migrate_all_netinfo_online.sh Tue Oct 31 17:02:46 2000
-@@ -69,7 +69,7 @@
- nidump networks $DOM > $ETC_NETWORKS
- nidump aliases $DOM > $ETC_ALIASES
+diff -up MigrationTools-47/migrate_all_nis_online.sh.patch3 MigrationTools-47/migrate_all_nis_online.sh
+--- MigrationTools-47/migrate_all_nis_online.sh.patch3 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_nis_online.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -71,7 +71,7 @@ ypcat $DOMFLAG hosts > $ETC_HOSTS
+ ypcat $DOMFLAG networks > $ETC_NETWORKS
+ #ypcat $DOMFLAG -k aliases > $ETC_ALIASES
-. ${INSTDIR}migrate_all_online.sh
+. ${INSTDIR}migrate_all_online.sh "$@"
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
---- MigrationTools-27/migrate_all_netinfo_offline.sh Tue Oct 31 17:02:22 2000
-+++ MigrationTools-27/migrate_all_netinfo_offline.sh Tue Oct 31 17:02:43 2000
-@@ -69,7 +69,7 @@
- nidump networks $DOM > $ETC_NETWORKS
- nidump aliases $DOM > $ETC_ALIASES
+diff -up MigrationTools-47/migrate_all_nisplus_offline.sh.patch3 MigrationTools-47/migrate_all_nisplus_offline.sh
+--- MigrationTools-47/migrate_all_nisplus_offline.sh.patch3 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_nisplus_offline.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -73,7 +73,7 @@ nisaddent -d networks $DOM > $ETC_NETWOR
+ nisaddent -d netgroup $DOM > $ETC_NETGROUP
+ niscat mail_aliases.org_dir.$DOM > $ETC_ALIASES
-. ${INSTDIR}migrate_all_offline.sh
+. ${INSTDIR}migrate_all_offline.sh "$@"
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
---- MigrationTools-27/migrate_all_nisplus_offline.sh Tue Oct 31 17:02:27 2000
-+++ MigrationTools-27/migrate_all_nisplus_offline.sh Tue Oct 31 17:02:56 2000
-@@ -62,7 +62,7 @@
- niscat networks.org_dir > $ETC_NETWORKS
- niscat mail_aliases.org_dir > $ETC_ALIASES
+diff -up MigrationTools-47/migrate_all_nisplus_online.sh.patch3 MigrationTools-47/migrate_all_nisplus_online.sh
+--- MigrationTools-47/migrate_all_nisplus_online.sh.patch3 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_nisplus_online.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -73,7 +73,7 @@ nisaddent -d networks $DOM > $ETC_NETWOR
+ nisaddent -d netgroup $DOM > $ETC_NETGROUP
+ niscat mail_aliases.org_dir.$DOM > $ETC_ALIASES
--. ${INSTDIR}migrate_all_offline.sh
-+. ${INSTDIR}migrate_all_offline.sh "$@"
+-. ${INSTDIR}migrate_all_online.sh
++. ${INSTDIR}migrate_all_online.sh "$@"
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
+diff -up MigrationTools-47/migrate_all_offline.sh.patch3 MigrationTools-47/migrate_all_offline.sh
+--- MigrationTools-47/migrate_all_offline.sh.patch3 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_offline.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -137,9 +137,9 @@ echo "Migrating netgroups (by host)..."
+ $PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
+ echo "Preparing LDAP database..."
+ if [ "X$SLAPADD" = "X" ]; then
+- $LDIF2LDBM -i $DB
++ $LDIF2LDBM -i $DB "$@"
+ else
+- $SLAPADD -l $DB
++ $SLAPADD -l $DB "$@"
+ fi
+ EXITCODE=$?
+
+diff -up MigrationTools-47/migrate_all_online.sh.patch3 MigrationTools-47/migrate_all_online.sh
+--- MigrationTools-47/migrate_all_online.sh.patch3 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_online.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -194,13 +194,11 @@ $PERL -I${INSTDIR} ${INSTDIR}migrate_net
+
+ echo "Importing into LDAP..."
+
+- if [ -x /usr/sbin/slapadd ]; then
+- $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB
+- elif [ -x /usr/local/sbin/slapadd ]; then
+- $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB
+- else
+- $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB
+- fi
++if [ `basename $LDAPADD` = "slapadd" ]; then
++ $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" "$@" -f $DB
++else
++ $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" "$@" -f $DB
++fi
+
+ if [ $? -ne 0 ]; then
+ echo "$LDAPADD: returned non-zero exit status: saving failed LDIF to $DB"
MigrationTools-36-mktemp.patch:
Index: MigrationTools-36-mktemp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/migrationtools/devel/MigrationTools-36-mktemp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MigrationTools-36-mktemp.patch 29 Feb 2008 08:26:25 -0000 1.1
+++ MigrationTools-36-mktemp.patch 29 Aug 2008 07:15:01 -0000 1.2
@@ -1,8 +1,9 @@
Use mktemp to generate temporary files.
---- MigrationTools-36/migrate_all_netinfo_offline.sh Mon Feb 5 11:39:14 2001
-+++ MigrationTools-36/migrate_all_netinfo_offline.sh Mon Feb 5 11:39:14 2001
-@@ -41,15 +41,15 @@
+diff -up MigrationTools-47/migrate_all_netinfo_offline.sh.patch2 MigrationTools-47/migrate_all_netinfo_offline.sh
+--- MigrationTools-47/migrate_all_netinfo_offline.sh.patch2 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_netinfo_offline.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -41,15 +41,15 @@ export PATH
INSTDIR=/usr/share/migrationtools/
TMPDIR="/tmp"
@@ -27,9 +28,10 @@
EXIT=no
question="Enter the NetInfo domain to import from [/]:"
---- MigrationTools-36/migrate_all_netinfo_online.sh Mon Feb 5 11:39:14 2001
-+++ MigrationTools-36/migrate_all_netinfo_online.sh Mon Feb 5 11:39:14 2001
-@@ -41,15 +41,15 @@
+diff -up MigrationTools-47/migrate_all_netinfo_online.sh.patch2 MigrationTools-47/migrate_all_netinfo_online.sh
+--- MigrationTools-47/migrate_all_netinfo_online.sh.patch2 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_netinfo_online.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -41,15 +41,15 @@ export PATH
INSTDIR=/usr/share/migrationtools/
TMPDIR="/tmp"
@@ -54,9 +56,10 @@
EXIT=no
question="Enter the NetInfo domain to import from [/]:"
---- MigrationTools-36/migrate_all_nisplus_offline.sh Mon Feb 5 11:39:14 2001
-+++ MigrationTools-36/migrate_all_nisplus_offline.sh Mon Feb 5 11:43:23 2001
-@@ -41,16 +41,16 @@
+diff -up MigrationTools-47/migrate_all_nis_offline.sh.patch2 MigrationTools-47/migrate_all_nis_offline.sh
+--- MigrationTools-47/migrate_all_nis_offline.sh.patch2 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_nis_offline.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -41,15 +41,15 @@ export PATH
INSTDIR=/usr/share/migrationtools/
TMPDIR="/tmp"
@@ -68,7 +71,6 @@
-ETC_RPC="$TMPDIR/rpc.$$.ldap"
-ETC_HOSTS="$TMPDIR/hosts.$$.ldap"
-ETC_NETWORKS="$TMPDIR/networks.$$.ldap"
--ETC_NETGROUP="$TMPDIR/netgroup.$$.ldap"
-ETC_ALIASES="$TMPDIR/aliases.$$.ldap"
+ETC_PASSWD=`mktemp $TMPDIR/passwd.ldap.XXXXXX`
+ETC_GROUP=`mktemp $TMPDIR/group.ldap.XXXXXX`
@@ -78,14 +80,14 @@
+ETC_RPC=`mktemp $TMPDIR/rpc.ldap.XXXXXX`
+ETC_HOSTS=`mktemp $TMPDIR/hosts.ldap.XXXXXX`
+ETC_NETWORKS=`mktemp $TMPDIR/networks.ldap.XXXXXX`
-+ETC_NETGROUP=`mktemp $TMPDIR/netgroup.ldap.XXXXXX`
+ETC_ALIASES=`mktemp $TMPDIR/aliases.ldap.XXXXXX`
EXIT=no
- question="Enter the NIS+ domain to import from (optional): "
---- MigrationTools-36/migrate_all_nisplus_online.sh Mon Feb 5 11:39:14 2001
-+++ MigrationTools-36/migrate_all_nisplus_online.sh Mon Feb 5 11:45:18 2001
-@@ -41,16 +41,16 @@
+ question="Enter the NIS domain to import from (optional): "
+diff -up MigrationTools-47/migrate_all_nis_online.sh.patch2 MigrationTools-47/migrate_all_nis_online.sh
+--- MigrationTools-47/migrate_all_nis_online.sh.patch2 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_nis_online.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -41,15 +41,15 @@ export PATH
INSTDIR=/usr/share/migrationtools/
TMPDIR="/tmp"
@@ -97,7 +99,6 @@
-ETC_RPC="$TMPDIR/rpc.$$.ldap"
-ETC_HOSTS="$TMPDIR/hosts.$$.ldap"
-ETC_NETWORKS="$TMPDIR/networks.$$.ldap"
--ETC_NETGROUP="$TMPDIR/netgroup.$$.ldap"
-ETC_ALIASES="$TMPDIR/aliases.$$.ldap"
+ETC_PASSWD=`mktemp $TMPDIR/passwd.ldap.XXXXXX`
+ETC_GROUP=`mktemp $TMPDIR/group.ldap.XXXXXX`
@@ -107,36 +108,14 @@
+ETC_RPC=`mktemp $TMPDIR/rpc.ldap.XXXXXX`
+ETC_HOSTS=`mktemp $TMPDIR/hosts.ldap.XXXXXX`
+ETC_NETWORKS=`mktemp $TMPDIR/networks.ldap.XXXXXX`
-+ETC_NETGROUP=`mktemp $TMPDIR/netgroup.ldap.XXXXXX`
+ETC_ALIASES=`mktemp $TMPDIR/aliases.ldap.XXXXXX`
EXIT=no
- question="Enter the NIS+ domain to import from (optional): "
---- MigrationTools-36/migrate_all_offline.sh Mon Feb 5 11:39:14 2001
-+++ MigrationTools-36/migrate_all_offline.sh Mon Feb 5 11:39:14 2001
-@@ -42,7 +42,7 @@
- #
-
- INSTDIR=/usr/share/migrationtools/
--DB="/tmp/nis.$$.ldif"
-+DB=`mktemp /tmp/nis.ldif.XXXXXX`
-
- if [ "X$ETC_ALIASES" = "X" ]; then
- ETC_ALIASES=/etc/aliases
---- MigrationTools-36/migrate_all_online.sh Mon Feb 5 11:39:14 2001
-+++ MigrationTools-36/migrate_all_online.sh Mon Feb 5 11:39:14 2001
-@@ -40,7 +40,7 @@
-
- INSTDIR=/usr/share/migrationtools/
-
--DB=/tmp/nis.$$.ldif
-+DB=`mktemp /tmp/nis.ldif.XXXXXX`
-
- if [ "X$ETC_ALIASES" = "X" ]; then
- ETC_ALIASES=/etc/aliases
---- MigrationTools-36/migrate_all_nis_offline.sh Mon Feb 5 11:39:14 2001
-+++ MigrationTools-36/migrate_all_nis_offline.sh Mon Feb 5 11:39:14 2001
-@@ -41,15 +41,15 @@
+ question="Enter the NIS domain to import from (optional): "
+diff -up MigrationTools-47/migrate_all_nisplus_offline.sh.patch2 MigrationTools-47/migrate_all_nisplus_offline.sh
+--- MigrationTools-47/migrate_all_nisplus_offline.sh.patch2 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_nisplus_offline.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -41,16 +41,16 @@ export PATH
INSTDIR=/usr/share/migrationtools/
TMPDIR="/tmp"
@@ -148,6 +127,7 @@
-ETC_RPC="$TMPDIR/rpc.$$.ldap"
-ETC_HOSTS="$TMPDIR/hosts.$$.ldap"
-ETC_NETWORKS="$TMPDIR/networks.$$.ldap"
+-ETC_NETGROUP="$TMPDIR/netgroup.$$.ldap"
-ETC_ALIASES="$TMPDIR/aliases.$$.ldap"
+ETC_PASSWD=`mktemp $TMPDIR/passwd.ldap.XXXXXX`
+ETC_GROUP=`mktemp $TMPDIR/group.ldap.XXXXXX`
@@ -157,13 +137,15 @@
+ETC_RPC=`mktemp $TMPDIR/rpc.ldap.XXXXXX`
+ETC_HOSTS=`mktemp $TMPDIR/hosts.ldap.XXXXXX`
+ETC_NETWORKS=`mktemp $TMPDIR/networks.ldap.XXXXXX`
++ETC_NETGROUP=`mktemp $TMPDIR/netgroup.ldap.XXXXXX`
+ETC_ALIASES=`mktemp $TMPDIR/aliases.ldap.XXXXXX`
EXIT=no
- question="Enter the NIS domain to import from (optional): "
---- MigrationTools-36/migrate_all_nis_online.sh Mon Feb 5 11:39:14 2001
-+++ MigrationTools-36/migrate_all_nis_online.sh Mon Feb 5 11:39:14 2001
-@@ -41,15 +41,15 @@
+ question="Enter the NIS+ domain to import from (optional): "
+diff -up MigrationTools-47/migrate_all_nisplus_online.sh.patch2 MigrationTools-47/migrate_all_nisplus_online.sh
+--- MigrationTools-47/migrate_all_nisplus_online.sh.patch2 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_nisplus_online.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -41,16 +41,16 @@ export PATH
INSTDIR=/usr/share/migrationtools/
TMPDIR="/tmp"
@@ -175,6 +157,7 @@
-ETC_RPC="$TMPDIR/rpc.$$.ldap"
-ETC_HOSTS="$TMPDIR/hosts.$$.ldap"
-ETC_NETWORKS="$TMPDIR/networks.$$.ldap"
+-ETC_NETGROUP="$TMPDIR/netgroup.$$.ldap"
-ETC_ALIASES="$TMPDIR/aliases.$$.ldap"
+ETC_PASSWD=`mktemp $TMPDIR/passwd.ldap.XXXXXX`
+ETC_GROUP=`mktemp $TMPDIR/group.ldap.XXXXXX`
@@ -184,7 +167,32 @@
+ETC_RPC=`mktemp $TMPDIR/rpc.ldap.XXXXXX`
+ETC_HOSTS=`mktemp $TMPDIR/hosts.ldap.XXXXXX`
+ETC_NETWORKS=`mktemp $TMPDIR/networks.ldap.XXXXXX`
++ETC_NETGROUP=`mktemp $TMPDIR/netgroup.ldap.XXXXXX`
+ETC_ALIASES=`mktemp $TMPDIR/aliases.ldap.XXXXXX`
EXIT=no
- question="Enter the NIS domain to import from (optional): "
+ question="Enter the NIS+ domain to import from (optional): "
+diff -up MigrationTools-47/migrate_all_offline.sh.patch2 MigrationTools-47/migrate_all_offline.sh
+--- MigrationTools-47/migrate_all_offline.sh.patch2 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_offline.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -42,7 +42,7 @@
+ #
+
+ INSTDIR=/usr/share/migrationtools/
+-DB="/tmp/nis.$$.ldif"
++DB=`mktemp /tmp/nis.ldif.XXXXXX`
+
+ if [ "X$ETC_ALIASES" = "X" ]; then
+ ETC_ALIASES=/etc/aliases
+diff -up MigrationTools-47/migrate_all_online.sh.patch2 MigrationTools-47/migrate_all_online.sh
+--- MigrationTools-47/migrate_all_online.sh.patch2 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_online.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -40,7 +40,7 @@ export SHELL
+
+ INSTDIR=/usr/share/migrationtools/
+
+-DB=/tmp/nis.$$.ldif
++DB=`mktemp /tmp/nis.ldif.XXXXXX`
+
+ if [ "X$ETC_ALIASES" = "X" ]; then
+ ETC_ALIASES=/etc/aliases
MigrationTools-38-instdir.patch:
Index: MigrationTools-38-instdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/migrationtools/devel/MigrationTools-38-instdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MigrationTools-38-instdir.patch 29 Feb 2008 08:26:25 -0000 1.1
+++ MigrationTools-38-instdir.patch 29 Aug 2008 07:15:01 -0000 1.2
@@ -1,8 +1,21 @@
We know where these scripts are going to be installed, so add the necessary
magic to let them be called from anywhere.
---- MigrationTools-38/migrate_all_netinfo_offline.sh Thu Jul 16 07:51:12 1998
-+++ MigrationTools-38/migrate_all_netinfo_offline.sh Wed Jun 20 18:19:17 2001
+diff -up MigrationTools-47/migrate_aliases.pl.patch1 MigrationTools-47/migrate_aliases.pl
+--- MigrationTools-47/migrate_aliases.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_aliases.pl 2008-08-29 09:09:19.000000000 +0200
+@@ -36,7 +36,7 @@
+ # thanks to Dave McPike
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/migrationtools/migrate_common.ph';
+
+ $PROGRAM = "migrate_aliases.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+diff -up MigrationTools-47/migrate_all_netinfo_offline.sh.patch1 MigrationTools-47/migrate_all_netinfo_offline.sh
+--- MigrationTools-47/migrate_all_netinfo_offline.sh.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_all_netinfo_offline.sh 2008-08-29 09:09:19.000000000 +0200
@@ -38,6 +38,7 @@
PATH=$PATH:.
@@ -11,7 +24,7 @@
TMPDIR="/tmp"
ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
-@@ -68,7 +69,7 @@
+@@ -68,7 +69,7 @@ nidump hosts $DOM > $ETC_HOSTS
nidump networks $DOM > $ETC_NETWORKS
nidump aliases $DOM > $ETC_ALIASES
@@ -20,8 +33,9 @@
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
---- MigrationTools-38/migrate_all_netinfo_online.sh Thu Jul 16 07:51:12 1998
-+++ MigrationTools-38/migrate_all_netinfo_online.sh Wed Jun 20 18:19:17 2001
+diff -up MigrationTools-47/migrate_all_netinfo_online.sh.patch1 MigrationTools-47/migrate_all_netinfo_online.sh
+--- MigrationTools-47/migrate_all_netinfo_online.sh.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_all_netinfo_online.sh 2008-08-29 09:09:19.000000000 +0200
@@ -38,6 +38,7 @@
PATH=$PATH:.
@@ -30,7 +44,7 @@
TMPDIR="/tmp"
ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
-@@ -68,7 +69,7 @@
+@@ -68,7 +69,7 @@ nidump hosts $DOM > $ETC_HOSTS
nidump networks $DOM > $ETC_NETWORKS
nidump aliases $DOM > $ETC_ALIASES
@@ -39,8 +53,9 @@
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
---- MigrationTools-38/migrate_all_nis_offline.sh Thu Jul 16 07:51:12 1998
-+++ MigrationTools-38/migrate_all_nis_offline.sh Wed Jun 20 18:19:17 2001
+diff -up MigrationTools-47/migrate_all_nis_offline.sh.patch1 MigrationTools-47/migrate_all_nis_offline.sh
+--- MigrationTools-47/migrate_all_nis_offline.sh.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_all_nis_offline.sh 2008-08-29 09:09:19.000000000 +0200
@@ -38,6 +38,7 @@
PATH=$PATH:.
@@ -49,7 +64,7 @@
TMPDIR="/tmp"
ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
-@@ -70,7 +71,7 @@
+@@ -70,7 +71,7 @@ ypcat $DOMFLAG hosts > $ETC_HOSTS
ypcat $DOMFLAG networks > $ETC_NETWORKS
#ypcat $DOMFLAG -k aliases > $ETC_ALIASES
@@ -58,8 +73,9 @@
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
---- MigrationTools-38/migrate_all_nis_online.sh Thu Jul 16 07:51:12 1998
-+++ MigrationTools-38/migrate_all_nis_online.sh Wed Jun 20 18:19:17 2001
+diff -up MigrationTools-47/migrate_all_nis_online.sh.patch1 MigrationTools-47/migrate_all_nis_online.sh
+--- MigrationTools-47/migrate_all_nis_online.sh.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_all_nis_online.sh 2008-08-29 09:09:19.000000000 +0200
@@ -38,7 +38,7 @@
PATH=$PATH:.
@@ -69,7 +85,7 @@
TMPDIR="/tmp"
ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ ypcat $DOMFLAG hosts > $ETC_HOSTS
ypcat $DOMFLAG networks > $ETC_NETWORKS
#ypcat $DOMFLAG -k aliases > $ETC_ALIASES
@@ -78,8 +94,9 @@
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
---- MigrationTools-38/migrate_all_nisplus_offline.sh Fri Feb 2 09:20:56 2001
-+++ MigrationTools-38/migrate_all_nisplus_offline.sh Wed Jun 20 18:19:17 2001
+diff -up MigrationTools-47/migrate_all_nisplus_offline.sh.patch1 MigrationTools-47/migrate_all_nisplus_offline.sh
+--- MigrationTools-47/migrate_all_nisplus_offline.sh.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_all_nisplus_offline.sh 2008-08-29 09:09:19.000000000 +0200
@@ -38,6 +38,7 @@
PATH=$PATH:/usr/lib/nis:.
@@ -88,7 +105,7 @@
TMPDIR="/tmp"
ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
-@@ -72,7 +73,7 @@
+@@ -72,7 +73,7 @@ nisaddent -d networks $DOM > $ETC_NETWOR
nisaddent -d netgroup $DOM > $ETC_NETGROUP
niscat mail_aliases.org_dir.$DOM > $ETC_ALIASES
@@ -97,8 +114,9 @@
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
---- MigrationTools-38/migrate_all_nisplus_online.sh Fri Feb 2 09:20:56 2001
-+++ MigrationTools-38/migrate_all_nisplus_online.sh Wed Jun 20 18:19:17 2001
+diff -up MigrationTools-47/migrate_all_nisplus_online.sh.patch1 MigrationTools-47/migrate_all_nisplus_online.sh
+--- MigrationTools-47/migrate_all_nisplus_online.sh.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_all_nisplus_online.sh 2008-08-29 09:09:19.000000000 +0200
@@ -38,7 +38,7 @@
PATH=$PATH:.
@@ -108,7 +126,7 @@
TMPDIR="/tmp"
ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ nisaddent -d networks $DOM > $ETC_NETWOR
nisaddent -d netgroup $DOM > $ETC_NETGROUP
niscat mail_aliases.org_dir.$DOM > $ETC_ALIASES
@@ -117,8 +135,9 @@
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
---- MigrationTools-38/migrate_all_offline.sh Tue Oct 17 02:33:33 2000
-+++ MigrationTools-38/migrate_all_offline.sh Wed Jun 20 18:19:17 2001
+diff -up MigrationTools-47/migrate_all_offline.sh.patch1 MigrationTools-47/migrate_all_offline.sh
+--- MigrationTools-47/migrate_all_offline.sh.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_all_offline.sh 2008-08-29 09:09:19.000000000 +0200
@@ -41,6 +41,7 @@
# Luke Howard <lukeh at padl.com> April 1997
#
@@ -127,7 +146,7 @@
DB="/tmp/nis.$$.ldif"
if [ "X$ETC_ALIASES" = "X" ]; then
-@@ -108,32 +109,32 @@
+@@ -108,32 +109,32 @@ if [ "X$LDIF2LDBM" = "X" ]; then
fi
echo "Creating naming context entries..."
@@ -173,8 +192,9 @@
echo "Preparing LDAP database..."
if [ "X$SLAPADD" = "X" ]; then
$LDIF2LDBM -i $DB
---- MigrationTools-38/migrate_all_online.sh Sat Jan 6 22:39:20 2001
-+++ MigrationTools-38/migrate_all_online.sh Wed Jun 20 18:19:17 2001
+diff -up MigrationTools-47/migrate_all_online.sh.patch1 MigrationTools-47/migrate_all_online.sh
+--- MigrationTools-47/migrate_all_online.sh.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_all_online.sh 2008-08-29 09:09:19.000000000 +0200
@@ -38,6 +38,8 @@
SHELL=/bin/sh
export SHELL
@@ -184,7 +204,7 @@
DB=/tmp/nis.$$.ldif
if [ "X$ETC_ALIASES" = "X" ]; then
-@@ -104,7 +106,7 @@
+@@ -104,7 +106,7 @@ if [ "X$PERL" = "X" ]; then
fi
if [ "X$LDAP_BASEDN" = "X" ]; then
@@ -193,7 +213,7 @@
question="Enter the X.500 naming context you wish to import into: [$defaultcontext]"
echo "$question " | tr -d '\012' > /dev/tty
read LDAP_BASEDN
-@@ -160,35 +162,35 @@
+@@ -160,35 +162,35 @@ echo
echo "Importing into $LDAP_BASEDN..."
echo
echo "Creating naming context entries..."
@@ -243,19 +263,9 @@
echo "Importing into LDAP..."
---- MigrationTools-38/migrate_aliases.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_aliases.pl Wed Jun 20 18:20:28 2001
-@@ -36,7 +36,7 @@
- # thanks to Dave McPike
- #
-
--require 'migrate_common.ph';
-+require '/usr/share/migrationtools/migrate_common.ph';
-
- $PROGRAM = "migrate_aliases.pl";
- $NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_automount.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_automount.pl Wed Jun 20 18:20:35 2001
+diff -up MigrationTools-47/migrate_automount.pl.patch1 MigrationTools-47/migrate_automount.pl
+--- MigrationTools-47/migrate_automount.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_automount.pl 2008-08-29 09:09:19.000000000 +0200
@@ -33,7 +33,7 @@
# services migration tool
#
@@ -265,8 +275,9 @@
$PROGRAM = "migrate_automount.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_base.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_base.pl Wed Jun 20 18:20:51 2001
+diff -up MigrationTools-47/migrate_base.pl.patch1 MigrationTools-47/migrate_base.pl
+--- MigrationTools-47/migrate_base.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_base.pl 2008-08-29 09:09:19.000000000 +0200
@@ -36,7 +36,7 @@
#
#
@@ -276,8 +287,9 @@
$PROGRAM = "migrate_base.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_fstab.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_fstab.pl Wed Jun 20 18:20:57 2001
+diff -up MigrationTools-47/migrate_fstab.pl.patch1 MigrationTools-47/migrate_fstab.pl
+--- MigrationTools-47/migrate_fstab.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_fstab.pl 2008-08-29 09:09:19.000000000 +0200
@@ -37,7 +37,7 @@
# They are used by MacOS X Server, however.
#
@@ -287,8 +299,9 @@
$PROGRAM = "migrate_fstab.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_group.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_group.pl Wed Jun 20 18:21:01 2001
+diff -up MigrationTools-47/migrate_group.pl.patch1 MigrationTools-47/migrate_group.pl
+--- MigrationTools-47/migrate_group.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_group.pl 2008-08-29 09:09:19.000000000 +0200
@@ -36,7 +36,7 @@
#
#
@@ -298,8 +311,9 @@
$PROGRAM = "migrate_group.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_hosts.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_hosts.pl Wed Jun 20 18:21:03 2001
+diff -up MigrationTools-47/migrate_hosts.pl.patch1 MigrationTools-47/migrate_hosts.pl
+--- MigrationTools-47/migrate_hosts.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_hosts.pl 2008-08-29 09:09:19.000000000 +0200
@@ -36,7 +36,7 @@
#
#
@@ -309,8 +323,9 @@
$PROGRAM = "migrate_hosts.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_netgroup.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_netgroup.pl Wed Jun 20 18:21:06 2001
+diff -up MigrationTools-47/migrate_netgroup_byhost.pl.patch1 MigrationTools-47/migrate_netgroup_byhost.pl
+--- MigrationTools-47/migrate_netgroup_byhost.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_netgroup_byhost.pl 2008-08-29 09:09:19.000000000 +0200
@@ -36,7 +36,7 @@
#
#
@@ -318,10 +333,11 @@
-require 'migrate_common.ph';
+require '/usr/share/migrationtools/migrate_common.ph';
- $PROGRAM = "migrate_netgroup.pl";
+ $PROGRAM = "migrate_netgroup_byhost.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_netgroup_byhost.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_netgroup_byhost.pl Wed Jun 20 18:21:09 2001
+diff -up MigrationTools-47/migrate_netgroup_byuser.pl.patch1 MigrationTools-47/migrate_netgroup_byuser.pl
+--- MigrationTools-47/migrate_netgroup_byuser.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_netgroup_byuser.pl 2008-08-29 09:09:19.000000000 +0200
@@ -36,7 +36,7 @@
#
#
@@ -329,21 +345,23 @@
-require 'migrate_common.ph';
+require '/usr/share/migrationtools/migrate_common.ph';
- $PROGRAM = "migrate_netgroup_byhost.pl";
+ $PROGRAM = "migrate_netgroup_byuser.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_netgroup_byuser.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_netgroup_byuser.pl Wed Jun 20 18:21:12 2001
+diff -up MigrationTools-47/migrate_netgroup.pl.patch1 MigrationTools-47/migrate_netgroup.pl
+--- MigrationTools-47/migrate_netgroup.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_netgroup.pl 2008-08-29 09:09:19.000000000 +0200
@@ -36,7 +36,7 @@
- #
+ # line continuation support by Bob Apthorpe
#
-require 'migrate_common.ph';
+require '/usr/share/migrationtools/migrate_common.ph';
- $PROGRAM = "migrate_netgroup_byuser.pl";
+ $PROGRAM = "migrate_netgroup.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_networks.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_networks.pl Wed Jun 20 18:21:14 2001
+diff -up MigrationTools-47/migrate_networks.pl.patch1 MigrationTools-47/migrate_networks.pl
+--- MigrationTools-47/migrate_networks.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_networks.pl 2008-08-29 09:09:19.000000000 +0200
@@ -36,7 +36,7 @@
#
#
@@ -353,8 +371,9 @@
$PROGRAM = "migrate_networks.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_passwd.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_passwd.pl Wed Jun 20 18:21:16 2001
+diff -up MigrationTools-47/migrate_passwd.pl.patch1 MigrationTools-47/migrate_passwd.pl
+--- MigrationTools-47/migrate_passwd.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_passwd.pl 2008-08-29 09:09:19.000000000 +0200
@@ -37,7 +37,7 @@
# Thanks to Peter Jacob Slot <peter at vision.auk.dk>.
#
@@ -364,8 +383,9 @@
$PROGRAM = "migrate_passwd.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_profile.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_profile.pl Wed Jun 20 18:21:18 2001
+diff -up MigrationTools-47/migrate_profile.pl.patch1 MigrationTools-47/migrate_profile.pl
+--- MigrationTools-47/migrate_profile.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_profile.pl 2008-08-29 09:09:19.000000000 +0200
@@ -36,7 +36,7 @@
#
#
@@ -375,8 +395,9 @@
$PROGRAM = "migrate_profile.pl";
---- MigrationTools-38/migrate_protocols.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_protocols.pl Wed Jun 20 18:21:21 2001
+diff -up MigrationTools-47/migrate_protocols.pl.patch1 MigrationTools-47/migrate_protocols.pl
+--- MigrationTools-47/migrate_protocols.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_protocols.pl 2008-08-29 09:09:19.000000000 +0200
@@ -36,7 +36,7 @@
#
#
@@ -386,8 +407,9 @@
$PROGRAM = "migrate_protocols.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_rpc.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_rpc.pl Wed Jun 20 18:21:23 2001
+diff -up MigrationTools-47/migrate_rpc.pl.patch1 MigrationTools-47/migrate_rpc.pl
+--- MigrationTools-47/migrate_rpc.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_rpc.pl 2008-08-29 09:09:19.000000000 +0200
@@ -36,7 +36,7 @@
#
#
@@ -397,9 +419,10 @@
$PROGRAM = "migrate_rpc.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_services.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_services.pl Wed Jun 20 18:21:25 2001
-@@ -35,7 +35,7 @@
+diff -up MigrationTools-47/migrate_services.pl.patch1 MigrationTools-47/migrate_services.pl
+--- MigrationTools-47/migrate_services.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_services.pl 2008-08-29 09:09:19.000000000 +0200
+@@ -37,7 +37,7 @@
#
#
@@ -408,8 +431,9 @@
$PROGRAM = "migrate_services.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
---- MigrationTools-38/migrate_slapd_conf.pl Wed Jun 20 18:20:06 2001
-+++ MigrationTools-38/migrate_slapd_conf.pl Wed Jun 20 18:21:29 2001
+diff -up MigrationTools-47/migrate_slapd_conf.pl.patch1 MigrationTools-47/migrate_slapd_conf.pl
+--- MigrationTools-47/migrate_slapd_conf.pl.patch1 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_slapd_conf.pl 2008-08-29 09:09:19.000000000 +0200
@@ -36,7 +36,7 @@
#
#
MigrationTools-45-noaliases.patch:
Index: MigrationTools-45-noaliases.patch
===================================================================
RCS file: /cvs/pkgs/rpms/migrationtools/devel/MigrationTools-45-noaliases.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MigrationTools-45-noaliases.patch 29 Feb 2008 08:26:25 -0000 1.1
+++ MigrationTools-45-noaliases.patch 29 Aug 2008 07:15:01 -0000 1.2
@@ -1,10 +1,11 @@
Don't migrate aliases by default, the schema used is no longer included in the
default server configuration.
---- MigrationTools-45/migrate_all_offline.sh 2004-10-05 17:36:58.000000000 -0400
-+++ MigrationTools-45/migrate_all_offline.sh 2004-10-05 17:37:03.000000000 -0400
+diff -up MigrationTools-47/migrate_all_offline.sh.patch6 MigrationTools-47/migrate_all_offline.sh
+--- MigrationTools-47/migrate_all_offline.sh.patch6 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_offline.sh 2008-08-29 09:09:19.000000000 +0200
@@ -44,9 +44,9 @@
- INSTDIR=/usr/share/openldap/migration/
+ INSTDIR=/usr/share/migrationtools/
DB=`mktemp /tmp/nis.ldif.XXXXXX`
-if [ "X$ETC_ALIASES" = "X" ]; then
@@ -16,7 +17,7 @@
#if [ "X$ETC_FSTAB" = "X" ]; then
# ETC_FSTAB=/etc/fstab
#fi
-@@ -110,8 +110,8 @@
+@@ -110,8 +110,8 @@ fi
echo "Creating naming context entries..."
$PERL -I${INSTDIR} ${INSTDIR}migrate_base.pl > $DB
@@ -27,9 +28,10 @@
#echo "Migrating fstab..."
#$PERL -I${INSTDIR} ${INSTDIR}migrate_fstab.pl $ETC_FSTAB >> $DB
echo "Migrating groups..."
---- MigrationTools-45/migrate_all_online.sh 2004-10-05 17:37:11.000000000 -0400
-+++ MigrationTools-45/migrate_all_online.sh 2004-10-05 17:37:26.000000000 -0400
-@@ -42,9 +42,9 @@
+diff -up MigrationTools-47/migrate_all_online.sh.patch6 MigrationTools-47/migrate_all_online.sh
+--- MigrationTools-47/migrate_all_online.sh.patch6 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_online.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -42,9 +42,9 @@ INSTDIR=/usr/share/migrationtools/
DB=`mktemp /tmp/nis.ldif.XXXXXX`
@@ -42,7 +44,7 @@
#if [ "X$ETC_FSTAB" = "X" ]; then
# ETC_FSTAB=/etc/fstab
#fi
-@@ -167,8 +167,8 @@
+@@ -167,8 +167,8 @@ if [ "X$LDAP_PROFILE" = "Xyes" ]; then
echo "Creating DUAConfigProfile entry..."
$PERL -I${INSTDIR} ${INSTDIR}migrate_profile.pl "$LDAPHOST" >> $DB
fi
MigrationTools-46-ddp.patch:
Index: MigrationTools-46-ddp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/migrationtools/devel/MigrationTools-46-ddp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MigrationTools-46-ddp.patch 29 Feb 2008 08:26:25 -0000 1.1
+++ MigrationTools-46-ddp.patch 29 Aug 2008 07:15:01 -0000 1.2
@@ -1,6 +1,7 @@
---- MigrationTools-46/migrate_services.pl.orig 2007-05-23 14:41:22.000000000 +0200
-+++ MigrationTools-46/migrate_services.pl 2007-05-23 14:42:55.000000000 +0200
-@@ -102,6 +102,12 @@
+diff -up MigrationTools-47/migrate_services.pl.patch7 MigrationTools-47/migrate_services.pl
+--- MigrationTools-47/migrate_services.pl.patch7 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_services.pl 2008-08-29 09:09:19.000000000 +0200
+@@ -102,6 +102,12 @@ sub parse_services
my ($servicename, $portproto, @aliases) = split(m/\s+/o, $card);
my ($rawport, $proto) = split(m#[/,]#o, $portproto);
MigrationTools-46-schema.patch:
Index: MigrationTools-46-schema.patch
===================================================================
RCS file: /cvs/pkgs/rpms/migrationtools/devel/MigrationTools-46-schema.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MigrationTools-46-schema.patch 29 Feb 2008 08:26:25 -0000 1.1
+++ MigrationTools-46-schema.patch 29 Aug 2008 07:15:01 -0000 1.2
@@ -1,30 +1,9 @@
Supply dummy descriptions which, due to typos, are required.
-diff -uNr MigrationTools/migrate_protocols.pl MigrationTools/migrate_protocols.pl
---- MigrationTools/migrate_protocols.pl Thu Oct 12 00:50:34 2000
-+++ MigrationTools/migrate_protocols.pl Thu Oct 12 00:50:11 2000
-@@ -72,6 +72,7 @@
- foreach $_ (@aliases) {
- print $HANDLE "cn: $_\n";
- }
-+ print $HANDLE "description: IP protocol $number ($name)\n";
- print $HANDLE "\n";
- }
-
-diff -uNr MigrationTools/migrate_rpc.pl MigrationTools/migrate_rpc.pl
---- MigrationTools/migrate_rpc.pl Thu Oct 12 00:50:34 2000
-+++ MigrationTools/migrate_rpc.pl Thu Oct 12 00:50:11 2000
-@@ -74,6 +74,7 @@
- foreach $_ (@aliases) {
- print $HANDLE "cn: $_\n";
- }
-+ print $HANDLE "description: ONC RPC number $rpcnumber ($rpcname)\n";
- print $HANDLE "\n";
- }
-
---- MigrationTools/migrate_common.ph 2002-07-09 23:59:22.000000000 -0400
-+++ MigrationTools/migrate_common.ph 2003-05-02 16:58:19.000000000 -0400
-@@ -83,7 +83,7 @@
+diff -up MigrationTools-47/migrate_common.ph.patch5 MigrationTools-47/migrate_common.ph
+--- MigrationTools-47/migrate_common.ph.patch5 2006-01-25 05:18:16.000000000 +0100
++++ MigrationTools-47/migrate_common.ph 2008-08-29 09:09:19.000000000 +0200
+@@ -83,7 +83,7 @@ $DEFAULT_BASE = "dc=padl,dc=com";
##### CUT HERE #####
# where /etc/mail/ldapdomains contains names of ldap_routed
# domains (similiar to MASQUERADE_DOMAIN_FILE).
@@ -33,7 +12,7 @@
# turn this on to support more general object clases
# such as person.
-@@ -120,10 +120,10 @@
+@@ -120,10 +120,10 @@ if (!defined($DEFAULT_BASE)) {
}
# Default Kerberos realm
@@ -48,3 +27,25 @@
if (-x "/usr/sbin/revnetgroup") {
$REVNETGROUP = "/usr/sbin/revnetgroup";
+diff -up MigrationTools-47/migrate_protocols.pl.patch5 MigrationTools-47/migrate_protocols.pl
+--- MigrationTools-47/migrate_protocols.pl.patch5 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_protocols.pl 2008-08-29 09:09:19.000000000 +0200
+@@ -76,6 +76,7 @@ sub dump_protocol
+ foreach $_ (@aliases) {
+ print $HANDLE "cn: $_\n";
+ }
++ print $HANDLE "description: IP protocol $number ($name)\n";
+ print $HANDLE "\n";
+ }
+
+diff -up MigrationTools-47/migrate_rpc.pl.patch5 MigrationTools-47/migrate_rpc.pl
+--- MigrationTools-47/migrate_rpc.pl.patch5 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_rpc.pl 2008-08-29 09:09:19.000000000 +0200
+@@ -77,6 +77,7 @@ sub dump_rpc
+ foreach $_ (@aliases) {
+ print $HANDLE "cn: $_\n";
+ }
++ print $HANDLE "description: ONC RPC number $rpcnumber ($rpcname)\n";
+ print $HANDLE "\n";
+ }
+
MigrationTools-46-unique-hosts.patch:
Index: MigrationTools-46-unique-hosts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/migrationtools/devel/MigrationTools-46-unique-hosts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MigrationTools-46-unique-hosts.patch 29 Feb 2008 08:26:25 -0000 1.1
+++ MigrationTools-46-unique-hosts.patch 29 Aug 2008 07:15:01 -0000 1.2
@@ -1,7 +1,8 @@
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 @@
+diff -up MigrationTools-47/migrate_all_nis_offline.sh.patch8 MigrationTools-47/migrate_all_nis_offline.sh
+--- MigrationTools-47/migrate_all_nis_offline.sh.patch8 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_nis_offline.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -67,7 +67,7 @@ ypcat $DOMFLAG services > $ETC_SERVICES
ypcat $DOMFLAG protocols > $ETC_PROTOCOLS
touch $ETC_FSTAB
ypcat $DOMFLAG rpc.byname > $ETC_RPC
@@ -10,9 +11,10 @@
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 @@
+diff -up MigrationTools-47/migrate_all_nis_online.sh.patch8 MigrationTools-47/migrate_all_nis_online.sh
+--- MigrationTools-47/migrate_all_nis_online.sh.patch8 2008-08-29 09:09:19.000000000 +0200
++++ MigrationTools-47/migrate_all_nis_online.sh 2008-08-29 09:09:19.000000000 +0200
+@@ -67,7 +67,7 @@ ypcat $DOMFLAG services > $ETC_SERVICES
ypcat $DOMFLAG protocols > $ETC_PROTOCOLS
touch $ETC_FSTAB
ypcat $DOMFLAG rpc.byname > $ETC_RPC
Index: migrationtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/migrationtools/devel/migrationtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- migrationtools.spec 29 Feb 2008 08:26:25 -0000 1.1
+++ migrationtools.spec 29 Aug 2008 07:15:01 -0000 1.2
@@ -1,16 +1,17 @@
%define version 47
Name: migrationtools
Version: %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Migration scripts for LDAP
Group: System Environment/Daemons
License: BSD
URL: http://www.padl.com/OSS/MigrationTools.html
Source0: http://www.padl.com/download/MigrationTools-%{version}.tar.gz
+Source1: migration-tools.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: perl, openldap-clients, openldap-servers
+Requires: perl, openldap-clients, ldif2ldbm
Patch1: MigrationTools-38-instdir.patch
Patch2: MigrationTools-36-mktemp.patch
@@ -49,6 +50,7 @@
# remove unpackaged files
rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/*.{instdir,simple,schema,mktemp,suffix,noaliases}
+cp %SOURCE1 .
%clean
rm -rf $RPM_BUILD_ROOT
@@ -60,8 +62,13 @@
%attr(0755,root,root) /%{_datadir}/%{name}/*.pl
%attr(0755,root,root) /%{_datadir}/%{name}/*.sh
%doc README
+%doc migration-tools.txt
%changelog
+* Fri Aug 29 2008 Jan Safranek <jsafrane at redhat.com> 47-2
+- added support for Fedora DS (when it provides ldif2ldbm)
+- rediffed all patches to get rid of patch fuzz
+
* Thu Feb 28 2008 Jan Safranek <jsafrane at redhat.com> 47-1
- package carved out of openldap-servers
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/migrationtools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 29 Feb 2008 08:26:25 -0000 1.2
+++ sources 29 Aug 2008 07:15:01 -0000 1.3
@@ -1 +1,2 @@
3faf83eb8482e55979bda47f1d1e6501 MigrationTools-47.tar.gz
+11d473de1079592e9b32a756b78ad766 migration-tools.txt
More information about the fedora-extras-commits
mailing list