Bug #52052, objectclass account fixing.

10 files changed, 103 insertions, 11 deletions

diff --git a/net-nds/migrationtools/ChangeLog b/net-nds/migrationtools/ChangeLog
index cc4ef46f742d..aee3bf191f35 100644
--- a/net-nds/migrationtools/ChangeLog
+++ b/net-nds/migrationtools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nds/migrationtools
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/ChangeLog,v 1.10 2004/11/01 01:44:11 robbat2 Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/ChangeLog,v 1.11 2005/01/07 12:24:23 robbat2 Exp $
+
+*migrationtools-44-r2 (07 Jan 2005)
+*migrationtools-45-r1 (07 Jan 2005)
+
+  07 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/skip-account-objectclass.patch, +migrationtools-44-r2.ebuild,
+  +migrationtools-45-r1.ebuild:
+  Bug #52052, objectclass account fixing.
 
 *migrationtools-46 (31 Oct 2004)
 
diff --git a/net-nds/migrationtools/Manifest b/net-nds/migrationtools/Manifest
index ef15af1a151b..5b097357c2cb 100644
--- a/net-nds/migrationtools/Manifest
+++ b/net-nds/migrationtools/Manifest
@@ -1,8 +1,15 @@
-MD5 d0f4ae8890590f12dd085499e184e33e ChangeLog 1174
+MD5 45f8b6a74de30973e5ccee4d3f56ad41 migrationtools-45-r1.ebuild 900
+MD5 4fbe1bbee2626a24002eef7bf038bfb8 migrationtools-46.ebuild 1422
 MD5 9fcb1b08a078d3b7646d7820e425a376 migrationtools-44-r1.ebuild 665
-MD5 e0e5990445daa201b90143d6d8c0a8ec metadata.xml 393
 MD5 f877d27a61f1055a578b3bba5d9ad2b3 migrationtools-45.ebuild 784
-MD5 4fbe1bbee2626a24002eef7bf038bfb8 migrationtools-46.ebuild 1422
+MD5 2dbd215dc7665345dfa0a055d2e521ba migrationtools-46-r1.ebuild 1522
+MD5 d0f4ae8890590f12dd085499e184e33e ChangeLog 1174
+MD5 e0e5990445daa201b90143d6d8c0a8ec metadata.xml 393
+MD5 813efa33a909bd435c5b3d5175311798 migrationtools-44-r2.ebuild 781
+MD5 39681f3ee6973d71a47138580a700791 files/skip-account-objectclass.patch 404
 MD5 be251920a61a40bb429028a3e9f8b77d files/digest-migrationtools-44-r1 68
+MD5 be251920a61a40bb429028a3e9f8b77d files/digest-migrationtools-44-r2 68
+MD5 7f95cbec231a441eeb6638da670e49ad files/digest-migrationtools-45-r1 68
+MD5 f5023a2d2ae00e24e441191d96200baa files/digest-migrationtools-46-r1 68
 MD5 7f95cbec231a441eeb6638da670e49ad files/digest-migrationtools-45 68
 MD5 f5023a2d2ae00e24e441191d96200baa files/digest-migrationtools-46 68
diff --git a/net-nds/migrationtools/files/digest-migrationtools-44-r2 b/net-nds/migrationtools/files/digest-migrationtools-44-r2
new file mode 100644
index 000000000000..99424447afd8
--- /dev/null
+++ b/net-nds/migrationtools/files/digest-migrationtools-44-r2
@@ -0,0 +1 @@
+MD5 2cc51cbf0276c161724626c70b59f0b1 MigrationTools-44.tar.gz 21266
diff --git a/net-nds/migrationtools/files/digest-migrationtools-45-r1 b/net-nds/migrationtools/files/digest-migrationtools-45-r1
new file mode 100644
index 000000000000..999e2f51d397
--- /dev/null
+++ b/net-nds/migrationtools/files/digest-migrationtools-45-r1
@@ -0,0 +1 @@
+MD5 2355e54f17a1fdc87b0d56ed9ea3e115 MigrationTools-45.tar.gz 21034
diff --git a/net-nds/migrationtools/files/skip-account-objectclass.patch b/net-nds/migrationtools/files/skip-account-objectclass.patch
new file mode 100644
index 000000000000..45c5eb6d101f
--- /dev/null
+++ b/net-nds/migrationtools/files/skip-account-objectclass.patch
@@ -0,0 +1,11 @@
+--- MigrationTools-44.orig/migrate_passwd.pl	2002-07-06 18:06:23.000000000 -0300
++++ MigrationTools-44/migrate_passwd.pl	2004-10-27 08:51:56.371080648 -0300
+@@ -129,7 +129,7 @@
+ 		print $HANDLE "objectClass: inetOrgPerson\n";
+ 	}
+ 
+-	print $HANDLE "objectClass: account\n";
++	#print $HANDLE "objectClass: account\n";
+ 	print $HANDLE "objectClass: posixAccount\n";
+ 	print $HANDLE "objectClass: top\n";
+ 
diff --git a/net-nds/migrationtools/migrationtools-44-r1.ebuild b/net-nds/migrationtools/migrationtools-44-r1.ebuild
index 135c3675ea03..f5836118da30 100644
--- a/net-nds/migrationtools/migrationtools-44-r1.ebuild
+++ b/net-nds/migrationtools/migrationtools-44-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-44-r1.ebuild,v 1.9 2004/07/15 03:46:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-44-r1.ebuild,v 1.10 2005/01/07 12:24:23 robbat2 Exp $
 
 PN0=MigrationTools
 S=${WORKDIR}/${PN0}-${PV}
diff --git a/net-nds/migrationtools/migrationtools-44-r2.ebuild b/net-nds/migrationtools/migrationtools-44-r2.ebuild
new file mode 100644
index 000000000000..e2d2fd61e92f
--- /dev/null
+++ b/net-nds/migrationtools/migrationtools-44-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-44-r2.ebuild,v 1.1 2005/01/07 12:24:23 robbat2 Exp $
+
+inherit eutils
+
+PN0=MigrationTools
+S=${WORKDIR}/${PN0}-${PV}
+DESCRIPTION="PADL migration tools (scripts) for openldap"
+SRC_URI="ftp://ftp.padl.com/pub/${PN0}-${PV}.tar.gz"
+HOMEPAGE="http://www.padl.com/OSS/MigrationTools.html"
+
+SLOT="0"
+KEYWORDS="x86 sparc ~amd64"
+IUSE=""
+LICENSE="as-is"
+
+DEPEND=""
+
+RDEPEND="net-nds/openldap"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/skip-account-objectclass.patch
+}
+
+src_install() {
+	dodoc README
+	insinto /usr/share/migrationtools
+	doins migrate_*
+}
diff --git a/net-nds/migrationtools/migrationtools-45-r1.ebuild b/net-nds/migrationtools/migrationtools-45-r1.ebuild
new file mode 100644
index 000000000000..4995ebbfc5fa
--- /dev/null
+++ b/net-nds/migrationtools/migrationtools-45-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-45-r1.ebuild,v 1.1 2005/01/07 12:24:23 robbat2 Exp $
+
+inherit eutils
+
+PN0=MigrationTools
+S=${WORKDIR}/${PN0}-${PV}
+DESCRIPTION="PADL migration tools (scripts) for openldap"
+SRC_URI="http://www.padl.com/download/${PN0}-${PV}.tar.gz"
+HOMEPAGE="http://www.padl.com/OSS/MigrationTools.html"
+
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64 hppa ppc"
+LICENSE="as-is"
+IUSE=""
+
+DEPEND=""
+RDEPEND="net-nds/openldap
+		 dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/skip-account-objectclass.patch
+}
+
+src_install() {
+	dodoc README
+	insinto /usr/share/migrationtools
+	doins migrate_*
+	insinto /usr/share/migrationtools/ads
+	doins ads/*
+}
diff --git a/net-nds/migrationtools/migrationtools-45.ebuild b/net-nds/migrationtools/migrationtools-45.ebuild
index 4441b6f14732..7c7891f65834 100644
--- a/net-nds/migrationtools/migrationtools-45.ebuild
+++ b/net-nds/migrationtools/migrationtools-45.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-45.ebuild,v 1.4 2004/10/15 19:35:02 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-45.ebuild,v 1.5 2005/01/07 12:24:23 robbat2 Exp $
 
 PN0=MigrationTools
 S=${WORKDIR}/${PN0}-${PV}
diff --git a/net-nds/migrationtools/migrationtools-46.ebuild b/net-nds/migrationtools/migrationtools-46.ebuild
index 51eeb0c7657a..a462f67a010c 100644
--- a/net-nds/migrationtools/migrationtools-46.ebuild
+++ b/net-nds/migrationtools/migrationtools-46.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-46.ebuild,v 1.2 2004/11/03 09:48:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/migrationtools/migrationtools-46.ebuild,v 1.3 2005/01/07 12:24:23 robbat2 Exp $
 
 inherit eutils