packages: smbldap-tools/smbldap-tools-nscd.patch, smbldap-tools/smbldap-too...

baggins baggins at pld-linux.org
Thu Jun 18 16:05:37 CEST 2009


Author: baggins                      Date: Thu Jun 18 14:05:37 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 0.9.6-pre1 (YES, it IS pre1, despite confusing file name)

---- Files affected:
packages/smbldap-tools:
   smbldap-tools-nscd.patch (1.2 -> 1.3) , smbldap-tools.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: packages/smbldap-tools/smbldap-tools-nscd.patch
diff -u packages/smbldap-tools/smbldap-tools-nscd.patch:1.2 packages/smbldap-tools/smbldap-tools-nscd.patch:1.3
--- packages/smbldap-tools/smbldap-tools-nscd.patch:1.2	Tue Nov 20 17:24:54 2007
+++ packages/smbldap-tools/smbldap-tools-nscd.patch	Thu Jun 18 16:05:32 2009
@@ -2,104 +2,102 @@
 +++ smbldap-tools-0.9.2/smbldap-usermod	2006-08-03 19:52:16.913071888 +0300
 @@ -134,22 +133,12 @@
  
- if (defined($tmp = $Options{'u'})) {
-     if (!defined($Options{'o'})) {
--	$nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1";
--	if ($nscd_status == 0) {
--	    system "/etc/init.d/nscd stop > /dev/null 2>&1";
--	}
-+	system "/usr/sbin/nscd -i passwd" if -x "/usr/sbin/nscd";
- 
- 	if (getpwuid($tmp)) {
--	    if ($nscd_status == 0) {
--		system "/etc/init.d/nscd start > /dev/null 2>&1";
--	    }
--
- 	    print "$0: uid number $tmp exists\n";
- 	    exit (6);
- 	}
--	if ($nscd_status == 0) {
--	    system "/etc/init.d/nscd start > /dev/null 2>&1";
--	}
+ if ( defined( $tmp = $Options{'u'} ) ) {
+     if ( !defined( $Options{'o'} ) ) {
+-        $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1";
+-        if ( $nscd_status == 0 ) {
+-            system "/etc/init.d/nscd stop > /dev/null 2>&1";
+-        }
++        system "/usr/sbin/nscd -i passwd" if -x "/usr/sbin/nscd";
+ 
+         if ( getpwuid($tmp) ) {
+-            if ( $nscd_status == 0 ) {
+-                system "/etc/init.d/nscd start > /dev/null 2>&1";
+-            }
+-
+             print "$0: uid number $tmp exists\n";
+             exit(6);
+         }
+-        if ( $nscd_status == 0 ) {
+-            system "/etc/init.d/nscd start > /dev/null 2>&1";
+-        }
      }
  
-     push(@mods, 'uidNumber', $tmp);
+     push( @mods, 'uidNumber', $tmp );
 @@ -529,11 +516,7 @@
      $ldap_master->unbind;
  }
  
 -$nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1";
 -
--if ($nscd_status == 0) {
+-if ( $nscd_status == 0 ) {
 -    system "/etc/init.d/nscd restart > /dev/null 2>&1";
 -}
 +system "/usr/sbin/nscd -i passwd" if -x "/usr/sbin/nscd";
  
- if (defined($Options{'P'})) {
+ if ( defined( $Options{'P'} ) ) {
      exec "$RealBin/smbldap-passwd $user"
 --- smbldap-tools-0.9.2/smbldap_tools.pm~	2006-01-03 12:57:41.000000000 +0200
 +++ smbldap-tools-0.9.2/smbldap_tools.pm	2006-08-03 19:53:47.965109611 +0300
 @@ -693,10 +693,7 @@
  sub group_add
  {
-     my ($gname, $gid, $force) = @_;
+     my ( $gname, $gid, $force ) = @_;
 -    my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1";
--    if ($nscd_status == 0) {
--	system "/etc/init.d/nscd stop > /dev/null 2>&1";
+-    if ( $nscd_status == 0 ) {
+-        system "/etc/init.d/nscd stop > /dev/null 2>&1";
 -    }
 +    system "/usr/sbin/nscd -i group" if -x "/usr/sbin/nscd";
-     if (!defined($gid)) {
- 	#while (defined(getgrgid($config{GID_START}))) {
- 	#	$config{GID_START}++;
+     if ( !defined($gid) ) {
+         #while (defined(getgrgid($config{GID_START}))) {
+         #	$config{GID_START}++;
 @@ -710,9 +707,6 @@
- 	    }
- 	}
+             }
+         }
      }
--    if ($nscd_status == 0) {
--	system "/etc/init.d/nscd start > /dev/null 2>&1";
+-    if ( $nscd_status == 0 ) {
+-        system "/etc/init.d/nscd start > /dev/null 2>&1";
 -    }
-     my $modify = $ldap->add ( "cn=$gname,$config{groupsdn}",
- 			      attrs => [
- 					objectClass => [ 'top', 'posixGroup' ],
+     my $modify = $ldap->add(
+         "cn=$gname,$config{groupsdn}",
+         attrs => [
 --- smbldap-tools-0.9.2/smbldap-useradd~	2006-01-03 12:57:41.000000000 +0200
 +++ smbldap-tools-0.9.2/smbldap-useradd	2006-08-03 19:56:17.748461827 +0300
-@@ -75,16 +75,6 @@
+@@ -75,14 +75,6 @@
  
- my $ldap_master=connect_ldap_master();
+ my $ldap_master = connect_ldap_master();
  
--
 -# cause problems when dealing with getpwuid because of the
 -# negative ttl and ldap modification
 -my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1";
 -
--if ($nscd_status == 0) {
+-if ( $nscd_status == 0 ) {
 -    system "/etc/init.d/nscd stop > /dev/null 2>&1";
 -}
 -
--
  # Read only first @ARGV
  my $userName = $ARGV[0];
  
 @@ -103,6 +93,8 @@
-     exit (1);
+     exit(1);
  }
  
 +system "/usr/sbin/nscd -i passwd" if -x "/usr/sbin/nscd";
 +
  # user must not exist in LDAP (should it be nss-wide ?)
- my ($rc, $dn) = get_user_dn2($userName);
- if ($rc and defined($dn)) {
+ my ( $rc, $dn ) = get_user_dn2($userName);
+ if ( $rc and defined($dn) ) {
 @@ -152,10 +144,6 @@
      die "Uid already exists.\n";
  }
  
--if ($nscd_status == 0) {
+-if ( $nscd_status == 0 ) {
 -    system "/etc/init.d/nscd start > /dev/null 2>&1";
 -}
 -
- my $createGroup = 0;
+ my $createGroup   = 0;
  my $userGidNumber = $Options{'g'};
- # gid not specified ? 
+ 
 --- smbldap-tools-0.9.2/smbldap-userdel~	2006-01-03 12:57:41.000000000 +0200
 +++ smbldap-tools-0.9.2/smbldap-userdel	2006-08-03 19:56:57.219345223 +0300
 @@ -95,12 +95,7 @@

================================================================
Index: packages/smbldap-tools/smbldap-tools.spec
diff -u packages/smbldap-tools/smbldap-tools.spec:1.23 packages/smbldap-tools/smbldap-tools.spec:1.24
--- packages/smbldap-tools/smbldap-tools.spec:1.23	Tue Nov 20 19:36:39 2007
+++ packages/smbldap-tools/smbldap-tools.spec	Thu Jun 18 16:05:32 2009
@@ -8,13 +8,15 @@
 Summary:	User & Group administration tools for Samba-OpenLDAP
 Summary(pl.UTF-8):	Narzędzia do administracji użytkownikami i grupami dla Samby i OpenLDAP
 Name:		smbldap-tools
-Version:	0.9.5
-Release:	1
+Version:	0.9.6
+# Despite name-ver file this is REALLY a pre1 release
+Release:	0.pre1.1
 License:	GPL
 Group:		Applications/Networking
 URL:		https://gna.org/projects/smbldap-tools/
-Source0:	http://download.gna.org/smbldap-tools/packages/pre-release/%{name}-%{version}.tgz
-# Source0-md5:	88e4eb8c056d30fa641760f6c95634e8
+#Source0:	http://download.gna.org/smbldap-tools/packages/pre-release/%{name}-%{version}.tgz
+Source0:	http://www.iallanis.info/smbldap-tools/development_release/%{name}-%{version}.tgz
+# Source0-md5:	250e51102fe8731dfcb32d4da29c02d7
 Patch0:		%{name}-Makefile.patch
 Patch1:		%{name}-configure.patch
 Patch2:		%{name}-nscd.patch
@@ -80,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2009/06/18 14:05:32  baggins
+- 0.9.6-pre1 (YES, it IS pre1, despite confusing file name)
+
 Revision 1.23  2007/11/20 18:36:39  baggins
 - moved migration scripts to doc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smbldap-tools/smbldap-tools-nscd.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smbldap-tools/smbldap-tools.spec?r1=1.23&r2=1.24&f=u



More information about the pld-cvs-commit mailing list