packages: MigrationTools/MigrationTools.spec, MigrationTools/MigrationTools...

[baggins]

Author: baggins                      Date: Wed Jun 24 14:29:24 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 8
- allow passing alternate shadow and smbpasswd to migrate_passwd.pl

---- Files affected:
packages/MigrationTools:
   MigrationTools.spec (1.28 -> 1.29) , MigrationTools-options.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/MigrationTools/MigrationTools.spec
diff -u packages/MigrationTools/MigrationTools.spec:1.28 packages/MigrationTools/MigrationTools.spec:1.29
--- packages/MigrationTools/MigrationTools.spec:1.28	Wed Jun 24 13:45:53 2009
+++ packages/MigrationTools/MigrationTools.spec	Wed Jun 24 16:29:18 2009
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Narzędzia do migracji do LDAP
 Name:		MigrationTools
 Version:	47
-Release:	7
+Release:	8
 License:	BSD
 Group:		Networking/Admin
 Source0:	http://www.padl.com/download/%{name}-%{version}.tar.gz
@@ -24,6 +24,7 @@
 Patch10:	%{name}-minmax-ugid.patch
 Patch11:	%{name}-utf8.patch
 Patch12:	%{name}-smbkrb5.patch
+Patch13:	%{name}-options.patch
 URL:		http://www.padl.com/OSS/MigrationTools.html
 BuildRequires:	rpm-perlprov
 BuildArch:	noarch
@@ -73,6 +74,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 install %{SOURCE1} .
 
 perl -pi -e 's|%%CONFDIR%%|%{_sysconfdir}/openldap/|g;\
@@ -102,6 +104,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2009/06/24 14:29:18  baggins
+- rel 8
+- allow passing alternate shadow and smbpasswd to migrate_passwd.pl
+
 Revision 1.28  2009/06/24 11:45:53  baggins
 - rel 7
 - add sambagroupmapping objectclass to groups

================================================================
Index: packages/MigrationTools/MigrationTools-options.patch
diff -u /dev/null packages/MigrationTools/MigrationTools-options.patch:1.1
--- /dev/null	Wed Jun 24 16:29:24 2009
+++ packages/MigrationTools/MigrationTools-options.patch	Wed Jun 24 16:29:18 2009
@@ -0,0 +1,57 @@
+diff -ur MigrationTools-47/migrate_passwd.pl x/migrate_passwd.pl
+--- MigrationTools-47/migrate_passwd.pl	2009-06-24 13:47:15.299291875 +0200
++++ x/migrate_passwd.pl	2009-06-24 16:26:58.000000000 +0200
+@@ -46,12 +46,20 @@
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+ 
+ if ($#ARGV < 0) {
+-	print STDERR "Usage: $PROGRAM [--minuid N] [--maxuid M] infile [outfile]\n";
++	print STDERR "Usage: $PROGRAM [options] infile [outfile]\n";
++	print STDERR "  Options:\n";
++	print STDERR "	--minuid N	Minimal UID number to migrate\n";
++	print STDERR "	--maxuid M	Maximal UIF number to migrate\n";
++	print STDERR "	--samba		Migrate smbpasswd\n";
++	print STDERR "	-s FILE		Path to shadow file (default: /etc/shadow)\n";
++	print STDERR "	-S FILE		Path to smbpasswd file (default: /etc/samba/smbpasswd)\n";
+ 	exit 1;
+ }
+ 
+ $do_samba = 0;
+-while ($ARGV[0] =~ /^--.*/) {
++$shadowf = "/etc/shadow";
++$smbpassf = "/etc/samba/smbpasswd";
++while ($ARGV[0] =~ /^-.*/) {
+ 	if ($ARGV[0] eq "--minuid") {
+ 		$minuid = $ARGV[1];
+ 		shift ; shift;
+@@ -61,6 +69,12 @@
+ 	} elsif ($ARGV[0] eq "--samba") {
+ 		$do_samba = 1;
+ 		shift;
++	} elsif ($ARGV[0] eq "-s") {
++		$shadowf = $ARGV[1];
++		shift ; shift;
++	} elsif ($ARGV[0] eq "-S") {
++		$smbpassf = $ARGV[1];
++		shift ; shift;
+ 	} else {
+ 		shift;
+ 	}
+@@ -208,7 +222,7 @@
+ 
+ sub read_shadow_file
+ {
+-	open(SHADOW, "/etc/shadow") || return;
++	open(SHADOW, $shadowf) || return;
+ 	while(<SHADOW>) {
+ 		chop;
+ 		($shadowUser) = split(/:/, $_);
+@@ -250,7 +264,7 @@
+ 
+ sub read_samba
+ {
+-	open(INPUT, "</etc/samba/smbpasswd");
++	open(INPUT, "<$smbpassf");
+ 	while (<INPUT>) {
+ 		my ($sambaUser, $id, $lmp, $ntp, $f, $lf, $xxx) = split(':');
+ 		$sambaUsers{$sambaUser}->{"sambaLMPassword"} = $lmp;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/MigrationTools/MigrationTools.spec?r1=1.28&r2=1.29&f=u